r28746 - in /desktop/unstable/gtk+2.0/debian: changelog control control.in patches/070_mandatory-relibtoolize.patch patches/series rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Jul  4 01:01:43 2011
New Revision: 28746

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28746
Log:
* Use dh-autoreconf to update the build system:
  - Drop debian/patches/070_mandatory-relibtoolize.patch.
  - Add Build-Depends on dh-autoreconf.
  - Call dh_autoreconf in patch-stamp and dh_autoreconf_clean in clean.

Removed:
    desktop/unstable/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/control
    desktop/unstable/gtk+2.0/debian/control.in
    desktop/unstable/gtk+2.0/debian/patches/series
    desktop/unstable/gtk+2.0/debian/rules

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=28746&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Mon Jul  4 01:01:43 2011
@@ -11,6 +11,10 @@
   * debian/watch:
     - Switch to .bz2 tarballs.
     - Don't track 3.0 pre-releases.
+  * Use dh-autoreconf to update the build system:
+    - Drop debian/patches/070_mandatory-relibtoolize.patch.
+    - Add Build-Depends on dh-autoreconf.
+    - Call dh_autoreconf in patch-stamp and dh_autoreconf_clean in clean.
 
  -- Michael Biebl <biebl at debian.org>  Mon, 04 Jul 2011 02:18:25 +0200
 

Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=28746&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control [utf-8] Mon Jul  4 01:01:43 2011
@@ -7,6 +7,7 @@
                gettext,
                pkg-config,
                autotools-dev,
+               dh-autoreconf,
                libglib2.0-dev (>= 2.27.3),
                libgdk-pixbuf2.0-dev (>= 2.22.1),
                libpango1.0-dev (>= 1.28.3),

Modified: desktop/unstable/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control.in?rev=28746&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control.in [utf-8] Mon Jul  4 01:01:43 2011
@@ -7,6 +7,7 @@
                gettext,
                pkg-config,
                autotools-dev,
+               dh-autoreconf,
                libglib2.0-dev (>= 2.27.3),
                libgdk-pixbuf2.0-dev (>= 2.22.1),
                libpango1.0-dev (>= 1.28.3),

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=28746&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series [utf-8] Mon Jul  4 01:01:43 2011
@@ -13,4 +13,3 @@
 061_use_pdf_as_default_printing_standard.patch
 064_gir_build_workaround.patch
 065_tracker-0-10.patch
-070_mandatory-relibtoolize.patch

Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=28746&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/rules [utf-8] Mon Jul  4 01:01:43 2011
@@ -166,13 +166,8 @@
 $(STAMP_DIR)/patch-stamp:
 	dh_testdir
 	mkdir $(STAMP_DIR)
-	# backup the original files to restore them in the clean target
-	-test -r config.sub && cp config.sub config.sub.orig
-	-test -r config.guess && cp config.guess config.guess.orig
-	-test -r /usr/share/misc/config.sub && \
-		cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-		cp -f /usr/share/misc/config.guess config.guess
+	mkdir -p m4
+	dh_autoreconf
 	touch $@
 
 $(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp
@@ -215,6 +210,7 @@
 
 # gross kludge to force control generation with the %.in target
 clean::
+	dh_autoreconf_clean
 	touch debian/control.in
 
 debian/%: debian/%.in