Merge lp:~vorlon/apparmor/dh9 into lp:~ubuntu-core-dev/apparmor/master

[Steve Langasek]

This is a change to uplift the Debian packaging to dh(1) and debhelper
compat 9, making debian/rules quite a bit shorter/simpler and getting us
multiarch support for libapparmor. I've build-tested it to make sure the
package contents remain correct, but would appreciate if someone with more
apparmor expertise kicked the tires on this before upload.

[lp:~vorlon/apparmor/dh9]

1487. By Steve Langasek on 2013-10-30

Document bug closure

1488. By Steve Langasek on 2013-10-31

Revert wrongheaded change to drop global variables, which are used in the
base build and affect apparmor-easyprof

[Tyler Hicks (tyhicks)]

Upstream doesn't support a fully parallelized build at this moment, so --parallel needs to be dropped from dh. After that change, this gets my ack and you are free to upload.

We'll get those issues fixed upstream and then enable --parallel soon.

Three of the QRT test-apparmor.py tests from now fail. I've determined them all to be issues with test-apparmor.py itself. I'll fix those issues.

Thanks for the packaging changes, Steve!

review: Needs Fixing

[Tyler Hicks (tyhicks)]

--parallel was dropped prior to merging - everything looks good!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-21 20:35:13 +0000
+++ debian/changelog	2013-10-31 17:26:43 +0000
@@ -1,3 +1,11 @@
+apparmor (2.8.0-0ubuntu33) UNRELEASED; urgency=low
+
+  * Convert to dh.
+  * Bump to debhelper compat level 9 for multiarch support.
+  * Mark libapparmor1, libapparmor-dev Multi-Arch: same.  LP: #1246067.
+
+ -- Steve Langasek <[e-mail]>  Wed, 30 Oct 2013 05:13:31 +0000
+
 apparmor (2.8.0-0ubuntu32) trusty; urgency=low
 
   * no change rebuild for perl 5.18

=== modified file 'debian/compat'
--- debian/compat	2010-11-04 19:11:13 +0000
+++ debian/compat	2013-10-31 17:26:43 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2013-10-08 21:30:52 +0000
+++ debian/control	2013-10-31 17:26:43 +0000
@@ -52,6 +52,7 @@
 Package: libapparmor-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libapparmor1 (= ${binary:Version}), ${misc:Depends}
 Description: AppArmor development libraries and header files
  This package provides the develpment libraries and header files needed to
@@ -61,6 +62,7 @@
 Package: libapparmor1
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: changehat AppArmor library
  This package provides the shared library used for making use of the

=== modified file 'debian/libapparmor-dev.install'
--- debian/libapparmor-dev.install	2013-10-08 21:30:52 +0000
+++ debian/libapparmor-dev.install	2013-10-31 17:26:43 +0000
@@ -1,5 +1,5 @@
-usr/lib/libapparmor.a
-usr/lib/libapparmor.la
-usr/lib/libapparmor.so
-usr/lib/pkgconfig/libapparmor*
+usr/lib/*/libapparmor.a
+usr/lib/*/libapparmor.la
+usr/lib/*/libapparmor.so
+usr/lib/*/pkgconfig/libapparmor*
 usr/include/*

=== modified file 'debian/libapparmor1.install'
--- debian/libapparmor1.install	2010-11-04 06:54:03 +0000
+++ debian/libapparmor1.install	2013-10-31 17:26:43 +0000
@@ -1,1 +1,1 @@
-usr/lib/libapparmor.so.1*
+usr/lib/*/libapparmor.so.1*

=== modified file 'debian/rules'
--- debian/rules	2013-07-05 14:53:33 +0000
+++ debian/rules	2013-10-31 17:26:43 +0000
@@ -1,66 +1,30 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Uncomment to turn on verbose build-time test output
-#export VERBOSE=1
-
-# libapparmor uses autotools
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
 export DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
-CONFFLAGS = --prefix=/usr --with-perl
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
-else
-  CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
 export PYTHON=/usr/bin/python3
 export PYTHON_VERSION=3
 export PYTHON_VERSIONS=python3
 
-CFLAGS := -Wall -g
-CXXFLAGS := -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-	CXXFLAGS += -O0
-else
-	CFLAGS += -O2
-	CXXFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	cd libraries/libapparmor && \
-		sh autogen.sh && \
-		sh configure $(CONFFLAGS)
-	touch $@
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
+%:
+	dh $@ --with=python2,python3,apache2 --parallel
+
+
+override_dh_auto_configure:
+	cd libraries/libapparmor && sh ./autogen.sh
+	dh_auto_configure -D libraries/libapparmor -- --with-perl
+
+
+override_dh_auto_build:
 	# Build perl
-	$(MAKE) -C $(CURDIR)/libraries/libapparmor
+	dh_auto_build -D libraries/libapparmor
 	# Build pythons
 	for py in $(shell pyversions -s) $(shell py3versions -s) ; do \
 		cp -a $(CURDIR)/libraries/libapparmor $(CURDIR)/libraries/libapparmor.$$py && \
-		cd $(CURDIR)/libraries/libapparmor.$$py && \
-		PYTHON=/usr/bin/$$py sh configure \
-		$(CONFFLAGS) --with-python && \
-		PYTHON=/usr/bin/$$py $(MAKE); \
+		PYTHON=/usr/bin/$$py dh_auto_configure \
+			-D libraries/libapparmor.$$py -- --with-python && \
+		PYTHON=/usr/bin/$$py dh_auto_build \
+			-D libraries/libapparmor.$$py; \
 	done
 
 	# Don't run '$(MAKE) check' because of too many perl dependencies
@@ -68,18 +32,19 @@
 	cd utils && $(MAKE)
 ifneq (,$(filter $(DEB_HOST_ARCH_OS), kfreebsd knetbsd hurd ))
 	cd parser && $(MAKE) indep
-else ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	cd parser && $(MAKE) V=1 && $(MAKE) check V=1
 else
 	cd parser && $(MAKE) V=1
 endif
 	cd profiles && $(MAKE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
+
+
+override_dh_auto_test:
+ifeq (,$(filter $(DEB_HOST_ARCH_OS), kfreebsd knetbsd hurd ))
+	dh_auto_test -Dparser -- V=1
+endif
+
+
+override_dh_auto_clean:
 	for i in utils parser profiles changehat/mod_apparmor \
 		  changehat/pam_apparmor ; do \
 		[ ! -f $$i/Makefile ] || $(MAKE) -C $$i clean; \
@@ -91,14 +56,9 @@
 	cd libraries/libapparmor && [ ! -f Makefile ] || $(MAKE) distclean
 	# Remove generated debhelper documentation.
 	rm -f $(CURDIR)/debian/debhelper/dh_apparmor.1
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
+
+
+override_dh_auto_install:
 	# Utils
 	cd utils; $(MAKE) \
 	    DESTDIR=$(CURDIR)/debian/tmp \
@@ -157,59 +117,30 @@
 	# Build debhelper documentation.
 	pod2man -c Debhelper -r "$(DEB_VERSION)" $(CURDIR)/debian/debhelper/dh_apparmor $(CURDIR)/debian/debhelper/dh_apparmor.1
 
-	dh_install
 
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-	dh_installdebconf -papparmor
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
+override_dh_installinit:
 	dh_installinit --update-rcd-params='start 37 S .' --no-restart-on-upgrade --error-handler=true
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
+
+override_dh_compress:
 	dh_compress -Xextras
-	dh_fixperms
+
+override_dh_perl:
 	dh_perl -p libapparmor-perl -d
 	dh_perl --no-package=libapparmor-perl
-	dh_python2 -p python-libapparmor
-	dh_python3 -p python3-libapparmor -p apparmor -p apparmor-utils -p apparmor-easyprof
-	dh_apache2 --noenable -p libapache2-mod-apparmor
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build install
+
+override_dh_apache2:
+	dh_apache2 --noenable
+
+
+override_dh_install:
 	for profile in $(shell grep ^etc/apparmor.d/ $(CURDIR)/debian/apparmor-profiles.install | \
 			 cut -d/ -f3- | grep -v /); do \
 	    if [ -x /usr/bin/dh_apparmor ]; then \
 	        dh_apparmor --profile-name=$$profile -papparmor-profiles; \
 	    fi; \
 	done
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure
+	dh_install
+
 
 VERSION_SEP=+
 VERSION=$(shell  dpkg-parsechangelog | grep ^Version | cut -d$(VERSION_SEP) -f1 | cut -d\  -f2)