X Strike Force SVN commit: rev 252 - in trunk/debian: . patches
Author: branden
Date: 2003-06-26 14:32:42 -0500 (Thu, 26 Jun 2003)
New Revision: 252
Modified:
trunk/debian/MANIFEST.alpha
trunk/debian/MANIFEST.arm
trunk/debian/MANIFEST.hppa
trunk/debian/MANIFEST.hurd-i386
trunk/debian/MANIFEST.i386
trunk/debian/MANIFEST.ia64
trunk/debian/MANIFEST.m68k
trunk/debian/MANIFEST.mips
trunk/debian/MANIFEST.mipsel
trunk/debian/MANIFEST.netbsd-i386
trunk/debian/MANIFEST.powerpc
trunk/debian/MANIFEST.s390
trunk/debian/MANIFEST.sh3
trunk/debian/MANIFEST.sh4
trunk/debian/MANIFEST.sparc
trunk/debian/changelog
trunk/debian/control
trunk/debian/patches/046_piclib_support.diff
trunk/debian/xlibs-pic.install
trunk/debian/xlibs-pic.install.netbsd-i386
Log:
build and ship more static-PIC versions of libraries; Xau (for xcb) and
xf86misc (for xfce4)
debian/patches/046_piclib_support.diff: updated
debian/{MANIFEST,xlibs-pic.install}.*: add libXau_pic.a, libXxf86misc_pic.a
debian/control: update xlibs-pic's extended description
Modified: trunk/debian/MANIFEST.alpha
==============================================================================
--- trunk/debian/MANIFEST.alpha 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.alpha 2003-06-26 19:32:42 UTC (rev 252)
@@ -5551,6 +5551,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5589,6 +5590,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.arm
==============================================================================
--- trunk/debian/MANIFEST.arm 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.arm 2003-06-26 19:32:42 UTC (rev 252)
@@ -5549,6 +5549,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5587,6 +5588,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.hppa
==============================================================================
--- trunk/debian/MANIFEST.hppa 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.hppa 2003-06-26 19:32:42 UTC (rev 252)
@@ -5549,6 +5549,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5587,6 +5588,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.hurd-i386
==============================================================================
--- trunk/debian/MANIFEST.hurd-i386 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.hurd-i386 2003-06-26 19:32:42 UTC (rev 252)
@@ -5439,6 +5439,7 @@
usr/X11R6/lib/libX11.a
usr/X11R6/lib/libX11.so.6.2
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5473,6 +5474,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.i386
==============================================================================
--- trunk/debian/MANIFEST.i386 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.i386 2003-06-26 19:32:42 UTC (rev 252)
@@ -5552,6 +5552,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5590,6 +5591,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.ia64
==============================================================================
--- trunk/debian/MANIFEST.ia64 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.ia64 2003-06-26 19:32:42 UTC (rev 252)
@@ -5552,6 +5552,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5590,6 +5591,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.m68k
==============================================================================
--- trunk/debian/MANIFEST.m68k 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.m68k 2003-06-26 19:32:42 UTC (rev 252)
@@ -5548,6 +5548,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5586,6 +5587,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.mips
==============================================================================
--- trunk/debian/MANIFEST.mips 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.mips 2003-06-26 19:32:42 UTC (rev 252)
@@ -5550,6 +5550,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5588,6 +5589,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.mipsel
==============================================================================
--- trunk/debian/MANIFEST.mipsel 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.mipsel 2003-06-26 19:32:42 UTC (rev 252)
@@ -5550,6 +5550,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5588,6 +5589,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.netbsd-i386
==============================================================================
--- trunk/debian/MANIFEST.netbsd-i386 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.netbsd-i386 2003-06-26 19:32:42 UTC (rev 252)
@@ -5546,6 +5546,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5584,6 +5585,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
usr/X11R6/lib/libdps.a
Modified: trunk/debian/MANIFEST.powerpc
==============================================================================
--- trunk/debian/MANIFEST.powerpc 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.powerpc 2003-06-26 19:32:42 UTC (rev 252)
@@ -5550,6 +5550,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5588,6 +5589,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.s390
==============================================================================
--- trunk/debian/MANIFEST.s390 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.s390 2003-06-26 19:32:42 UTC (rev 252)
@@ -5488,6 +5488,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5526,6 +5527,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.sh3
==============================================================================
--- trunk/debian/MANIFEST.sh3 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.sh3 2003-06-26 19:32:42 UTC (rev 252)
@@ -5549,6 +5549,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5587,6 +5588,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.sh4
==============================================================================
--- trunk/debian/MANIFEST.sh4 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.sh4 2003-06-26 19:32:42 UTC (rev 252)
@@ -5549,6 +5549,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5587,6 +5588,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/MANIFEST.sparc
==============================================================================
--- trunk/debian/MANIFEST.sparc 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/MANIFEST.sparc 2003-06-26 19:32:42 UTC (rev 252)
@@ -5551,6 +5551,7 @@
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXTrap.so.6.4
usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
@@ -5589,6 +5590,7 @@
usr/X11R6/lib/libXxf86dga.a
usr/X11R6/lib/libXxf86dga_pic.a
usr/X11R6/lib/libXxf86misc.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86rush.a
usr/X11R6/lib/libXxf86vm.a
usr/X11R6/lib/libXxf86vm_pic.a
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/changelog 2003-06-26 19:32:42 UTC (rev 252)
@@ -9,6 +9,13 @@
affects the Wacom input driver and should not cause any regressions.
(thanks to James Troup for pointing out this no-longer-needed conditional)
+ * build and ship more static-PIC versions of libraries; Xau (for xcb) and
+ xf86misc (for xfce4)
+ - patch #046: updated
+ - debian/{MANIFEST,xlibs-pic.install}.*: add libXau_pic.a,
+ libXxf86misc_pic.a
+ - debian/control: update xlibs-pic's extended description
+
* patch #093: new; SECURITY: disable window title reporting to work around
potentially malicious text being spewed to terminal window
<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0063>
@@ -33,7 +40,7 @@
manpage, penmount manpage
- tdfx driver name corrected to tdfx_drv
- -- Branden Robinson <branden@debian.org> Thu, 26 Jun 2003 13:07:19 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 26 Jun 2003 14:28:34 -0500
xfree86 (4.2.1-8) unstable; urgency=high
Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/control 2003-06-26 19:32:42 UTC (rev 252)
@@ -810,11 +810,15 @@
applications.
.
The libraries available in PIC archive form include:
- - libI810XvMC
+ - libI810XvMC (Linux systems only)
+ - libXau
+ - libXinerama
- libXv
- libXvMC
- libXxf86dga
+ - libXxf86misc
- libXxf86vm
+ - libxkbfile
Package: xmh
Priority: extra
Modified: trunk/debian/patches/046_piclib_support.diff
==============================================================================
--- trunk/debian/patches/046_piclib_support.diff 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/patches/046_piclib_support.diff 2003-06-26 19:32:42 UTC (rev 252)
@@ -27,128 +27,6 @@
* SubdirLibraryRule -
*/
#ifndef SubdirLibraryRule
---- xc/lib/Xinerama/Imakefile~ 2003-02-23 20:50:38.000000000 -0500
-+++ xc/lib/Xinerama/Imakefile 2003-02-23 20:50:56.000000000 -0500
-@@ -4,6 +4,7 @@
- #define DoSharedLib SharedLibXinerama
- #define DoDebugLib DebugLibXinerama
- #define DoProfileLib ProfileLibXinerama
-+#define DoPicLib PicLibXinerama
- #define LibName Xinerama
- #define SoRev SOXINERAMAREV
- #define LibHeaders NO
---- xc/lib/Xv/Imakefile~ Tue Oct 30 13:21:16 2001
-+++ xc/lib/Xv/Imakefile Tue Oct 30 13:21:41 2001
-@@ -4,6 +4,7 @@
- #define DoSharedLib SharedLibXv
- #define DoDebugLib DebugLibXv
- #define DoProfileLib ProfileLibXv
-+#define DoPicLib PicLibXv
- #define LibName Xv
- #define SoRev SOXVREV
- #define LibHeaders NO
---- xc/lib/XvMC/Imakefile~ Wed Jun 12 01:04:05 2002
-+++ xc/lib/XvMC/Imakefile Wed Jun 12 01:04:23 2002
-@@ -4,6 +4,7 @@
- #define DoSharedLib SharedLibXvMC
- #define DoDebugLib DebugLibXvMC
- #define DoProfileLib ProfileLibXvMC
-+#define DoPicLib PicLibXvMC
- #define LibName XvMC
- #define SoRev SOXVMCREV
- #define LibHeaders NO
---- xc/lib/XvMC/hw/i810/Imakefile~ Wed Jun 12 01:04:35 2002
-+++ xc/lib/XvMC/hw/i810/Imakefile Wed Jun 12 01:04:47 2002
-@@ -3,6 +3,7 @@
- #define DoSharedLib SharedLibXvMC
- #define DoDebugLib DebugLibXvMC
- #define DoProfileLib ProfileLibXvMC
-+#define DoPicLib PicLibXvMC
- #define LibName I810XvMC
- #define SoRev SOXVMCREV
- #define LibHeaders NO
---- xc/lib/Xxf86dga/Imakefile~ Tue Oct 30 13:20:50 2001
-+++ xc/lib/Xxf86dga/Imakefile Tue Oct 30 13:21:06 2001
-@@ -4,6 +4,7 @@
- #define DoExtraLib SharedLibXxf86dga
- #define DoDebugLib DebugLibXxf86dga
- #define DoProfileLib ProfileLibXxf86dga
-+#define DoPicLib PicLibXxf86dga
- #define LibName Xxf86dga
- #define SoRev SOXXF86DGAREV
- #define LibHeaders NO
---- xc/lib/Xxf86vm/Imakefile~ Tue Oct 30 13:21:47 2001
-+++ xc/lib/Xxf86vm/Imakefile Tue Oct 30 13:21:58 2001
-@@ -4,6 +4,7 @@
- #define DoExtraLib SharedLibXxf86vm
- #define DoDebugLib DebugLibXxf86vm
- #define DoProfileLib ProfileLibXxf86vm
-+#define DoPicLib PicLibXxf86vm
- #define LibName Xxf86vm
- #define SoRev SOXXF86VMREV
- #define LibHeaders NO
---- xc/lib/xkbfile/Imakefile~ 2003-05-22 16:07:17.000000000 -0600
-+++ xc/lib/xkbfile/Imakefile 2003-05-22 16:09:21.000000000 -0600
-@@ -10,6 +10,7 @@
- #define DoExtraLib NO
- #define DoDebugLib NO
- #define DoProfileLib NO
-+#define DoPicLib YES
- #define HasSharedData NO
- #define LibName xkbfile
- #define SoRev SOXKBFILEREV
---- xc/config/cf/X11.tmpl.orig 2003-02-23 20:56:56.000000000 -0500
-+++ xc/config/cf/X11.tmpl 2003-02-23 20:56:58.000000000 -0500
-@@ -1646,6 +1646,9 @@
- #ifndef ProfileLibXxf86vm
- #define ProfileLibXxf86vm NO
- #endif
-+#ifndef PicLibXxf86vm
-+#define PicLibXxf86vm YES
-+#endif
- #endif
-
- #if BuildXF86DGALibrary
-@@ -1661,6 +1664,9 @@
- #ifndef ProfileLibXxf86dga
- #define ProfileLibXxf86dga NO
- #endif
-+#ifndef PicLibXxf86dga
-+#define PicLibXxf86dga YES
-+#endif
- #endif
-
- #if BuildXF86RushLibrary
-@@ -1691,6 +1697,9 @@
- #ifndef ProfileLibXv
- #define ProfileLibXv NO
- #endif
-+#ifndef PicLibXv
-+#define PicLibXv YES
-+#endif
- #endif
-
- #if BuildXvMCLibrary
-@@ -1706,6 +1715,9 @@
- #ifndef ProfileLibXvMC
- #define ProfileLibXvMC NO
- #endif
-+#ifndef PicLibXvMC
-+#define PicLibXvMC YES
-+#endif
- #endif
-
- #if BuildXineramaLibrary
-@@ -1721,6 +1733,9 @@
- #ifndef ProfileLibXinerama
- #define ProfileLibXinerama NO
- #endif
-+#ifndef PicLibXinerama
-+#define PicLibXinerama YES
-+#endif
- #endif
-
-
--- xc/config/cf/Library.tmpl~ 2003-02-18 21:41:20.000000000 -0500
+++ xc/config/cf/Library.tmpl 2003-02-18 21:42:00.000000000 -0500
@@ -3,7 +3,7 @@
@@ -242,3 +120,165 @@
# if DoExtraLib && defined(ExtraLibRules)
ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS))
# if !defined(LibInstall) || LibInstall
+--- xc/config/cf/X11.tmpl~ 2003-06-26 14:10:11.000000000 -0500
++++ xc/config/cf/X11.tmpl 2003-06-26 14:12:29.000000000 -0500
+@@ -1631,6 +1631,9 @@
+ #ifndef ProfileLibXxf86misc
+ #define ProfileLibXxf86misc NO
+ #endif
++#ifndef PicLibXxf86misc
++#define PicLibXxf86misc YES
++#endif
+ #endif
+
+ #if BuildXF86VidModeLibrary
+@@ -1646,6 +1649,9 @@
+ #ifndef ProfileLibXxf86vm
+ #define ProfileLibXxf86vm NO
+ #endif
++#ifndef PicLibXxf86vm
++#define PicLibXxf86vm YES
++#endif
+ #endif
+
+ #if BuildXF86DGALibrary
+@@ -1661,6 +1667,9 @@
+ #ifndef ProfileLibXxf86dga
+ #define ProfileLibXxf86dga NO
+ #endif
++#ifndef PicLibXxf86dga
++#define PicLibXxf86dga YES
++#endif
+ #endif
+
+ #if BuildXF86RushLibrary
+@@ -1691,6 +1700,9 @@
+ #ifndef ProfileLibXv
+ #define ProfileLibXv NO
+ #endif
++#ifndef PicLibXv
++#define PicLibXv YES
++#endif
+ #endif
+
+ #if BuildXvMCLibrary
+@@ -1706,6 +1718,9 @@
+ #ifndef ProfileLibXvMC
+ #define ProfileLibXvMC NO
+ #endif
++#ifndef PicLibXvMC
++#define PicLibXvMC YES
++#endif
+ #endif
+
+ #if BuildXineramaLibrary
+@@ -1721,6 +1736,9 @@
+ #ifndef ProfileLibXinerama
+ #define ProfileLibXinerama NO
+ #endif
++#ifndef PicLibXinerama
++#define PicLibXinerama YES
++#endif
+ #endif
+
+
+@@ -2090,6 +2108,9 @@
+ #ifndef ProfileLibXau
+ #define ProfileLibXau NO /* profiled auth library */
+ #endif
++#ifndef PicLibXau
++#define PicLibXau YES
++#endif
+ XAUTHSRC = $(LIBSRC)/Xau
+ #if SharedLibXau
+ #ifndef SharedXauRev
+--- xc/lib/Xau/Imakefile~ 2003-06-26 14:10:28.000000000 -0500
++++ xc/lib/Xau/Imakefile 2003-06-26 14:13:05.000000000 -0500
+@@ -10,6 +10,7 @@
+ #define DoExtraLib SharedLibXau
+ #define DoDebugLib DebugLibXau
+ #define DoProfileLib ProfileLibXau
++#define DoPicLib PicLibXau
+ #define LibName Xau
+ #define SoRev SOXAUTHREV
+ #define IncSubdir X11
+--- xc/lib/Xinerama/Imakefile~ 2003-02-23 20:50:38.000000000 -0500
++++ xc/lib/Xinerama/Imakefile 2003-02-23 20:50:56.000000000 -0500
+@@ -4,6 +4,7 @@
+ #define DoSharedLib SharedLibXinerama
+ #define DoDebugLib DebugLibXinerama
+ #define DoProfileLib ProfileLibXinerama
++#define DoPicLib PicLibXinerama
+ #define LibName Xinerama
+ #define SoRev SOXINERAMAREV
+ #define LibHeaders NO
+--- xc/lib/Xv/Imakefile~ Tue Oct 30 13:21:16 2001
++++ xc/lib/Xv/Imakefile Tue Oct 30 13:21:41 2001
+@@ -4,6 +4,7 @@
+ #define DoSharedLib SharedLibXv
+ #define DoDebugLib DebugLibXv
+ #define DoProfileLib ProfileLibXv
++#define DoPicLib PicLibXv
+ #define LibName Xv
+ #define SoRev SOXVREV
+ #define LibHeaders NO
+--- xc/lib/XvMC/Imakefile~ Wed Jun 12 01:04:05 2002
++++ xc/lib/XvMC/Imakefile Wed Jun 12 01:04:23 2002
+@@ -4,6 +4,7 @@
+ #define DoSharedLib SharedLibXvMC
+ #define DoDebugLib DebugLibXvMC
+ #define DoProfileLib ProfileLibXvMC
++#define DoPicLib PicLibXvMC
+ #define LibName XvMC
+ #define SoRev SOXVMCREV
+ #define LibHeaders NO
+--- xc/lib/XvMC/hw/i810/Imakefile~ Wed Jun 12 01:04:35 2002
++++ xc/lib/XvMC/hw/i810/Imakefile Wed Jun 12 01:04:47 2002
+@@ -3,6 +3,7 @@
+ #define DoSharedLib SharedLibXvMC
+ #define DoDebugLib DebugLibXvMC
+ #define DoProfileLib ProfileLibXvMC
++#define DoPicLib PicLibXvMC
+ #define LibName I810XvMC
+ #define SoRev SOXVMCREV
+ #define LibHeaders NO
+--- xc/lib/Xxf86dga/Imakefile~ Tue Oct 30 13:20:50 2001
++++ xc/lib/Xxf86dga/Imakefile Tue Oct 30 13:21:06 2001
+@@ -4,6 +4,7 @@
+ #define DoExtraLib SharedLibXxf86dga
+ #define DoDebugLib DebugLibXxf86dga
+ #define DoProfileLib ProfileLibXxf86dga
++#define DoPicLib PicLibXxf86dga
+ #define LibName Xxf86dga
+ #define SoRev SOXXF86DGAREV
+ #define LibHeaders NO
+--- xc/lib/Xxf86misc/Imakefile~ 2003-06-26 14:10:36.000000000 -0500
++++ xc/lib/Xxf86misc/Imakefile 2003-06-26 14:13:26.000000000 -0500
+@@ -4,6 +4,7 @@
+ #define DoExtraLib SharedLibXxf86misc
+ #define DoDebugLib DebugLibXxf86misc
+ #define DoProfileLib ProfileLibXxf86misc
++#define DoPicLib PicLibXxf86misc
+ #define LibName Xxf86misc
+ #define SoRev SOXXF86MISCREV
+ #define LibHeaders NO
+--- xc/lib/Xxf86vm/Imakefile~ Tue Oct 30 13:21:47 2001
++++ xc/lib/Xxf86vm/Imakefile Tue Oct 30 13:21:58 2001
+@@ -4,6 +4,7 @@
+ #define DoExtraLib SharedLibXxf86vm
+ #define DoDebugLib DebugLibXxf86vm
+ #define DoProfileLib ProfileLibXxf86vm
++#define DoPicLib PicLibXxf86vm
+ #define LibName Xxf86vm
+ #define SoRev SOXXF86VMREV
+ #define LibHeaders NO
+--- xc/lib/xkbfile/Imakefile~ 2003-05-22 16:07:17.000000000 -0600
++++ xc/lib/xkbfile/Imakefile 2003-05-22 16:09:21.000000000 -0600
+@@ -10,6 +10,7 @@
+ #define DoExtraLib NO
+ #define DoDebugLib NO
+ #define DoProfileLib NO
++#define DoPicLib YES
+ #define HasSharedData NO
+ #define LibName xkbfile
+ #define SoRev SOXKBFILEREV
Modified: trunk/debian/xlibs-pic.install
==============================================================================
--- trunk/debian/xlibs-pic.install 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/xlibs-pic.install 2003-06-26 19:32:42 UTC (rev 252)
@@ -1,7 +1,9 @@
usr/X11R6/lib/libI810XvMC_pic.a
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXinerama_pic.a
usr/X11R6/lib/libXvMC_pic.a
usr/X11R6/lib/libXv_pic.a
usr/X11R6/lib/libXxf86dga_pic.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86vm_pic.a
usr/X11R6/lib/libxkbfile_pic.a
Modified: trunk/debian/xlibs-pic.install.netbsd-i386
==============================================================================
--- trunk/debian/xlibs-pic.install.netbsd-i386 2003-06-26 19:06:29 UTC (rev 251)
+++ trunk/debian/xlibs-pic.install.netbsd-i386 2003-06-26 19:32:42 UTC (rev 252)
@@ -1,3 +1,4 @@
+usr/X11R6/lib/libXau_pic.a
usr/X11R6/lib/libXinerama_pic.a
usr/X11R6/lib/libXvMC_pic.a
usr/X11R6/lib/libXv_pic.a
@@ -2,2 +3,3 @@
usr/X11R6/lib/libXxf86dga_pic.a
+usr/X11R6/lib/libXxf86misc_pic.a
usr/X11R6/lib/libXxf86vm_pic.a
Reply to: