Source: cyrus-sasl2 Version: 2.1.26.dfsg1-11 Severity: wishlist Tags: patch
Hi, As promised, here's the second part of the patch; it adds build profile annotations to the control file and simplifies the changes to the rules file a bit. There's a little catch: since the build profile-aware versions of the build tools (dpkg-dev, debhelper, sbuild) have not hit a stable release yet, making this change might have to wait until Jessie is released, since right now the Debian archive build infrastructure cannot handle these annotations. Thanks again for your work on Debian! G'luck, Peter -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (990, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.14-2-amd64 (SMP w/4 CPU cores) Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
From 0edf39da72847292d1b7a851b746e63dff7bc912 Mon Sep 17 00:00:00 2001 From: Peter Pentchev <[email protected]> Date: Tue, 22 Jul 2014 03:18:42 +0300 Subject: [PATCH] Add the build profile annotations to d/control. Add the <profile.*> and Build-Profiles annotations to debian/control. Remove the -N... debhelper options from the rules file. --- debian/control | 11 +++++++---- debian/rules | 15 ++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/control b/debian/control index 4536f9a..6eb6edd 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: standard Maintainer: Debian Cyrus SASL Team <[email protected]> Uploaders: Fabian Fagerholm <[email protected]>, Roberto C. Sanchez <[email protected]>, Ondřej Surý <[email protected]>, Adam Conrad <[email protected]> Standards-Version: 3.9.5 -# For stage1 builds, remove libpq-dev, heimdal-multidev, and libldap2-dev. Build-Depends: debhelper (>= 9), quilt, automake (>= 1:1.14), @@ -13,12 +12,12 @@ Build-Depends: debhelper (>= 9), libpam0g-dev, libssl-dev, libmysqlclient-dev | libmysqlclient15-dev, - libpq-dev, - heimdal-multidev, + libpq-dev <!profile.stage1>, + heimdal-multidev <!profile.stage1>, krb5-multidev, libkrb5-dev, libsqlite3-dev, - libldap2-dev, + libldap2-dev <!profile.stage1>, chrpath, groff-base, po-debconf, @@ -113,6 +112,7 @@ Package: libsasl2-modules-ldap Priority: extra Architecture: any Multi-Arch: same +Build-Profiles: !stage1 Depends: libsasl2-modules (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Cyrus SASL - pluggable authentication modules (LDAP) This is the Cyrus SASL API implementation, version 2.1. See package @@ -135,6 +135,7 @@ Package: libsasl2-modules-sql Priority: extra Architecture: any Multi-Arch: same +Build-Profiles: !stage1 Depends: libsasl2-modules (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Cyrus SASL - pluggable authentication modules (SQL) This is the Cyrus SASL API implementation, version 2.1. See package @@ -176,6 +177,7 @@ Package: libsasl2-modules-gssapi-heimdal Architecture: any Multi-Arch: same Priority: extra +Build-Profiles: !stage1 Depends: libsasl2-modules (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} @@ -228,6 +230,7 @@ Section: debug Architecture: any Multi-Arch: same Priority: extra +Build-Profiles: !stage1 Depends: cyrus-sasl2-dbg (= ${binary:Version}), libsasl2-modules-gssapi-heimdal (= ${binary:Version}), ${misc:Depends} diff --git a/debian/rules b/debian/rules index 39758f3..297b422 100755 --- a/debian/rules +++ b/debian/rules @@ -31,11 +31,8 @@ BDB_VERSION ?= $(shell LC_ALL=C dpkg-query -l 'libdb[45].[0-9]-dev' | grep ^ii | ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) CONFIGURE_PROFILE=--enable-sql --with-ldap --enable-ldapdb -DH_PACKAGE_EXCLUDES= else CONFIGURE_PROFILE=--disable-sql --without-ldap --disable-ldapdb -DH_PACKAGE_EXCLUDES=-Nlibsasl2-modules-sql -Nlibsasl2-modules-ldap \ - -Nlibsasl2-modules-gssapi-heimdal -Ncyrus-sasl2-heimdal-dbg SASL_SKIP_SQL= 1 SASL_SKIP_HEIMDAL= 1 @@ -93,7 +90,7 @@ BUILD_TMP_SUFFIX=.debian-build.tmp ### The Makefile targets begin. ### %: - dh $@ --with=quilt --with=autotools_dev --with=autoreconf $(DH_PACKAGE_EXCLUDES) + dh $@ --with=quilt --with=autotools_dev --with=autoreconf override_dh_auto_clean: dh_auto_clean -B$(TMPBUILD_MIT) @@ -206,23 +203,23 @@ endif $(TMPPKG_MIT)/etc/logcheck/ignore.d.server/libsasl2-modules override_dh_install: - dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_MIT) -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-db -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev -Nlibsasl2-modules-gssapi-heimdal $(DH_PACKAGE_EXCLUDES) + dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_MIT) -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-db -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev -Nlibsasl2-modules-gssapi-heimdal ifeq (,$(SASL_SKIP_HEIMDAL)) - dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_HEIMDAL) -plibsasl2-modules-gssapi-heimdal -Nsasl2-bin -Nlibsasl2-2 -Nlibsasl2-modules -Nlibsasl2-modules-db -Nlibsasl2-modules-ldap -Nlibsasl2-modules-otp -Nlibsasl2-modules-sql -Nlibsasl2-modules-gssapi-mit -Nlibsasl2-dev $(DH_PACKAGE_EXCLUDES) + dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_HEIMDAL) -plibsasl2-modules-gssapi-heimdal -Nsasl2-bin -Nlibsasl2-2 -Nlibsasl2-modules -Nlibsasl2-modules-db -Nlibsasl2-modules-ldap -Nlibsasl2-modules-otp -Nlibsasl2-modules-sql -Nlibsasl2-modules-gssapi-mit -Nlibsasl2-dev endif override_dh_installinit: - dh_installinit $(DH_PACKAGE_EXCLUDES) --name=saslauthd start 20 2 3 4 5 . stop 20 0 1 6 . + dh_installinit --name=saslauthd start 20 2 3 4 5 . stop 20 0 1 6 . override_dh_strip: - dh_strip -Xlibgssapiv2.so. -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-db -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev -Nlibsasl2-modules-gssapi-heimdal $(DH_PACKAGE_EXCLUDES) --dbg-package=cyrus-sasl2-dbg + dh_strip -Xlibgssapiv2.so. -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-db -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev -Nlibsasl2-modules-gssapi-heimdal --dbg-package=cyrus-sasl2-dbg dh_strip -Xlibgs2.so.3 -Xlibscram.so. -plibsasl2-modules-gssapi-mit --dbg-package=cyrus-sasl2-mit-dbg ifeq (,$(SASL_SKIP_HEIMDAL)) dh_strip -plibsasl2-modules-gssapi-heimdal -Nsasl2-bin -Nlibsasl2-2 -Nlibsasl2-modules -Nlibsasl2-modules-db -Nlibsasl2-modules-ldap -Nlibsasl2-modules-otp -Nlibsasl2-modules-sql -Nlibsasl2-modules-gssapi-mit -Nlibsasl2-dev --dbg-package=cyrus-sasl2-heimdal-dbg endif override_dh_makeshlibs: - dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/sasl2 $(DH_PACKAGE_EXCLUDES) + dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/sasl2 override_dh_auto_test: cd $(TMPBUILD_MIT)/saslauthd && $(MAKE) testsaslauthd -- 2.1.0.rc1
signature.asc
Description: Digital signature
