X Strike Force X.Org X11 SVN commit: r1045 - trunk/debian
Author: dnusinow
Date: 2006-01-09 15:51:55 -0500 (Mon, 09 Jan 2006)
New Revision: 1045
Modified:
trunk/debian/changelog
trunk/debian/rules
Log:
* When generating shlibdeps for libx11, unset DH_OPTIONS so that the -p
switch actually takes effect and we don't generate the wrong shlibdeps for
every package. Once we've generated the shlibdeps, reset the vairable to
-s. This should allow libraries from xorg-x11 to properly depend on
libx11-6. Thanks Daniel Kobras and Eugene Konev. (closes: #347228)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-09 20:41:15 UTC (rev 1044)
+++ trunk/debian/changelog 2006-01-09 20:51:55 UTC (rev 1045)
@@ -42,8 +42,13 @@
* Remove some cruft leftover from libdps in debian/rules
* Corrent NEWS version number from last upload. Thanks Sven Koch.
(closes: #347265)
+ * When generating shlibdeps for libx11, unset DH_OPTIONS so that the -p
+ switch actually takes effect and we don't generate the wrong shlibdeps for
+ every package. Once we've generated the shlibdeps, reset the vairable to
+ -s. This should allow libraries from xorg-x11 to properly depend on
+ libx11-6. Thanks Daniel Kobras and Eugene Konev. (closes: #347228)
- -- David Nusinow <dnusinow@debian.org> Mon, 9 Jan 2006 15:40:21 -0500
+ -- David Nusinow <dnusinow@debian.org> Mon, 9 Jan 2006 15:49:11 -0500
xorg-x11 (6.9.0.dfsg.1-2) unstable; urgency=low
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2006-01-09 20:41:15 UTC (rev 1044)
+++ trunk/debian/rules 2006-01-09 20:51:55 UTC (rev 1045)
@@ -585,7 +585,7 @@
chmod ug+s debian/xserver-common/usr/X11R6/bin/X
dh_installdeb
dh_shlibdeps -Nlibx11-6 -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib --exclude=usr/X11R6/lib/modules
- dh_shlibdeps -plibx11-6 -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib -- -Ldebian/libx11-6.shlibs.local
+ unset DH_OPTIONS; dh_shlibdeps -plibx11-6 -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib -- -Ldebian/libx11-6.shlibs.local; DH_OPTIONS=-s
dh_gencontrol -- -VF:XWSC-Special-Depends=$(XWSC_SPECIAL_DEPENDS) \
-VF:XWSD-Special-Depends=$(XWSD_SPECIAL_DEPENDS)
dh_md5sums
Reply to: