r20611 - in /packages/unstable/pywebkitgtk/debian: changelog patches/03_autoreconf.dpatch python-webkit-dev.install
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Jul 8 20:54:10 UTC 2009
Author: joss
Date: Wed Jul 8 20:54:09 2009
New Revision: 20611
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20611
Log:
* 03_autoreconf.dpatch: remove some useless parts.
* Install the definitions from /usr/share/pywebkitgtk.
Modified:
packages/unstable/pywebkitgtk/debian/changelog
packages/unstable/pywebkitgtk/debian/patches/03_autoreconf.dpatch
packages/unstable/pywebkitgtk/debian/python-webkit-dev.install
Modified: packages/unstable/pywebkitgtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pywebkitgtk/debian/changelog?rev=20611&op=diff
==============================================================================
--- packages/unstable/pywebkitgtk/debian/changelog (original)
+++ packages/unstable/pywebkitgtk/debian/changelog Wed Jul 8 20:54:09 2009
@@ -1,4 +1,4 @@
-pywebkitgtk (1.1.5-1) UNRELEASED; urgency=low
+pywebkitgtk (1.1.5-1) unstable; urgency=low
[ Christophe Sauthier ]
* New upstream version.
@@ -19,8 +19,10 @@
[ Josselin Mouette ]
* Remove dh_scrollkeeper calls.
+ * 03_autoreconf.dpatch: remove some useless parts.
+ * Install the definitions from /usr/share/pywebkitgtk.
- -- Josselin Mouette <joss at debian.org> Tue, 07 Jul 2009 23:49:05 +0200
+ -- Josselin Mouette <joss at debian.org> Wed, 08 Jul 2009 22:35:09 +0200
pywebkitgtk (1.0.2-1) unstable; urgency=low
Modified: packages/unstable/pywebkitgtk/debian/patches/03_autoreconf.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pywebkitgtk/debian/patches/03_autoreconf.dpatch?rev=20611&op=diff
==============================================================================
--- packages/unstable/pywebkitgtk/debian/patches/03_autoreconf.dpatch (original)
+++ packages/unstable/pywebkitgtk/debian/patches/03_autoreconf.dpatch Wed Jul 8 20:54:09 2009
@@ -27,55 +27,6 @@
--register $(PYGTK_DEFSDIR)/gdk-types.defs \
--register $(PYGTK_DEFSDIR)/gtk-types.defs \
--override $(*D)/$(*F).override \
-diff -urNad pywebkitgtk-1.1.5~/Makefile.in.rej pywebkitgtk-1.1.5/Makefile.in.rej
---- pywebkitgtk-1.1.5~/Makefile.in.rej 1970-01-01 01:00:00.000000000 +0100
-+++ pywebkitgtk-1.1.5/Makefile.in.rej 2009-05-31 13:08:43.000000000 +0200
-@@ -0,0 +1,45 @@
-+***************
-+*** 1,4 ****
-+- # Makefile.in generated by automake 1.10.1 from Makefile.am.
-+ # @configure_input@
-+
-+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+--- 1,4 ----
-++ # Makefile.in generated by automake 1.10.2 from Makefile.am.
-+ # @configure_input@
-+
-+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+***************
-+*** 481,487 ****
-+ -rm -rf webkit/.libs webkit/_libs
-+
-+ distclean-libtool:
-+- -rm -f libtool
-+ install-defsDATA: $(defs_DATA)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(defsdir)" || $(MKDIR_P) "$(DESTDIR)$(defsdir)"
-+--- 481,487 ----
-+ -rm -rf webkit/.libs webkit/_libs
-+
-+ distclean-libtool:
-++ -rm -f libtool config.lt
-+ install-defsDATA: $(defs_DATA)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(defsdir)" || $(MKDIR_P) "$(DESTDIR)$(defsdir)"
-+***************
-+*** 505,511 ****
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | \
-+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
-+ mkid -fID $$unique
-+ tags: TAGS
-+--- 505,511 ----
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | \
-++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
-+ mkid -fID $$unique
-+ tags: TAGS
diff -urNad pywebkitgtk-1.1.5~/aclocal.m4 pywebkitgtk-1.1.5/aclocal.m4
--- pywebkitgtk-1.1.5~/aclocal.m4 2009-05-28 23:42:29.000000000 +0200
+++ pywebkitgtk-1.1.5/aclocal.m4 2009-05-31 13:09:11.000000000 +0200
@@ -221,295 +172,6 @@
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
-diff -urNad pywebkitgtk-1.1.5~/aclocal.m4.rej pywebkitgtk-1.1.5/aclocal.m4.rej
---- pywebkitgtk-1.1.5~/aclocal.m4.rej 1970-01-01 01:00:00.000000000 +0100
-+++ pywebkitgtk-1.1.5/aclocal.m4.rej 2009-05-31 13:08:43.000000000 +0200
-@@ -0,0 +1,285 @@
-+***************
-+*** 1,4 ****
-+- # generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-+
-+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+ # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+--- 1,4 ----
-++ # generated automatically by aclocal 1.10.2 -*- Autoconf -*-
-+
-+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+ # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+***************
-+*** 13,19 ****
-+
-+ m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+- m4_if(AC_AUTOCONF_VERSION, [2.63],,
-+ [m4_warning([this file was generated for autoconf 2.63.
-+ You have another version of autoconf. It may work, but is not guaranteed to.
-+ If you have problems, you may need to regenerate the build system entirely.
-+--- 13,19 ----
-+
-+ m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-++ m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-+ [m4_warning([this file was generated for autoconf 2.63.
-+ You have another version of autoconf. It may work, but is not guaranteed to.
-+ If you have problems, you may need to regenerate the build system entirely.
-+***************
-+*** 177,183 ****
-+ fi[]dnl
-+ ])# PKG_CHECK_MODULES
-+
-+- # Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
-+ #
-+ # This file is free software; the Free Software Foundation
-+ # gives unlimited permission to copy and/or distribute it,
-+--- 177,183 ----
-+ fi[]dnl
-+ ])# PKG_CHECK_MODULES
-+
-++ # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+ #
-+ # This file is free software; the Free Software Foundation
-+ # gives unlimited permission to copy and/or distribute it,
-+***************
-+*** 192,198 ****
-+ [am__api_version='1.10'
-+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+ dnl require some minimum version. Point them to the right macro.
-+- m4_if([$1], [1.10.1], [],
-+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+ ])
-+
-+--- 192,198 ----
-+ [am__api_version='1.10'
-+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+ dnl require some minimum version. Point them to the right macro.
-++ m4_if([$1], [1.10.2], [],
-+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+ ])
-+
-+***************
-+*** 206,217 ****
-+ # AM_SET_CURRENT_AUTOMAKE_VERSION
-+ # -------------------------------
-+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+- [AM_AUTOMAKE_VERSION([1.10.1])dnl
-+ m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+- _AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-+
-+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
-+
-+--- 206,217 ----
-+ # AM_SET_CURRENT_AUTOMAKE_VERSION
-+ # -------------------------------
-+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-++ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-++ [AM_AUTOMAKE_VERSION([1.10.2])dnl
-+ m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-++ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-+
-+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
-+
-+***************
-+*** 461,517 ****
-+
-+ # Generate code to set up dependency tracking. -*- Autoconf -*-
-+
-+- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+ # Free Software Foundation, Inc.
-+ #
-+ # This file is free software; the Free Software Foundation
-+ # gives unlimited permission to copy and/or distribute it,
-+ # with or without modifications, as long as this notice is preserved.
-+
-+- #serial 3
-+
-+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
-+ # ------------------------------
-+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+- [for mf in $CONFIG_FILES; do
-+- # Strip MF so we end up with the name of the file.
-+- mf=`echo "$mf" | sed -e 's/:.*$//'`
-+- # Check whether this is an Automake generated Makefile or not.
-+- # We used to match only the files named `Makefile.in', but
-+- # some people rename them; so instead we look at the file content.
-+- # Grep'ing the first line is not enough: some people post-process
-+- # each Makefile.in and add a new line on top of each file to say so.
-+- # Grep'ing the whole file is not good either: AIX grep has a line
-+- # limit of 2048, but all sed's we know have understand at least 4000.
-+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+- dirpart=`AS_DIRNAME("$mf")`
-+- else
-+- continue
-+- fi
-+- # Extract the definition of DEPDIR, am__include, and am__quote
-+- # from the Makefile without running `make'.
-+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+- test -z "$DEPDIR" && continue
-+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+- test -z "am__include" && continue
-+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+- # When using ansi2knr, U may be empty or an underscore; expand it
-+- U=`sed -n 's/^U = //p' < "$mf"`
-+- # Find all dependency output files, they are included files with
-+- # $(DEPDIR) in their names. We invoke sed twice because it is the
-+- # simplest approach to changing $(DEPDIR) to its actual value in the
-+- # expansion.
-+- for file in `sed -n "
-+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+- # Make sure the directory exists.
-+- test -f "$dirpart/$file" && continue
-+- fdir=`AS_DIRNAME(["$file"])`
-+- AS_MKDIR_P([$dirpart/$fdir])
-+- # echo "creating $dirpart/$file"
-+- echo '# dummy' > "$dirpart/$file"
-+ done
-+- done
-+ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+--- 461,528 ----
-+
-+ # Generate code to set up dependency tracking. -*- Autoconf -*-
-+
-++ # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+ # Free Software Foundation, Inc.
-+ #
-+ # This file is free software; the Free Software Foundation
-+ # gives unlimited permission to copy and/or distribute it,
-+ # with or without modifications, as long as this notice is preserved.
-+
-++ #serial 5
-+
-+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
-+ # ------------------------------
-+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-++ [{
-++ # Autoconf 2.62 quotes --file arguments for eval, but not when files
-++ # are listed without --file. Let's play safe and only enable the eval
-++ # if we detect the quoting.
-++ case $CONFIG_FILES in
-++ *\'*) eval set x "$CONFIG_FILES" ;;
-++ *) set x $CONFIG_FILES ;;
-++ esac
-++ shift
-++ for mf
-++ do
-++ # Strip MF so we end up with the name of the file.
-++ mf=`echo "$mf" | sed -e 's/:.*$//'`
-++ # Check whether this is an Automake generated Makefile or not.
-++ # We used to match only the files named `Makefile.in', but
-++ # some people rename them; so instead we look at the file content.
-++ # Grep'ing the first line is not enough: some people post-process
-++ # each Makefile.in and add a new line on top of each file to say so.
-++ # Grep'ing the whole file is not good either: AIX grep has a line
-++ # limit of 2048, but all sed's we know have understand at least 4000.
-++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-++ dirpart=`AS_DIRNAME("$mf")`
-++ else
-++ continue
-++ fi
-++ # Extract the definition of DEPDIR, am__include, and am__quote
-++ # from the Makefile without running `make'.
-++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-++ test -z "$DEPDIR" && continue
-++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-++ test -z "am__include" && continue
-++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-++ # When using ansi2knr, U may be empty or an underscore; expand it
-++ U=`sed -n 's/^U = //p' < "$mf"`
-++ # Find all dependency output files, they are included files with
-++ # $(DEPDIR) in their names. We invoke sed twice because it is the
-++ # simplest approach to changing $(DEPDIR) to its actual value in the
-++ # expansion.
-++ for file in `sed -n "
-++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-++ # Make sure the directory exists.
-++ test -f "$dirpart/$file" && continue
-++ fdir=`AS_DIRNAME(["$file"])`
-++ AS_MKDIR_P([$dirpart/$fdir])
-++ # echo "creating $dirpart/$file"
-++ echo '# dummy' > "$dirpart/$file"
-++ done
-+ done
-++ }
-+ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+***************
-+*** 741,754 ****
-+ rm -f confinc confmf
-+ ])
-+
-+- # Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-+ # Free Software Foundation, Inc.
-+ #
-+ # This file is free software; the Free Software Foundation
-+ # gives unlimited permission to copy and/or distribute it,
-+ # with or without modifications, as long as this notice is preserved.
-+
-+- # serial 5
-+
-+ # AM_PROG_CC_C_O
-+ # --------------
-+--- 752,765 ----
-+ rm -f confinc confmf
-+ ])
-+
-++ # Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+ # Free Software Foundation, Inc.
-+ #
-+ # This file is free software; the Free Software Foundation
-+ # gives unlimited permission to copy and/or distribute it,
-+ # with or without modifications, as long as this notice is preserved.
-+
-++ # serial 6
-+
-+ # AM_PROG_CC_C_O
-+ # --------------
-+***************
-+*** 760,767 ****
-+ # FIXME: we rely on the cache variable name because
-+ # there is no other way.
-+ set dummy $CC
-+- ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-+- if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+--- 771,779 ----
-+ # FIXME: we rely on the cache variable name because
-+ # there is no other way.
-+ set dummy $CC
-++ am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-++ eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-++ if test "$am_t" != yes; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+***************
-+*** 723,729 ****
-+ # ----------------------------------
-+ # OPTIONS is a space-separated list of Automake options.
-+ AC_DEFUN([_AM_SET_OPTIONS],
-+- [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+ # -------------------------------------------
-+--- 735,741 ----
-+ # ----------------------------------
-+ # OPTIONS is a space-separated list of Automake options.
-+ AC_DEFUN([_AM_SET_OPTIONS],
-++ [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+ # -------------------------------------------
diff -urNad pywebkitgtk-1.1.5~/config.guess pywebkitgtk-1.1.5/config.guess
--- pywebkitgtk-1.1.5~/config.guess 2009-05-04 01:55:47.000000000 +0200
+++ pywebkitgtk-1.1.5/config.guess 2009-05-31 13:09:13.000000000 +0200
@@ -634,84 +296,6 @@
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
-diff -urNad pywebkitgtk-1.1.5~/config.h.in~ pywebkitgtk-1.1.5/config.h.in~
---- pywebkitgtk-1.1.5~/config.h.in~ 1970-01-01 01:00:00.000000000 +0100
-+++ pywebkitgtk-1.1.5/config.h.in~ 2009-05-28 23:42:30.000000000 +0200
-@@ -0,0 +1,74 @@
-+/* config.h.in. Generated from configure.ac by autoheader. */
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+ */
-+#undef LT_OBJDIR
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* The major version of Python WebKit Gtk+. */
-+#undef PYWEBKITGTK_MAJOR_VERSION
-+
-+/* The micro version of Python WebKit Gtk+. */
-+#undef PYWEBKITGTK_MICRO_VERSION
-+
-+/* The minor version of Python WebKit Gtk+. */
-+#undef PYWEBKITGTK_MINOR_VERSION
-+
-+/* The release version of Python WebKit Gtk+ */
-+#undef PYWEBKITGTK_VERSION
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Version number of package */
-+#undef VERSION
diff -urNad pywebkitgtk-1.1.5~/config.sub pywebkitgtk-1.1.5/config.sub
--- pywebkitgtk-1.1.5~/config.sub 2009-05-04 01:55:47.000000000 +0200
+++ pywebkitgtk-1.1.5/config.sub 2009-05-31 13:09:13.000000000 +0200
@@ -1092,259 +676,6 @@
;;
"libtool":C)
-diff -urNad pywebkitgtk-1.1.5~/configure.rej pywebkitgtk-1.1.5/configure.rej
---- pywebkitgtk-1.1.5~/configure.rej 1970-01-01 01:00:00.000000000 +0100
-+++ pywebkitgtk-1.1.5/configure.rej 2009-05-31 13:08:43.000000000 +0200
-@@ -0,0 +1,249 @@
-+***************
-+*** 3792,3799 ****
-+ # FIXME: we rely on the cache variable name because
-+ # there is no other way.
-+ set dummy $CC
-+- ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-+- if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+--- 3792,3800 ----
-+ # FIXME: we rely on the cache variable name because
-+ # there is no other way.
-+ set dummy $CC
-++ am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-++ eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-++ if test "$am_t" != yes; then
-+ # Losing compiler, so override with the script.
-+ # FIXME: It is wrong to rewrite CC.
-+ # But if we don't then we get into trouble of one sort or another.
-+***************
-+*** 4505,4517 ****
-+ else
-+ lt_cv_nm_interface="BSD nm"
-+ echo "int some_variable = 0;" > conftest.$ac_ext
-+- (eval echo "\"\$as_me:4508: $ac_compile\"" >&5)
-+ (eval "$ac_compile" 2>conftest.err)
-+ cat conftest.err >&5
-+- (eval echo "\"\$as_me:4511: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-+ cat conftest.err >&5
-+- (eval echo "\"\$as_me:4514: output\"" >&5)
-+ cat conftest.out >&5
-+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+ lt_cv_nm_interface="MS dumpbin"
-+--- 4506,4518 ----
-+ else
-+ lt_cv_nm_interface="BSD nm"
-+ echo "int some_variable = 0;" > conftest.$ac_ext
-++ (eval echo "\"\$as_me:4509: $ac_compile\"" >&5)
-+ (eval "$ac_compile" 2>conftest.err)
-+ cat conftest.err >&5
-++ (eval echo "\"\$as_me:4512: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-+ cat conftest.err >&5
-++ (eval echo "\"\$as_me:4515: output\"" >&5)
-+ cat conftest.out >&5
-+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+ lt_cv_nm_interface="MS dumpbin"
-+***************
-+*** 5717,5723 ****
-+ ;;
-+ *-*-irix6*)
-+ # Find out which ABI we are using.
-+- echo '#line 5720 "configure"' > conftest.$ac_ext
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+--- 5718,5724 ----
-+ ;;
-+ *-*-irix6*)
-+ # Find out which ABI we are using.
-++ echo '#line 5721 "configure"' > conftest.$ac_ext
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+***************
-+*** 7574,7584 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:7577: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+- echo "$as_me:7581: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+--- 7575,7585 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:7578: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-++ echo "$as_me:7582: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+***************
-+*** 7913,7923 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:7916: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+- echo "$as_me:7920: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+--- 7914,7924 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:7917: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-++ echo "$as_me:7921: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+***************
-+*** 8018,8028 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:8021: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+- echo "$as_me:8025: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+--- 8019,8029 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:8022: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-++ echo "$as_me:8026: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+***************
-+*** 8073,8083 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:8076: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+- echo "$as_me:8080: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+--- 8074,8084 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:8077: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-++ echo "$as_me:8081: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+***************
-+*** 10886,10892 ****
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<_LT_EOF
-+- #line 10889 "configure"
-+ #include "confdefs.h"
-+
-+ #if HAVE_DLFCN_H
-+--- 10887,10893 ----
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<_LT_EOF
-++ #line 10890 "configure"
-+ #include "confdefs.h"
-+
-+ #if HAVE_DLFCN_H
-+***************
-+*** 10982,10988 ****
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<_LT_EOF
-+- #line 10985 "configure"
-+ #include "confdefs.h"
-+
-+ #if HAVE_DLFCN_H
-+--- 10983,10989 ----
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<_LT_EOF
-++ #line 10986 "configure"
-+ #include "confdefs.h"
-+
-+ #if HAVE_DLFCN_H
-+***************
-+*** 14712,14729 ****
-+
-+
-+ case $ac_file$ac_mode in
-+- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+- # Strip MF so we end up with the name of the file.
-+- mf=`echo "$mf" | sed -e 's/:.*$//'`
-+- # Check whether this is an Automake generated Makefile or not.
-+- # We used to match only the files named `Makefile.in', but
-+- # some people rename them; so instead we look at the file content.
-+- # Grep'ing the first line is not enough: some people post-process
-+- # each Makefile.in and add a new line on top of each file to say so.
-+- # Grep'ing the whole file is not good either: AIX grep has a line
-+- # limit of 2048, but all sed's we know have understand at least 4000.
-+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+- dirpart=`$as_dirname -- "$mf" ||
-+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$mf" : 'X\(//\)[^/]' \| \
-+ X"$mf" : 'X\(//\)$' \| \
-+--- 14725,14752 ----
-+
-+
-+ case $ac_file$ac_mode in
-++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-++ # Autoconf 2.62 quotes --file arguments for eval, but not when files
-++ # are listed without --file. Let's play safe and only enable the eval
-++ # if we detect the quoting.
-++ case $CONFIG_FILES in
-++ *\'*) eval set x "$CONFIG_FILES" ;;
-++ *) set x $CONFIG_FILES ;;
-++ esac
-++ shift
-++ for mf
-++ do
-++ # Strip MF so we end up with the name of the file.
-++ mf=`echo "$mf" | sed -e 's/:.*$//'`
-++ # Check whether this is an Automake generated Makefile or not.
-++ # We used to match only the files named `Makefile.in', but
-++ # some people rename them; so instead we look at the file content.
-++ # Grep'ing the first line is not enough: some people post-process
-++ # each Makefile.in and add a new line on top of each file to say so.
-++ # Grep'ing the whole file is not good either: AIX grep has a line
-++ # limit of 2048, but all sed's we know have understand at least 4000.
-++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-++ dirpart=`$as_dirname -- "$mf" ||
-+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$mf" : 'X\(//\)[^/]' \| \
-+ X"$mf" : 'X\(//\)$' \| \
diff -urNad pywebkitgtk-1.1.5~/ltmain.sh pywebkitgtk-1.1.5/ltmain.sh
--- pywebkitgtk-1.1.5~/ltmain.sh 2009-04-07 23:40:40.000000000 +0200
+++ pywebkitgtk-1.1.5/ltmain.sh 2009-05-31 13:09:09.000000000 +0200
@@ -1404,44 +735,6 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
-diff -urNad pywebkitgtk-1.1.5~/ltmain.sh.rej pywebkitgtk-1.1.5/ltmain.sh.rej
---- pywebkitgtk-1.1.5~/ltmain.sh.rej 1970-01-01 01:00:00.000000000 +0100
-+++ pywebkitgtk-1.1.5/ltmain.sh.rej 2009-05-31 13:08:43.000000000 +0200
-@@ -0,0 +1,34 @@
-+***************
-+*** 65,71 ****
-+ # compiler: $LTCC
-+ # compiler flags: $LTCFLAGS
-+ # linker: $LD (gnu? $with_gnu_ld)
-+- # $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1
-+ # automake: $automake_version
-+ # autoconf: $autoconf_version
-+ #
-+--- 65,71 ----
-+ # compiler: $LTCC
-+ # compiler flags: $LTCFLAGS
-+ # linker: $LD (gnu? $with_gnu_ld)
-++ # $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
-+ # automake: $automake_version
-+ # autoconf: $autoconf_version
-+ #
-+***************
-+*** 73,79 ****
-+
-+ PROGRAM=ltmain.sh
-+ PACKAGE=libtool
-+- VERSION="2.2.6 Debian-2.2.6a-1"
-+ TIMESTAMP=""
-+ package_revision=1.3012
-+
-+--- 73,79 ----
-+
-+ PROGRAM=ltmain.sh
-+ PACKAGE=libtool
-++ VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
-+ TIMESTAMP=""
-+ package_revision=1.3012
-+
diff -urNad pywebkitgtk-1.1.5~/m4/libtool.m4 pywebkitgtk-1.1.5/m4/libtool.m4
--- pywebkitgtk-1.1.5~/m4/libtool.m4 2009-04-07 23:40:40.000000000 +0200
+++ pywebkitgtk-1.1.5/m4/libtool.m4 2009-05-31 13:09:09.000000000 +0200
Modified: packages/unstable/pywebkitgtk/debian/python-webkit-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pywebkitgtk/debian/python-webkit-dev.install?rev=20611&op=diff
==============================================================================
--- packages/unstable/pywebkitgtk/debian/python-webkit-dev.install (original)
+++ packages/unstable/pywebkitgtk/debian/python-webkit-dev.install Wed Jul 8 20:54:09 2009
@@ -1,1 +1,2 @@
debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/pywebkitgtk
More information about the pkg-gnome-commits
mailing list