Author: branden
Date: 2003-09-17 23:19:43 -0500 (Wed, 17 Sep 2003)
New Revision: 544
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff
Log:
debian/patches/063_fix_weak_deps.diff: fix weak shared object dependencies
in libDPS and libDPSTK (Closes: #210651)
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-09-17 22:33:30 UTC (rev 543)
+++ branches/4.3.0/sid/debian/changelog 2003-09-18 04:19:43 UTC (rev 544)
@@ -148,8 +148,11 @@
+ ($(STAMPDIR)/binary-arch): depends on debian/shlibs.local
+ ($(STAMPDIR)/binary-server): depends on debian/shlibs.local
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 17 Sep 2003 17:24:56 -0500
+ * debian/patches/063_fix_weak_deps.diff: fix weak shared object dependencies
+ in libDPS and libDPSTK (Closes: #210651)
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 17 Sep 2003 23:17:30 -0500
+
xfree86 (4.3.0-0pre1v1) experimental; urgency=low
* new upstream release
Modified: branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff 2003-09-17
22:33:30 UTC (rev 543)
+++ branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff 2003-09-18
04:19:43 UTC (rev 544)
@@ -1,29 +1,27 @@
$Id$
-This patch fixes several 'weak' dependencies:
- * libXpm: libX11
- * libXp: libX11, libXext
+This patch fixes several 'weak' shared library dependencies:
+ * libGLU: libGL
* libXmuu: libX11
+ * libXp: libX11, libXext
+ * libXpm: libX11
* libXrandr: libX11, libXext, libXrender
- * libGLU: libGL
+ * libDPS: libXt, libX11
+ * libDPSTK: libDPS, libX11
-Note:
- Debian will not ship libGLU binary from XFree86 source tree.
- But these weak depencencies should be fixed on upstream,
- of casuse we, XSF, will send this patch to upstream so it
- includes libGLU related things.
-
---- xc/config/cf/lnxLib.tmpl.orig 2003-06-22 20:17:28.000000000 +0900
-+++ xc/config/cf/lnxLib.tmpl 2003-06-22 20:20:48.000000000 +0900
-@@ -32,6 +32,11 @@
+--- xc/config/cf/lnxLib.tmpl~ 2003-09-17 22:54:47.000000000 -0500
++++ xc/config/cf/lnxLib.tmpl 2003-09-17 23:10:22.000000000 -0500
+@@ -32,6 +32,13 @@
#define SharedXtstReqs $(LDPRELIB) $(XLIB)
#define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
#define SharedSMReqs $(LDPRELIB) $(ICELIB)
-+#define SharedXpmReqs $(LDPRELIB) $(XONLYLIB)
-+#define SharedXpReqs $(LDPRELIB) $(EXTENSIONLIB) $(XONLYLIB)
++#define SharedGLUReqs $(LDPRELIB) $(GLXLIB)
+#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB)
++#define SharedXpReqs $(LDPRELIB) $(EXTENSIONLIB) $(XONLYLIB)
++#define SharedXpmReqs $(LDPRELIB) $(XONLYLIB)
+#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(EXTENSIONLIB)
$(XONLYLIB)
-+#define SharedGLUReqs $(LDPRELIB) $(GLXLIB)
++#define SharedDPSReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
++#define SharedDPSTKReqs $(LDPRELIB) $(DPSLIB) $(XLIB)
#if GlxUseBuiltInDRIDriver
#define ExtraSharedGLReqs /**/
