Package: release.debian.org
Severity: normal
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
I have uploaded cyrus-sasl2/2.1.23.dfsg1-7, which fixes RC bug #601977.
Please note that this version introduces a new binary package
(cyrus-sasl2-mit-dbg). This was discussed and approved by Adam D.
Barratt (please see the messages in #601977 for reference). I would
appreciate it if the package could be unblocked. I have attached the
final debdiff for reference as well.
Regards,
- -Roberto
- -- System Information:
Debian Release: 5.0.7
APT prefers stable
APT policy: (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 2.6.26-2-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iQIcBAEBCAAGBQJNDP46AAoJECzXeF7dp7IPnkYP/jHnfGRQ2n/cbLNcafS8LRkJ
bhW684JSiU/27dHoDV6iY0wmnTi54iPjB5ddbgu0Jnxn0YukXfJN9uI9WmeLH5sx
qgb4sjcHRXiNWHDUNcYZjxXwUb0vTWAgwuqov5P9NdQgu7G8FmAHlINmTuZpKi/O
b9j8u25Xze73twC8UV+cvTbNE0ACSoQed5YHK5/70X9kVZdzj8/j1lraDNTI+Mhm
LUzYKIL09a/BtTvE7T5QrdTEBNlR0JEuRGLkx007R24ZU/8hd2eMvARhKsdT6/Fk
l7cAnF4oeeCbuaDvi9CwQ6gXp9Z9H07XfCI8ripnBOpedwtD/wU2xyuPl0qmmi/Y
sOohov7e/ZlDENTjXLCCzuyvhDbBqvMwiuFsCO59Zp8cR8ERqZgpafbZH6bXVKp4
83JzHh0wOQvO8mmRKIqyQzmjR66uO02DudtN/yuW5QFSvsZSXdPjDXnJ91ZFikF+
mbYWeP0RmrqiUDriFEeLeB0Atd3FrybdrG5IoiE4+JWDic8XzzBODLuur4RlE5xV
kUdrk6YFylStqaM4g5aBxpaOmb+mWX7P4H6ccqhCA9s0JU/aqx1RMxkvbf2cENj1
FhrL3q41+PxPXV6dtVK+TTvk3Zv+i92iJkr14itg9VAYSZe9SPDUobIGhHtGrQZD
oz7JWF53e6R1e+k+OYou
=gQ/e
-----END PGP SIGNATURE-----
diff -u cyrus-sasl2-2.1.23.dfsg1/debian/changelog cyrus-sasl2-2.1.23.dfsg1/debian/changelog
--- cyrus-sasl2-2.1.23.dfsg1/debian/changelog
+++ cyrus-sasl2-2.1.23.dfsg1/debian/changelog
@@ -1,6 +1,30 @@
+cyrus-sasl2 (2.1.23.dfsg1-7) unstable; urgency=low
+
+ [ Luca Capello ]
+ * Fix for (Closes: #601977), the idea coming from Gaudenz Steinlin
+ <gaud...@debian.org>:
+ + debian/control:
+ - cyrus-sasl2-dbg Depends: on one of the two GSSAPI dbg packages.
+ - new cyrus-sasl2-mit-dbg package which Conflicts: with
+ cyrus-sasl2-heimdal-dbg.
+ - cyrus-sasl2-heimdal-dbg now Conflicts: with cyrus-sasl2-mit-dbg.
+ + debian/cyrus-sasl2-heimdal-dbg.preinst:
+ - remove, useless.
+ + debian/cyrus-sasl2-heimdal-dbg.postrm:
+ - remove, useless.
+ + debian/cyrus-sasl2-mit-dbg.dirs:
+ - create /usr/lib/debug/usr/lib/sasl2/.
+ + debian/rules:
+ - mv MIT libgssapiv2.so.2.0.23 into cyrus-sasl2-mit-dbg.
+
+ [ Roberto C. Sanchez ]
+ * Thanks to Luca Capello for providing the patch.
+
+ -- Roberto C. Sanchez <robe...@connexer.com> Sat, 18 Dec 2010 11:14:59 -0500
+
cyrus-sasl2 (2.1.23.dfsg1-6) unstable; urgency=low
- * Acknowlge NMU (thanks to Ben Hutchings)
+ * Acknowledge NMU (thanks to Ben Hutchings)
* Merge cyrus-sasl2 and cyrus-sasl2-heimdal source packages (Closes: #568358)
+ Build against new heimdal-multidev (Closes: #591147)
* Properly detect presence of Heimdal (Closes: #590912); thanks tremendously
diff -u cyrus-sasl2-2.1.23.dfsg1/debian/control cyrus-sasl2-2.1.23.dfsg1/debian/control
--- cyrus-sasl2-2.1.23.dfsg1/debian/control
+++ cyrus-sasl2-2.1.23.dfsg1/debian/control
@@ -141,7 +141,7 @@
Section: debug
Architecture: any
Priority: extra
-Depends: libsasl2-2 (= ${binary:Version}), ${misc:Depends}
+Depends: libsasl2-2 (= ${binary:Version}), ${misc:Depends}, cyrus-sasl2-mit-dbg | cyrus-sasl2-heimdal-dbg
Description: Cyrus SASL - debugging symbols
This is the Cyrus SASL API implementation, version 2. See package
libsasl2-2 and RFC 2222 for more information.
@@ -151,11 +151,28 @@
library or tools. You may be asked to install this package if you encounter
such a crash.
+Package: cyrus-sasl2-mit-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: cyrus-sasl2-dbg (= ${binary:Version}), libsasl2-modules-gssapi-mit (= ${binary:Version}), ${misc:Depends}
+Conflicts: cyrus-sasl2-heimdal-dbg
+Description: Cyrus SASL - debugging symbols
+ This is the Cyrus SASL API implementation, version 2. See package
+ libsasl2-2 and RFC 2222 for more information.
+ .
+ This package contains the debugging symbols for the Cyrus SASL MIT
+ GSSAPI modules package (libsasl2-modules-gssapi-mit). The debugging
+ symbols can be useful when investigating crashes in the SASL library or
+ tools. You may be asked to install this package if you encounter such a
+ crash.
+
Package: cyrus-sasl2-heimdal-dbg
Section: debug
Architecture: any
Priority: extra
Depends: cyrus-sasl2-dbg (= ${binary:Version}), libsasl2-modules-gssapi-heimdal (= ${binary:Version}), ${misc:Depends}
+Conflicts: cyrus-sasl2-mit-dbg
Description: Debugging symbols for Cyrus SASL
This is the Cyrus SASL API implementation, version 2. See package
libsasl2-2 and RFC 2222 for more information.
reverted:
--- cyrus-sasl2-2.1.23.dfsg1/debian/cyrus-sasl2-heimdal-dbg.preinst
+++ cyrus-sasl2-2.1.23.dfsg1.orig/debian/cyrus-sasl2-heimdal-dbg.preinst
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-if [ install = "$1" ]; then
- dpkg-divert --package cyrus-sasl2-heimdal-dbg --divert /usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.23.mit --rename /usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.23
-fi
-
reverted:
--- cyrus-sasl2-2.1.23.dfsg1/debian/cyrus-sasl2-heimdal-dbg.postrm
+++ cyrus-sasl2-2.1.23.dfsg1.orig/debian/cyrus-sasl2-heimdal-dbg.postrm
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-if [ remove = "$1" ]; then
- dpkg-divert --package cyrus-sasl2-heimdal-dbg --rename --remove /usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.23
-fi
-
diff -u cyrus-sasl2-2.1.23.dfsg1/debian/rules cyrus-sasl2-2.1.23.dfsg1/debian/rules
--- cyrus-sasl2-2.1.23.dfsg1/debian/rules
+++ cyrus-sasl2-2.1.23.dfsg1/debian/rules
@@ -215,10 +215,10 @@
# Certain symlinks get created too late, resulting in a
# build failure. We work around this by running make twice,
# ignoring the first failure.
- -(cd $(TMPBUILD_MIT); $(MAKE);)
- (cd $(TMPBUILD_MIT); $(MAKE);)
- -(cd $(TMPBUILD_HEIMDAL); $(MAKE);)
- (cd $(TMPBUILD_HEIMDAL); $(MAKE);)
+ -cd $(TMPBUILD_MIT) && $(MAKE)
+ cd $(TMPBUILD_MIT) && $(MAKE)
+ -cd $(TMPBUILD_HEIMDAL) && $(MAKE)
+ cd $(TMPBUILD_HEIMDAL) && $(MAKE)
# Build sample-{client,server}
$(MAKE) -f $(CURDIR)/debian/sample/Makefile -C $(CURDIR)/sample T=$(TMPBUILD_MIT)
@@ -246,8 +246,8 @@
dh_testroot
dh_clean -k
- (cd $(TMPBUILD_MIT); $(MAKE) install DESTDIR=$(TMPPKG_MIT))
- (cd $(TMPBUILD_HEIMDAL); $(MAKE) install DESTDIR=$(TMPPKG_HEIMDAL))
+ cd $(TMPBUILD_MIT) && $(MAKE) install DESTDIR=$(TMPPKG_MIT)
+ cd $(TMPBUILD_HEIMDAL) && $(MAKE) install DESTDIR=$(TMPPKG_HEIMDAL)
# Alter the default location and names of files to fit Debian
# policy and better integrate with the Debian system.
@@ -308,6 +308,7 @@
dh_link -s
dh_strip -s -psasl2-bin -plibsasl2-2 -plibsasl2-modules -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 -s -plibsasl2-modules-gssapi-heimdal -Nsasl2-bin -Nlibsasl2-2 -Nlibsasl2-modules -Nlibsasl2-modules-ldap -Nlibsasl2-modules-otp -Nlibsasl2-modules-sql -Nlibsasl2-modules-gssapi-mit -Nlibsasl2-dev --dbg-package=cyrus-sasl2-heimdal-dbg
+ mv debian/cyrus-sasl2-dbg/usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.23 debian/cyrus-sasl2-mit-dbg/usr/lib/debug/usr/lib/sasl2/
dh_compress -s
dh_fixperms -s
dh_makeshlibs -s -X/usr/lib/sasl2
only in patch2:
unchanged:
--- cyrus-sasl2-2.1.23.dfsg1.orig/debian/cyrus-sasl2-mit-dbg.dirs
+++ cyrus-sasl2-2.1.23.dfsg1/debian/cyrus-sasl2-mit-dbg.dirs
@@ -0,0 +1 @@
+usr/lib/debug/usr/lib/sasl2/
