[med-svn] r14532 - trunk/packages/amide/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-08-26 20:37:03 +0000 (Mon, 26 Aug 2013)
New Revision: 14532

Added:
   trunk/packages/amide/trunk/debian/configure_helper.sh
Modified:
   trunk/packages/amide/trunk/debian/changelog
   trunk/packages/amide/trunk/debian/control
   trunk/packages/amide/trunk/debian/rules
Log:
Make use of dh-autoreconf to have better chances to build twice in a row (not finished yet)


Modified: trunk/packages/amide/trunk/debian/changelog
===================================================================
--- trunk/packages/amide/trunk/debian/changelog	2013-08-26 20:34:44 UTC (rev 14531)
+++ trunk/packages/amide/trunk/debian/changelog	2013-08-26 20:37:03 UTC (rev 14532)
@@ -4,7 +4,10 @@
   * debian/gcc-4.8_format-securit.patch: Make sure package builds even
     with --format-security enabled (hardening flags)
   * debian/control:
-     -  cme fix dpkg-control
+     - cme fix dpkg-control
+     - debhelper 9
+  * Make use of dh-autoreconf to have better chances to build twice
+    in a row (not finished yet)
 
  -- Andreas Tille <tille at debian.org>  Mon, 26 Aug 2013 14:53:06 +0200
 

Added: trunk/packages/amide/trunk/debian/configure_helper.sh
===================================================================
--- trunk/packages/amide/trunk/debian/configure_helper.sh	                        (rev 0)
+++ trunk/packages/amide/trunk/debian/configure_helper.sh	2013-08-26 20:37:03 UTC (rev 14532)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+## autoreconf --force --install ## this fails because there is no way to specify search path of m4 files for aclocal
+intltoolize --copy --force --automake
+aclocal -I m4  # specify where to seek for m4 files
+libtoolize -f -c
+automake -f -a -c
+autoconf -f


Property changes on: trunk/packages/amide/trunk/debian/configure_helper.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/packages/amide/trunk/debian/control
===================================================================
--- trunk/packages/amide/trunk/debian/control	2013-08-26 20:34:44 UTC (rev 14531)
+++ trunk/packages/amide/trunk/debian/control	2013-08-26 20:37:03 UTC (rev 14532)
@@ -7,14 +7,11 @@
 Build-Depends: gnome-doc-utils,
                gtk-doc-tools,
                libtool,
-               automake,
-               intltool,
                debhelper (>= 9),
                autotools-dev,
+               dh-autoreconf,
                scrollkeeper,
                libxml-parser-perl,
-               m4,
-               pkg-config,
                libgtk2.0-dev,
                libxml2-dev,
                libgnomecanvas2-dev,

Modified: trunk/packages/amide/trunk/debian/rules
===================================================================
--- trunk/packages/amide/trunk/debian/rules	2013-08-26 20:34:44 UTC (rev 14531)
+++ trunk/packages/amide/trunk/debian/rules	2013-08-26 20:37:03 UTC (rev 14532)
@@ -1,15 +1,14 @@
 #!/usr/bin/make -f
 
+export ACLOCAL = aclocal -I m4
+
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autotools_dev --with autoreconf
 
+override_dh_autoreconf:
+	dh_autoreconf --as-needed debian/configure_helper.sh
+
 override_dh_auto_configure:
-	## autoreconf --force --install ## this fails because there is no way to specify search path of m4 files for aclocal
-	intltoolize --copy --force --automake
-	aclocal -I m4  # specify where to seek for m4 files
-	libtoolize -f -c
-	automake -f -a -c
-	autoconf -f
 	dh_auto_configure -- \
 		--disable-amide-debug \
 		--config-cache \
@@ -21,10 +20,6 @@
 		--localstatedir=/var/lib/amide \
 		LDFLAGS="-Wl,-z,defs"
 
-override_dh_auto_install:
-	dh_auto_install
-	#rm -rf debian/amide/var
-
 override_dh_auto_test:
 	echo "Do not run autotest"