X Strike Force X.Org X11 SVN commit: r1049 - trunk/debian
Author: dnusinow
Date: 2006-01-09 16:34:46 -0500 (Mon, 09 Jan 2006)
New Revision: 1049
Modified:
trunk/debian/changelog
trunk/debian/rules
Log:
* Don't reset DH_OPTIONS after unsetting it for libx11 shlibs generation.
Each command runs in its own shell, so resetting it won't accomplish
anything. Thanks Russ Allbery. This fix for #347228 is Eugene Konev's.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-09 21:05:04 UTC (rev 1048)
+++ trunk/debian/changelog 2006-01-09 21:34:46 UTC (rev 1049)
@@ -44,11 +44,11 @@
(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 variable to
- -s. This should allow libraries from xorg-x11 to properly depend on
- libx11-6. Thanks Daniel Kobras and Eugene Konev. (closes: #347228)
+ every package. This should allow libraries from xorg-x11 to properly
+ depend on libx11-6. Thanks Daniel Kobras, Eugene Konev, and Russ Allbery.
+ (closes: #347228)
- -- David Nusinow <dnusinow@debian.org> Mon, 9 Jan 2006 15:59:33 -0500
+ -- David Nusinow <dnusinow@debian.org> Mon, 9 Jan 2006 16:32:30 -0500
xorg-x11 (6.9.0.dfsg.1-2) unstable; urgency=low
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2006-01-09 21:05:04 UTC (rev 1048)
+++ trunk/debian/rules 2006-01-09 21:34:46 UTC (rev 1049)
@@ -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
- unset DH_OPTIONS; dh_shlibdeps -plibx11-6 -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib -- -Ldebian/libx11-6.shlibs.local; DH_OPTIONS=-s
+ unset DH_OPTIONS; dh_shlibdeps -plibx11-6 -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib -- -Ldebian/libx11-6.shlibs.local
dh_gencontrol -- -VF:XWSC-Special-Depends=$(XWSC_SPECIAL_DEPENDS) \
-VF:XWSD-Special-Depends=$(XWSD_SPECIAL_DEPENDS)
dh_md5sums
Reply to: