Rewrite packaging with Debhelper 7

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index 0660acf4127dabab5b9d5c83767a13187d2cd6b1..b91413a1099a168a50cf5c02177d42eba23ef9b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libnss-nonlocal (2.1-0debathena1) UNRELEASED; urgency=low
     - Support Automake 1.12.
     - Guard one-time initialization with memory barriers.
     - Make initgroups_dyn succeed when adding only magic groups.
+  * Rewrite packaging with Debhelper 7.
 
  -- Anders Kaseorg <andersk@mit.edu>  Wed, 12 Jun 2013 20:02:33 -0400
 

diff --git a/debian/compat b/debian/compat
index 1e8b314962144c26d5e0e50fd29d2ca327864913..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7

diff --git a/debian/control.in b/debian/control
similarity index 88%
rename from debian/control.in
rename to debian/control
index ac7feb9ebab8aa3df12a4d4f7067cf8639d9e57c..f2c66816b7394e727230a3a5547baec2a2de9e05 100644 (file)
--- a/debian/control.in
+++ b/debian/control
@@ -4,8 +4,12 @@ Priority: optional
 Maintainer: Anders Kaseorg <andersk@mit.edu>
 Vcs-Git: git://andersk.mit.edu/nss_nonlocal.git
 Vcs-Browser: http://andersk.mit.edu/gitweb/nss_nonlocal.git
-Standards-Version: 3.8.4
-Build-Depends: @cdbs@, gcc-multilib [amd64 i386] | gcc-4.1 (<< 4.1.2) [amd64 i386], libc6-dev-i386 [amd64], libc6-dev-amd64 [i386], lsb-release
+Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 7.0.50~),
+ autotools-dev, dh-autoreconf,
+ gcc-multilib [amd64 i386] | gcc-4.1 (<< 4.1.2) [amd64 i386],
+ libc6-dev-i386 [amd64], libc6-dev-amd64 [i386],
+ lsb-release
 
 Package: libnss-nonlocal
 Architecture: any

diff --git a/debian/libnss-nonlocal.install b/debian/libnss-nonlocal.install
deleted file mode 100644 (file)
index cdecab1..0000000
--- a/debian/libnss-nonlocal.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/*

diff --git a/debian/rules b/debian/rules
index 9664c6b4ca4775e0d1502db7855e1718b966cc4c..202ff6190d0b66c6df3c7eba0be436a718a4e5d0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,90 +1,67 @@
 #!/usr/bin/make -f
 
-DEB_AUTO_UPDATE_AUTOCONF = 2.61
-DEB_AUTO_UPDATE_AUTOHEADER = 2.61
-DEB_AUTO_UPDATE_AUTOMAKE = 1.10
-DEB_AUTO_UPDATE_ACLOCAL = 1.10
-DEB_AUTO_UPDATE_LIBTOOL = pre
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-# dh_buildinfo fails at multiarch: http://bugs.debian.org/620104
-CDBS_BUILD_DEPENDS_rules_debhelper_buildinfo =
+# Work around http://bugs.debian.org/572077 (debhelper < 7.4.16)
+binary: binary-arch binary-indep ;
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+       dh $@ --with autoreconf
 
-DEB_DESTDIR = $(CURDIR)/debian/tmp/
-DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
-DEB_CONFIGURE_PREFIX = /
+all_flavors = libnss-nonlocal
+libnss-nonlocal_configure_args += --prefix=/
+libnss-nonlocal_dh_install = 'lib/*'
 
 ifneq ($(DEB_HOST_MULTIARCH),)
-    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS)
     export DH_COMPAT = 9
-    DEB_CONFIGURE_EXTRA_FLAGS += $(MULTIARCH_CONFIGURE_FLAGS)
-    MULTIARCH_CONFIGURE_FLAGS = --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)'
-    DEB_DH_GENCONTROL_ARGS_libnss-nonlocal += -- -DMulti-Arch=same
+    libnss-nonlocal_configure_args += --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)'
+    libnss-nonlocal_dh_install = 'lib/$(DEB_HOST_MULTIARCH)/*'
+    libnss-nonlocal_dh_gencontrol = -- -DMulti-Arch=same
+else ifeq ($(shell hash dpkg-buildflags 2>/dev/null && echo y),y)
+    all_configure_args += $(foreach var,CFLAGS CPPFLAGS LDFLAGS,"$(var)=$$(dpkg-buildflags --get $(var))")
 endif
 
 IS_UBUNTU := $(if $(filter Ubuntu,$(shell lsb_release -is)),y)
 LIBC6_VERSION := $(shell dpkg-query --showformat='$${Version}' --show libc6)
 libc6_ge = $(shell dpkg --compare-versions '$(LIBC6_VERSION)' ge '$(1)' && echo y)
 
-debian/stamp-autotools-files: DEB_AUTO_UPDATE_AUTOMAKE += --foreign --add-missing
-
-debian/stamp-autotools-files: aclocal.m4
-aclocal.m4:
-       touch $@
-
-DEB_BUILDDIR = $(or $(DEB_BUILDDIR_$(cdbs_curpkg)),debian/build)
-
-REAL_DEB_HOST_GNU_TYPE := $(DEB_HOST_GNU_TYPE)
-
-DEB_BUILDDIR_lib32nss-nonlocal = debian/build_32
-cleanbuilddir/lib32nss-nonlocal:: clean/lib32nss-nonlocal
-configure/lib32nss-nonlocal:: MULTIARCH_CONFIGURE_FLAGS =
-configure/lib32nss-nonlocal:: cdbs_crossbuild =
+all_flavors += lib32nss-nonlocal
 # i386_configure_target in eglibc/debian/sysdeps/amd64.mk
 ifeq ($(or $(IS_UBUNTU),$(call libc6_ge,2.8+20080809)),y)
-configure/lib32nss-nonlocal:: DEB_BUILD_GNU_TYPE = i686-linux
+lib32nss-nonlocal_configure_args += --build=i686-linux
 else
-configure/lib32nss-nonlocal:: DEB_BUILD_GNU_TYPE = i486-linux
+lib32nss-nonlocal_configure_args += --build=i486-linux
 endif
 # i386_CC in eglibc/debian/sysdeps/amd64.mk
-configure/lib32nss-nonlocal:: CC += -m32
+lib32nss-nonlocal_configure_args += CC='$(CC) -m32'
 # i386_slibdir in eglibc/debian/sysdeps/amd64.mk
 ifeq ($(or $(IS_UBUNTU),$(call libc6_ge,2.9-14~)),y)
-configure/lib32nss-nonlocal:: DEB_CONFIGURE_EXTRA_FLAGS += --libdir="\$${prefix}/lib32"
-binary-install/lib32nss-nonlocal:: DEB_DH_INSTALL_ARGS = 'lib32/*'
+lib32nss-nonlocal_configure_args += --prefix=/ --libdir='$${prefix}/lib32'
+lib32nss-nonlocal_dh_install = 'lib32/*'
 else
-configure/lib32nss-nonlocal:: DEB_CONFIGURE_PREFIX = /emul/ia32-linux
-binary-install/lib32nss-nonlocal:: DEB_DH_INSTALL_ARGS = 'emul/ia32-linux/lib/*'
+lib32nss-nonlocal_configure_args += --prefix=/emul/ia32-linux
+lib32nss-nonlocal_dh_install = 'emul/ia32-linux/*'
 endif
 
-DEB_BUILDDIR_lib64nss-nonlocal = debian/build_64
-cleanbuilddir/lib64nss-nonlocal:: clean/lib64nss-nonlocal
-configure/lib64nss-nonlocal:: MULTIARCH_CONFIGURE_FLAGS =
-configure/lib64nss-nonlocal:: cdbs_crossbuild =
+all_flavors += lib64nss-nonlocal
 # amd64_configure_target in eglibc/debian/sysdeps/i386.mk
-configure/lib64nss-nonlocal:: DEB_BUILD_GNU_TYPE = x86_64-linux
+lib64nss-nonlocal_configure_args += --build=x86_64-linux
 # amd64_CC in eglibc/debian/sysdeps/i386.mk
-configure/lib64nss-nonlocal:: CC += -m64 -D__x86_64__
+lib64nss-nonlocal_configure_args += CC='$(CC) -m64 -D__x86_64__'
 # amd64_slibdir in eglibc/debian/sysdeps/i386.mk
-configure/lib64nss-nonlocal:: DEB_CONFIGURE_EXTRA_FLAGS += --libdir="\$${prefix}/lib64"
-
-# Fix for CDBS ≥ 0.4.59ubuntu4, < 0.4.83ubuntu1 (karmic and lucid).
-configure/lib32nss-nonlocal configure/lib64nss-nonlocal:: DEB_CONFIGURE_SCRIPT_ENV += CC="$(CC)"
-
-configure/lib32nss-nonlocal configure/lib64nss-nonlocal::
-       $(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS)
+lib64nss-nonlocal_configure_args += --prefix=/ --libdir="\$${prefix}/lib64"
 
-build/lib32nss-nonlocal build/lib64nss-nonlocal::
-       +$(DEB_MAKE_INVOKE) $(DEB_MAKE_BUILD_TARGET)
+flavors := $(filter $(all_flavors),$(shell dh_listpackages))
 
-install/lib32nss-nonlocal install/lib64nss-nonlocal::
-       +$(DEB_MAKE_INVOKE) $(DEB_MAKE_INSTALL_TARGET)
+define do_overrides
+override_$(1): $(addsuffix _$(1),$(2))
+$(addsuffix _$(1),$(filter-out REMAINING,$(2))): %_$(1):
+       $(1) -p$$* $(3)
+REMAINING_$(1): $(addsuffix _$(1),$(filter-out REMAINING,$(2)))
+       $(1) --remaining-packages $(4)
 
-clean/lib32nss-nonlocal clean/lib64nss-nonlocal::
-       +-$(DEB_MAKE_INVOKE) -k $(DEB_MAKE_CLEAN_TARGET)
+endef
 
-clean::
-       rm -f aclocal.m4 config.guess config.sub install-sh ltmain.sh \
-           configure config.h.in missing depcomp Makefile.in
+$(eval $(foreach auto,configure build install test clean,$(call do_overrides,dh_auto_$(auto),$(flavors),-Bdebian/build_$$* -- $$(all_$(auto)_args) $$($$*_$(auto)_args))))
+$(eval $(call do_overrides,dh_install,$(flavors) REMAINING,$$($$*_dh_install)))
+$(eval $(call do_overrides,dh_gencontrol,libnss-nonlocal REMAINING,$$($$*_dh_gencontrol)))