[Pkg-cli-libs-commits] [SCM] gnome-sharp2 branch, master, updated. upstream/2.24.1-29-gb44093f

[Iain Lane]

The following commit has been merged in the master branch:
commit da573ba18265215900d3997e5fb08f3e5ea6d70f
Author: Iain Lane <laney at debian.org>
Date:   Tue Jul 12 10:09:05 2011 +0100

    Drop ltmain-add-as-needed patch; dh-autoreconf can do this now

diff --git a/debian/control b/debian/control
index e1e2555..c5fb288 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: autoconf,
                automake,
                cli-common-dev (>= 0.4.6),
                debhelper (>= 7.0.50~),
-               dh-autoreconf,
+               dh-autoreconf (>= 4),
                gtk-sharp2-gapi (>= 2.12.6),
                libart-2.0-dev (>= 2.3.20),
                libglade2.0-cil-dev (>= 2.12.2),
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 8df8173..c41037b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,7 @@ API_VERSION = 2.24.0
 	dh $@ --with autoreconf
 
 override_dh_autoreconf:
-	dh_autoreconf
-	patch -p3 < debian/ltmain-add-as-needed.patch
+	dh_autoreconf --as-needed
 
 override_dh_auto_configure:
 	dh_auto_configure -- CSC=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"

-- 
gnome-sharp2