[Pkg-cli-apps-commits] [SCM] gnome-do branch, master, updated. debian/0.8.5-2

[Iain Lane]

The following commit has been merged in the master branch:
commit c9c006a9161072abdfd6e5d50f148d3f0fac6440
Author: Iain Lane <laney at debian.org>
Date:   Tue Dec 6 13:40:05 2011 +0000

    Use dh_autoreconf --as-needed instead of manual patching

diff --git a/debian/control b/debian/control
index b77bd99..785a70c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>, Iain Lane <laney at debian.org>
 Build-Depends: debhelper (>= 7.0.50), 
-               dh-autoreconf,
+               dh-autoreconf (>= 4),
                quilt (>= 0.46-7~),
                mono-devel (>= 2.4.2.3),
                intltool,
diff --git a/debian/ltmain-add-as-needed.patch b/debian/ltmain-add-as-needed.patch
deleted file mode 100644
index 56b5ae8..0000000
--- a/debian/ltmain-add-as-needed.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Patch to add --as-needed magic to ltmain.sh
- This patch needs to be applied after autoreconf is run, and autoreconf should
- be copying files, not symlinking (ie: the '-s' option should not be given) so
- that system-wide files aren't accidentally patched.
- .
- This should be more robust than copying a pre-patched version of ltmain.sh
- from debian/ on build, as ltmain.sh needs to be exactly the same version as 
- the rest of libtool.
-Author: Christopher James Halse Rogers <raof at ubuntu.com>
-
---- libtool-2.2.6b/libltdl/config/ltmain.sh	2010-01-04 05:33:00.810981679 +0000
-+++ libtool-as-needed/libltdl/config/ltmain.sh	2010-01-04 00:18:29.715388881 +0000
-@@ -4716,6 +4716,11 @@
- 	arg=$func_stripname_result
- 	;;
- 
-+      -Wl,--as-needed)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-       -Wl,*)
- 	func_stripname '-Wl,' '' "$arg"
- 	args=$func_stripname_result
-@@ -5070,6 +5075,15 @@
- 	lib=
- 	found=no
- 	case $deplib in
-+	-Wl,--as-needed)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	  fi
-+	  continue
-+	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
diff --git a/debian/rules b/debian/rules
index 794e3f3..8ae2521 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,14 +8,12 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 CFLAGS ?= -O2 -Wall -g
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
 override_dh_auto_configure:
-	patch -p3 < debian/ltmain-add-as-needed.patch
 	dh_auto_configure -- --enable-release MCS=/usr/bin/mono-csc
 
-override_dh_clean:
-	dh_clean
-
 override_dh_install:
 	# The .la file(s) are entirely useless; kill them with fire.
 	find debian/gnome-do -name '*.la' -delete

-- 
gnome-do