[Pkg-cli-apps-commits] [SCM] gshare branch, master, updated. debian/0.94-12

Jo Shields directhex at apebox.org
Fri Jan 20 16:27:31 UTC 2012


The following commit has been merged in the master branch:
commit a6fc132d624d31375da1022095e6d9b5d24fcc0a
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Jan 20 16:18:22 2012 +0000

    Use dh-autoreconf rather than manually calling autoreconf

diff --git a/debian/control b/debian/control
index 2b42933..675fd3b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,7 @@ Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.
 Uploaders: Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
  cli-common-dev (>= 0.4.4),
- autotools-dev,
- automake,
- intltool,
- libtool,
+ dh-autoreconf,
  mono-devel (>= 2.4.3),
  libgtk2.0-cil-dev,
  libgconf2-dev,
diff --git a/debian/rules b/debian/rules
index 26f9754..7812e74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,19 +2,16 @@
 
 include /usr/share/cli-common/cli.make
 
-override_dh_auto_configure:
-	# buggy makefile.am
+override_dh_autoreconf:
 	mkdir m4
-	intltoolize --force
-	autoreconf -f -i
+	dh_autoreconf
+
+override_dh_auto_configure:
 	dh_auto_configure -- MCS=/usr/bin/mono-csc
 
 override_dh_auto_clean:
-	rm -f src/gshared/AssemblyInfo.cs
-	# clean up from autoreconf
-	find . -name Makefile.in -delete
-	rm -rf configure autom4te.cache m4
+	rm -rf src/gshared/AssemblyInfo.cs m4
 	dh_auto_clean
 
 %:
-	dh $@
+	dh $@ --with autoreconf

-- 
gshare



More information about the Pkg-cli-apps-commits mailing list