Bug#697264: cdebconf-entropy: Missing build dependency on autoconf?
On second thought, I believe it is better to get rid of all the
redundant stuff from the rules file, and just use dh-autoreconf.
This patch is tested and found to be working. With this patch the
autogen.sh file can be removed too.
--
Happy hacking
Petter Reinholdtsen
diff --git a/debian/control b/debian/control
index 4d7fe8b..e8a52f1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
Section: debian-installer
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Max Vozeler <xam@debian.org>, Jérémy Bobbio <lunar@debian.org>, Christian Perrier <bubulle@debian.org>, Colin Watson <cjwatson@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), po-debconf (>= 0.5.0), libdebian-installer4-dev, libnewt-dev, libtextwrap-dev, libdebconfclient0-dev (>= 0.130), libgtk2.0-dev (>= 2.18.7-2), autotools-dev
+Build-Depends: debhelper (>= 7.0.50~), po-debconf (>= 0.5.0), dh-autoreconf, libdebian-installer4-dev, libnewt-dev, libtextwrap-dev, libdebconfclient0-dev (>= 0.130), libgtk2.0-dev (>= 2.18.7-2), autotools-dev
Vcs-Browser: http://git.debian.org/?p=d-i/cdebconf-entropy.git
Vcs-Git: git://git.debian.org/d-i/cdebconf-entropy.git
diff --git a/debian/rules b/debian/rules
index 03ef31a..593976c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,3 @@
#! /usr/bin/make -f
%:
- dh $@
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-override_dh_auto_configure:
- CFLAGS="$(CFLAGS)" dh_auto_configure
-
-override_dh_auto_clean:
- [ -e configure ] || ./autogen.sh
- dh_auto_clean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
+ dh $@ --with autoreconf
Reply to: