[23839] in Source-Commits
/svn/athena r23450 - trunk/debathena/debathena/libnss-nonlocal/debian
daemon@ATHENA.MIT.EDU (andersk@MIT.EDU)
Thu Feb 5 02:11:19 2009
Date: Thu, 5 Feb 2009 02:10:53 -0500 (EST)
From: andersk@MIT.EDU
Message-Id: <200902050710.CAA25702@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2009-02-05 02:10:52 -0500 (Thu, 05 Feb 2009)
New Revision: 23450
Modified:
trunk/debathena/debathena/libnss-nonlocal/debian/changelog
trunk/debathena/debathena/libnss-nonlocal/debian/rules
Log:
In libnss-nonlocal:
* Only exclude glibc-private for new enough libc6, because old
dpkg-shlibdeps does not support -x.
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/changelog
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/changelog 2009-02-05 06:33:07 UTC (rev 23449)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/changelog 2009-02-05 07:10:52 UTC (rev 23450)
@@ -1,3 +1,10 @@
+libnss-nonlocal (1.8-0debathena4) unstable; urgency=low
+
+ * Only exclude glibc-private for new enough libc6, because old
+ dpkg-shlibdeps does not support -x.
+
+ -- Anders Kaseorg <andersk@mit.edu> Thu, 05 Feb 2009 01:59:08 -0500
+
libnss-nonlocal (1.8-0debathena3) unstable; urgency=low
* Force exclusion of glibc-private dependency. This is necessary for
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/rules
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/rules 2009-02-05 06:33:07 UTC (rev 23449)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/rules 2009-02-05 07:10:52 UTC (rev 23450)
@@ -10,8 +10,12 @@
include /usr/share/cdbs/1/class/autotools.mk
DEB_CONFIGURE_PREFIX = /
-DEB_DH_SHLIBDEPS_ARGS = -- -xglibc-private
+LIBC6_VERSION := $(shell dpkg-query --showformat='$${Version}' --show libc6)
+ifeq ($(shell dpkg --compare-versions '$(LIBC6_VERSION)' '>=' '2.8+20080809' && echo y),y)
+ DEB_DH_SHLIBDEPS_ARGS = -- -xglibc-private
+endif
+
debian/stamp-autotools-files: DEB_AUTO_UPDATE_AUTOMAKE += --foreign --add-missing
debian/stamp-autotools-files: aclocal.m4
