From 57283d75f7cddc36bf7f89208201908d01cd96d4 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Fri, 14 Mar 2014 23:02:58 +0100 Subject: Call dh-autoreconf since we need to regenerate all the autofoo files The .gitignore is removing all the autofoo files and we need to regenerate them at build time --- debian/control | 2 +- debian/rules | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index fc7507b5..a9e6413a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: required Maintainer: Shadow package maintainers Standards-Version: 3.9.3 Uploaders: Christian Perrier , Nicolas FRANCOIS (Nekral) -Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [linux-any], libsemanage1-dev [linux-any], gnome-doc-utils (>= 0.4.3) +Build-Depends: dh-autoreconf, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [linux-any], libsemanage1-dev [linux-any], gnome-doc-utils (>= 0.4.3) Vcs-Git: git://anonscm.debian.org/git/pkg-shadow/shadow.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-shadow/shadow.git;a=summary Homepage: http://pkg-shadow.alioth.debian.org/ diff --git a/debian/rules b/debian/rules index 12d42443..aab75538 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,8 @@ endif # Enable PIE, BINDNOW, and possible future flags. export DEB_BUILD_MAINT_OPTIONS = hardening=+all +# Call autoreconf since we need to regenerate all the autofoo files +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk # Specify where dh_install will find the files that it needs to move: DEB_DH_INSTALL_SOURCEDIR=debian/tmp @@ -20,11 +22,6 @@ DEB_DH_INSTALL_SOURCEDIR=debian/tmp DEB_DESTDIR=$(CURDIR)/debian/tmp include /usr/share/cdbs/1/class/autotools.mk -# Automatically update autoconf, etc. -DEB_AUTO_UPDATE_ACLOCAL = 1.9 -DEB_AUTO_UPDATE_AUTOCONF = 1.9 -DEB_AUTO_UPDATE_AUTOMAKE = 1.9 -DEB_AUTO_UPDATE_LIBTOOL = pre # Adds extra options when calling the configure script: DEB_CONFIGURE_EXTRA_FLAGS := --disable-shared --without-libcrack --without-audit --mandir=/usr/share/man --with-libpam --enable-shadowgrp --enable-man --disable-account-tools-setuid --with-group-name-max-length=32 --without-acl --without-attr --without-tcb -- cgit v1.2.1