r18931 - /packages/unstable/gnome-python-extras/debian/patches/70_autotools.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Mon Mar 9 18:03:52 UTC 2009 

Author: joss
Date: Mon Mar  9 18:03:52 2009
New Revision: 18931

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18931
Log:
Refresh

Modified:
    packages/unstable/gnome-python-extras/debian/patches/70_autotools.patch

Modified: packages/unstable/gnome-python-extras/debian/patches/70_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-python-extras/debian/patches/70_autotools.patch?rev=18931&op=diff
==============================================================================
--- packages/unstable/gnome-python-extras/debian/patches/70_autotools.patch (original)
+++ packages/unstable/gnome-python-extras/debian/patches/70_autotools.patch Mon Mar  9 18:03:52 2009
@@ -4,8 +4,8 @@
 
 Index: gnome-python-extras-2.25.3/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/Makefile.in	2009-03-09 18:08:06.413176913 +0100
-+++ gnome-python-extras-2.25.3/Makefile.in	2009-03-09 18:13:18.369176348 +0100
+--- gnome-python-extras-2.25.3.orig/Makefile.in	2009-03-09 19:01:52.105678125 +0100
++++ gnome-python-extras-2.25.3/Makefile.in	2009-03-09 19:03:40.497173622 +0100
 @@ -167,6 +167,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -63,8 +63,8 @@
  	touch $@
 Index: gnome-python-extras-2.25.3/aclocal.m4
 ===================================================================
---- gnome-python-extras-2.25.3.orig/aclocal.m4	2009-03-09 18:08:06.389174910 +0100
-+++ gnome-python-extras-2.25.3/aclocal.m4	2009-03-09 18:13:18.405177153 +0100
+--- gnome-python-extras-2.25.3.orig/aclocal.m4	2009-03-09 19:01:52.081678077 +0100
++++ gnome-python-extras-2.25.3/aclocal.m4	2009-03-09 19:03:40.549173807 +0100
 @@ -13,6137 +13,5105 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
@@ -14644,8 +14644,8 @@
  m4_include([acinclude.m4])
 Index: gnome-python-extras-2.25.3/configure
 ===================================================================
---- gnome-python-extras-2.25.3.orig/configure	2009-03-09 18:08:06.369175000 +0100
-+++ gnome-python-extras-2.25.3/configure	2009-03-09 18:14:06.901672379 +0100
+--- gnome-python-extras-2.25.3.orig/configure	2009-03-09 19:01:59.381675004 +0100
++++ gnome-python-extras-2.25.3/configure	2009-03-09 19:03:46.397672150 +0100
 @@ -1,11 +1,11 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -25000,20 +25000,18 @@
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
 -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0") 2>&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GDL_CFLAGS"; then
 +        pkg_cv_GDL_CFLAGS="$GDL_CFLAGS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdl-1.0 >= 2.24 pygtk-2.0 >= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "gdl-1.0 >= 2.24 pygtk-2.0 >= 2.4.0") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--  pkg_cv_GDL_CFLAGS=`$PKG_CONFIG --cflags "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0" 2>/dev/null`
-+  pkg_cv_GDL_CFLAGS=`$PKG_CONFIG --cflags "gdl-1.0 >= 2.24 pygtk-2.0 >= 2.4.0" 2>/dev/null`
+   pkg_cv_GDL_CFLAGS=`$PKG_CONFIG --cflags "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0" 2>/dev/null`
  else
    pkg_failed=yes
  fi
@@ -25028,20 +25026,18 @@
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
 -    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0") 2>&5
 +if test -n "$PKG_CONFIG"; then
 +    if test -n "$GDL_LIBS"; then
 +        pkg_cv_GDL_LIBS="$GDL_LIBS"
 +    else
 +        if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdl-1.0 >= 2.24 pygtk-2.0 >= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "gdl-1.0 >= 2.24 pygtk-2.0 >= 2.4.0") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0\"") >&5
+   ($PKG_CONFIG --exists --print-errors "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0") 2>&5
    ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--  pkg_cv_GDL_LIBS=`$PKG_CONFIG --libs "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0" 2>/dev/null`
-+  pkg_cv_GDL_LIBS=`$PKG_CONFIG --libs "gdl-1.0 >= 2.24 pygtk-2.0 >= 2.4.0" 2>/dev/null`
+   pkg_cv_GDL_LIBS=`$PKG_CONFIG --libs "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0" 2>/dev/null`
  else
    pkg_failed=yes
  fi
@@ -25058,10 +25054,10 @@
  fi
          if test $_pkg_short_errors_supported = yes; then
 -	        GDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0" 2>&1`
-+	        GDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdl-1.0 >= 2.24 pygtk-2.0 >= 2.4.0"`
++	        GDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0"`
          else
 -	        GDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0" 2>&1`
-+	        GDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdl-1.0 >= 2.24 pygtk-2.0 >= 2.4.0"`
++	        GDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdl-1.0 >= 0.7.1 gdl-gnome-1.0 >= 0.7.1 pygtk-2.0 >= 2.4.0"`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GDL_PKG_ERRORS" >&5
@@ -27272,8 +27268,8 @@
  echo
 Index: gnome-python-extras-2.25.3/docs/gtkmozembed/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/docs/gtkmozembed/Makefile.in	2009-03-09 18:08:06.349175483 +0100
-+++ gnome-python-extras-2.25.3/docs/gtkmozembed/Makefile.in	2009-03-09 18:13:18.445173158 +0100
+--- gnome-python-extras-2.25.3.orig/docs/gtkmozembed/Makefile.in	2009-03-09 19:01:52.041678650 +0100
++++ gnome-python-extras-2.25.3/docs/gtkmozembed/Makefile.in	2009-03-09 19:03:40.633673373 +0100
 @@ -129,6 +129,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -27322,8 +27318,8 @@
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 Index: gnome-python-extras-2.25.3/docs/gtkspell/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/docs/gtkspell/Makefile.in	2009-03-09 18:08:06.321177790 +0100
-+++ gnome-python-extras-2.25.3/docs/gtkspell/Makefile.in	2009-03-09 18:13:18.449173736 +0100
+--- gnome-python-extras-2.25.3.orig/docs/gtkspell/Makefile.in	2009-03-09 19:01:52.013678025 +0100
++++ gnome-python-extras-2.25.3/docs/gtkspell/Makefile.in	2009-03-09 19:03:40.633673373 +0100
 @@ -129,6 +129,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -27372,8 +27368,8 @@
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 Index: gnome-python-extras-2.25.3/egg/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/egg/Makefile.in	2009-03-09 18:08:06.301175877 +0100
-+++ gnome-python-extras-2.25.3/egg/Makefile.in	2009-03-09 18:13:18.449173736 +0100
+--- gnome-python-extras-2.25.3.orig/egg/Makefile.in	2009-03-09 19:01:51.989676510 +0100
++++ gnome-python-extras-2.25.3/egg/Makefile.in	2009-03-09 19:03:40.633673373 +0100
 @@ -141,6 +141,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -27422,8 +27418,8 @@
  mostlyclean-libtool:
 Index: gnome-python-extras-2.25.3/egg/recent/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/egg/recent/Makefile.in	2009-03-09 18:08:06.277176318 +0100
-+++ gnome-python-extras-2.25.3/egg/recent/Makefile.in	2009-03-09 18:13:18.449173736 +0100
+--- gnome-python-extras-2.25.3.orig/egg/recent/Makefile.in	2009-03-09 19:01:51.965678419 +0100
++++ gnome-python-extras-2.25.3/egg/recent/Makefile.in	2009-03-09 19:03:40.633673373 +0100
 @@ -164,6 +164,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -27472,8 +27468,8 @@
  clean-noinstLTLIBRARIES:
 Index: gnome-python-extras-2.25.3/egg/tray/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/egg/tray/Makefile.in	2009-03-09 18:08:06.253175781 +0100
-+++ gnome-python-extras-2.25.3/egg/tray/Makefile.in	2009-03-09 18:13:18.449173736 +0100
+--- gnome-python-extras-2.25.3.orig/egg/tray/Makefile.in	2009-03-09 19:01:51.941678860 +0100
++++ gnome-python-extras-2.25.3/egg/tray/Makefile.in	2009-03-09 19:03:40.633673373 +0100
 @@ -154,6 +154,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -27522,8 +27518,8 @@
  	@$(NORMAL_INSTALL)
 Index: gnome-python-extras-2.25.3/gda/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/gda/Makefile.in	2009-03-09 18:08:06.233177779 +0100
-+++ gnome-python-extras-2.25.3/gda/Makefile.in	2009-03-09 18:13:18.449173736 +0100
+--- gnome-python-extras-2.25.3.orig/gda/Makefile.in	2009-03-09 19:01:51.917674412 +0100
++++ gnome-python-extras-2.25.3/gda/Makefile.in	2009-03-09 19:03:40.637674929 +0100
 @@ -166,6 +166,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -27572,8 +27568,8 @@
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 Index: gnome-python-extras-2.25.3/gdl/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/gdl/Makefile.in	2009-03-09 18:08:06.209175776 +0100
-+++ gnome-python-extras-2.25.3/gdl/Makefile.in	2009-03-09 18:13:18.449173736 +0100
+--- gnome-python-extras-2.25.3.orig/gdl/Makefile.in	2009-03-09 19:01:51.897680810 +0100
++++ gnome-python-extras-2.25.3/gdl/Makefile.in	2009-03-09 19:03:40.637674929 +0100
 @@ -149,6 +149,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -27622,8 +27618,8 @@
  	@$(NORMAL_INSTALL)
 Index: gnome-python-extras-2.25.3/gksu/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/gksu/Makefile.in	2009-03-09 18:08:06.185176706 +0100
-+++ gnome-python-extras-2.25.3/gksu/Makefile.in	2009-03-09 18:13:18.453174803 +0100
+--- gnome-python-extras-2.25.3.orig/gksu/Makefile.in	2009-03-09 19:01:51.873679295 +0100
++++ gnome-python-extras-2.25.3/gksu/Makefile.in	2009-03-09 19:03:40.637674929 +0100
 @@ -164,6 +164,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -27672,8 +27668,8 @@
  	@$(NORMAL_INSTALL)
 Index: gnome-python-extras-2.25.3/gksu2/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/gksu2/Makefile.in	2009-03-09 18:08:06.165176748 +0100
-+++ gnome-python-extras-2.25.3/gksu2/Makefile.in	2009-03-09 18:13:18.453174803 +0100
+--- gnome-python-extras-2.25.3.orig/gksu2/Makefile.in	2009-03-09 19:01:51.849679248 +0100
++++ gnome-python-extras-2.25.3/gksu2/Makefile.in	2009-03-09 19:03:40.641675996 +0100
 @@ -155,6 +155,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -27722,8 +27718,8 @@
  	@$(NORMAL_INSTALL)
 Index: gnome-python-extras-2.25.3/gtkhtml2/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/gtkhtml2/Makefile.in	2009-03-09 18:08:06.141179634 +0100
-+++ gnome-python-extras-2.25.3/gtkhtml2/Makefile.in	2009-03-09 18:13:18.453174803 +0100
+--- gnome-python-extras-2.25.3.orig/gtkhtml2/Makefile.in	2009-03-09 19:01:51.825674800 +0100
++++ gnome-python-extras-2.25.3/gtkhtml2/Makefile.in	2009-03-09 19:03:40.641675996 +0100
 @@ -154,6 +154,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -27772,8 +27768,8 @@
  	@$(NORMAL_INSTALL)
 Index: gnome-python-extras-2.25.3/gtkmozembed/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/gtkmozembed/Makefile.in	2009-03-09 18:08:06.121177720 +0100
-+++ gnome-python-extras-2.25.3/gtkmozembed/Makefile.in	2009-03-09 18:13:18.453174803 +0100
+--- gnome-python-extras-2.25.3.orig/gtkmozembed/Makefile.in	2009-03-09 19:01:51.801677197 +0100
++++ gnome-python-extras-2.25.3/gtkmozembed/Makefile.in	2009-03-09 19:03:40.641675996 +0100
 @@ -58,9 +58,9 @@ am_gtkmozembed_la_OBJECTS = gtkmozembedm
  nodist_gtkmozembed_la_OBJECTS = gtkmozembed.lo
  gtkmozembed_la_OBJECTS = $(am_gtkmozembed_la_OBJECTS) \
@@ -27903,8 +27899,8 @@
  .defs.c:
 Index: gnome-python-extras-2.25.3/gtkspell/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/gtkspell/Makefile.in	2009-03-09 18:08:06.097178161 +0100
-+++ gnome-python-extras-2.25.3/gtkspell/Makefile.in	2009-03-09 18:13:18.453174803 +0100
+--- gnome-python-extras-2.25.3.orig/gtkspell/Makefile.in	2009-03-09 19:01:51.777677639 +0100
++++ gnome-python-extras-2.25.3/gtkspell/Makefile.in	2009-03-09 19:03:40.641675996 +0100
 @@ -147,6 +147,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -27953,8 +27949,8 @@
  	@$(NORMAL_INSTALL)
 Index: gnome-python-extras-2.25.3/tests/Makefile.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/tests/Makefile.in	2009-03-09 18:08:06.073178603 +0100
-+++ gnome-python-extras-2.25.3/tests/Makefile.in	2009-03-09 18:13:18.453174803 +0100
+--- gnome-python-extras-2.25.3.orig/tests/Makefile.in	2009-03-09 19:01:51.753676124 +0100
++++ gnome-python-extras-2.25.3/tests/Makefile.in	2009-03-09 19:03:40.641675996 +0100
 @@ -117,6 +117,7 @@ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
@@ -28003,8 +27999,8 @@
  mostlyclean-libtool:
 Index: gnome-python-extras-2.25.3/config.h.in
 ===================================================================
---- gnome-python-extras-2.25.3.orig/config.h.in	2009-03-09 18:08:06.053177667 +0100
-+++ gnome-python-extras-2.25.3/config.h.in	2009-03-09 18:13:18.457174404 +0100
+--- gnome-python-extras-2.25.3.orig/config.h.in	2009-03-09 19:01:51.729679499 +0100
++++ gnome-python-extras-2.25.3/config.h.in	2009-03-09 19:03:40.641675996 +0100
 @@ -42,6 +42,9 @@
  /* Define to 1 if you have the <unistd.h> header file. */
  #undef HAVE_UNISTD_H

More information about the pkg-gnome-commits mailing list