X Strike Force XFree86 SVN commit: rev 800 - people/branden/xlibs-and-xbase-clients-split/debian
Author: branden
Date: 2003-12-01 15:07:16 -0500 (Mon, 01 Dec 2003)
New Revision: 800
Added:
people/branden/xlibs-and-xbase-clients-split/debian/libdps1.shlibs.local
people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.shlibs.local
Modified:
people/branden/xlibs-and-xbase-clients-split/debian/changelog
people/branden/xlibs-and-xbase-clients-split/debian/rules
Log:
Add special dh_shlibdeps handling for libdps1 and libx11-6. Add special
local shlibs files for use during the package build so that libdps1 and
libx11-6 do not get spurious self-dependencies; libdps1 ships three related
shared libraries, and libx11-6 ships loadable modules for Xlib that
reference symbols in Xlib -- both of these cases confuse dpkg-shlibdeps
(via dh_shlibdeps).
Modified: people/branden/xlibs-and-xbase-clients-split/debian/changelog
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/changelog 2003-12-01 19:08:53 UTC (rev 799)
+++ people/branden/xlibs-and-xbase-clients-split/debian/changelog 2003-12-01 20:07:16 UTC (rev 800)
@@ -59,7 +59,7 @@
- debian/xlibs.{dirs,links,postinst.in,postrm.in,preinst.in,shlibs,
shlibs.dummy}: deleted
- debian/rules: eliminate special dh_shlibdeps handling for xlibs package;
- no longer needed
+ add special dh_shlibdeps handling for libdps1 and libx11-6 (see below)
- debian/scripts/manifest-install-reconcile: add libxrx shared library and
object to list of files expected to be unshipped
- debian/shell-lib.sh: define new functions to aid maintainer scripts of
@@ -80,6 +80,12 @@
versioned dependencies on older versions of xlibs (except in the case of
libxv1, for which a shared version did not exist in XFree86 prior to
4.3)
+ - debian/{libdps1,libx11-6}.shlibs.local: add special local shlibs files
+ for use during the package build so that libdps1 and libx11-6 do not get
+ spurious self-dependencies; libdps1 ships three related shared
+ libraries, and libx11-6 ships loadable modules for Xlib that reference
+ symbols in Xlib -- both of these cases confuse dpkg-shlibdeps (via
+ dh_shlibdeps)
- debian/{libice6,libsm6,libx11-6,libxext6,libxft1,libxi6,libxmu6,
libxmuu1,libxp6,libxpm4,libxrandr2,libxt6,libxtrap6,libxtst6,
libxv1}.{postinst,postrm}: new; call register_x_lib_dir_with_ld_so(),
Added: people/branden/xlibs-and-xbase-clients-split/debian/libdps1.shlibs.local
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/libdps1.shlibs.local 2003-12-01 19:08:53 UTC (rev 799)
+++ people/branden/xlibs-and-xbase-clients-split/debian/libdps1.shlibs.local 2003-12-01 20:07:16 UTC (rev 800)
@@ -0,0 +1,3 @@
+libdps 1
+libdpstk 1
+libpsres 1
Added: people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.shlibs.local
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.shlibs.local 2003-12-01 19:08:53 UTC (rev 799)
+++ people/branden/xlibs-and-xbase-clients-split/debian/libx11-6.shlibs.local 2003-12-01 20:07:16 UTC (rev 800)
@@ -0,0 +1 @@
+libX11 6
Modified: people/branden/xlibs-and-xbase-clients-split/debian/rules
===================================================================
--- people/branden/xlibs-and-xbase-clients-split/debian/rules 2003-12-01 19:08:53 UTC (rev 799)
+++ people/branden/xlibs-and-xbase-clients-split/debian/rules 2003-12-01 20:07:16 UTC (rev 800)
@@ -422,7 +422,9 @@
chown :utmp debian/xterm/usr/X11R6/bin/xterm
chmod g+s debian/xterm/usr/X11R6/bin/xterm
dh_installdeb
- dh_shlibdeps -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib --exclude=usr/X11R6/lib/modules
+ dh_shlibdeps -Nlibdps1 -Nlibx11-6 -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib --exclude=usr/X11R6/lib/modules
+ dh_shlibdps -plibdps1 -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib -- -Ldebian/libdps1.shlibs.local
+ dh_shlibdps -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:Xlibmesa-gl-Special-Depends=$(XLIBMESA_GL_SPECIAL_DEPENDS)
dh_md5sums
dh_builddeb
Reply to: