X Strike Force X.Org X11 SVN commit: r235 - in trunk/debian: . patches
Author: branden
Date: 2005-06-20 12:07:06 -0500 (Mon, 20 Jun 2005)
New Revision: 235
Modified:
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.hurd-i386.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/changelog
trunk/debian/patches/908_debian_exclude_non-free_fonts_and_docs.diff
Log:
Update patch #908 to stop attempting to install the sourceless microcode
files associated with the rendition driver, which are not part of the
source package (see debian/copyright). Correct
debian/MANIFEST.{alpha,amd64,hurd-i386,i386,ia64,sparc} to reflect the
absence of these files. (Other architectures do not build the rendition
driver.) Thanks to Jesus Climent for spotting this problem.
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2005-06-20 06:44:02 UTC (rev 234)
+++ trunk/debian/MANIFEST.alpha.in 2005-06-20 17:07:06 UTC (rev 235)
@@ -1641,8 +1641,6 @@
usr/X11R6/lib/modules/libxf8_32bpp.a
usr/X11R6/lib/modules/linux/libdrm.a
usr/X11R6/lib/modules/linux/libfbdevhw.a
-usr/X11R6/lib/modules/v10002d.uc
-usr/X11R6/lib/modules/v20002d.uc
usr/X11R6/man/man1/XFree86.1x
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2005-06-20 06:44:02 UTC (rev 234)
+++ trunk/debian/MANIFEST.amd64.in 2005-06-20 17:07:06 UTC (rev 235)
@@ -1690,8 +1690,6 @@
usr/X11R6/lib/modules/linux/libdrm.a
usr/X11R6/lib/modules/linux/libfbdevhw.a
usr/X11R6/lib/modules/linux/libint10.a
-usr/X11R6/lib/modules/v10002d.uc
-usr/X11R6/lib/modules/v20002d.uc
usr/X11R6/lib/pkgconfig/xcomposite.pc
usr/X11R6/lib/pkgconfig/xdamage.pc
usr/X11R6/lib/pkgconfig/xevie.pc
Modified: trunk/debian/MANIFEST.hurd-i386.in
===================================================================
--- trunk/debian/MANIFEST.hurd-i386.in 2005-06-20 06:44:02 UTC (rev 234)
+++ trunk/debian/MANIFEST.hurd-i386.in 2005-06-20 17:07:06 UTC (rev 235)
@@ -1650,8 +1650,6 @@
usr/X11R6/lib/modules/libxf4bpp.a
usr/X11R6/lib/modules/libxf8_16bpp.a
usr/X11R6/lib/modules/libxf8_32bpp.a
-usr/X11R6/lib/modules/v10002d.uc
-usr/X11R6/lib/modules/v20002d.uc
usr/X11R6/man/man1/XFree86.1x
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2005-06-20 06:44:02 UTC (rev 234)
+++ trunk/debian/MANIFEST.i386.in 2005-06-20 17:07:06 UTC (rev 235)
@@ -1700,8 +1700,6 @@
usr/X11R6/lib/modules/linux/libdrm.a
usr/X11R6/lib/modules/linux/libfbdevhw.a
usr/X11R6/lib/modules/linux/libint10.a
-usr/X11R6/lib/modules/v10002d.uc
-usr/X11R6/lib/modules/v20002d.uc
usr/X11R6/lib/pkgconfig/xcomposite.pc
usr/X11R6/lib/pkgconfig/xdamage.pc
usr/X11R6/lib/pkgconfig/xevie.pc
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2005-06-20 06:44:02 UTC (rev 234)
+++ trunk/debian/MANIFEST.ia64.in 2005-06-20 17:07:06 UTC (rev 235)
@@ -1693,8 +1693,6 @@
usr/X11R6/lib/modules/libxf8_32bpp.a
usr/X11R6/lib/modules/linux/libdrm.a
usr/X11R6/lib/modules/linux/libfbdevhw.a
-usr/X11R6/lib/modules/v10002d.uc
-usr/X11R6/lib/modules/v20002d.uc
usr/X11R6/lib/pkgconfig/xcomposite.pc
usr/X11R6/lib/pkgconfig/xdamage.pc
usr/X11R6/lib/pkgconfig/xevie.pc
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2005-06-20 06:44:02 UTC (rev 234)
+++ trunk/debian/MANIFEST.sparc.in 2005-06-20 17:07:06 UTC (rev 235)
@@ -1694,8 +1694,6 @@
usr/X11R6/lib/modules/libxf8_32wid.a
usr/X11R6/lib/modules/linux/libdrm.a
usr/X11R6/lib/modules/linux/libfbdevhw.a
-usr/X11R6/lib/modules/v10002d.uc
-usr/X11R6/lib/modules/v20002d.uc
usr/X11R6/lib/pkgconfig/xcomposite.pc
usr/X11R6/lib/pkgconfig/xdamage.pc
usr/X11R6/lib/pkgconfig/xevie.pc
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-20 06:44:02 UTC (rev 234)
+++ trunk/debian/changelog 2005-06-20 17:07:06 UTC (rev 235)
@@ -196,8 +196,15 @@
symbols new to renderext 0.9 are used. Document dependency in detail in
debian/control comments.
- -- Branden Robinson <branden@debian.org> Mon, 20 Jun 2005 00:46:10 -0500
+ * Update patch #908 to stop attempting to install the sourceless microcode
+ files associated with the rendition driver, which are not part of the
+ source package (see debian/copyright). Correct
+ debian/MANIFEST.{alpha,amd64,hurd-i386,i386,ia64,sparc} to reflect the
+ absence of these files. (Other architectures do not build the rendition
+ driver.) Thanks to Jesus Climent for spotting this problem.
+ -- Branden Robinson <branden@debian.org> Mon, 20 Jun 2005 12:04:08 -0500
+
xfree86 (4.3.0.dfsg.1-14) unstable; urgency=high
Urgency set to high due to fix for security flaw (see below).
Modified: trunk/debian/patches/908_debian_exclude_non-free_fonts_and_docs.diff
===================================================================
--- trunk/debian/patches/908_debian_exclude_non-free_fonts_and_docs.diff 2005-06-20 06:44:02 UTC (rev 234)
+++ trunk/debian/patches/908_debian_exclude_non-free_fonts_and_docs.diff 2005-06-20 17:07:06 UTC (rev 235)
@@ -1,4 +1,4 @@
-$Id: 908_debian_exclude_non-free_fonts_and_docs.diff 1044 2004-02-16 17:40:33Z branden $
+$Id$
Eliminate the building of non-capital-F-Free fonts and docs;
debian/prune-non-free.sh also assists by excising these same fonts and docs
@@ -37,3 +37,26 @@
FONTINSTDIR = $(FONTDIR)/Type1
+Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile
+===================================================================
+--- xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile (revision 140)
++++ xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile (working copy)
+@@ -44,8 +44,6 @@
+ ObjectFromSpecialSource(accel, accelX, -DPSZ=16)
+
+ InstallObjectModule(rendition,$(MODULEDIR),drivers)
+-InstallNonExecFile(v10002d.uc,$(MODULEDIR))
+-InstallNonExecFile(v20002d.uc,$(MODULEDIR))
+
+ #if !defined(XF86DriverSDK)
+ InstallModuleManPage(rendition)
+@@ -85,9 +83,4 @@
+ InstallDriverSDKNonExecFile(accelX.c,$(DRIVERSDKDIR)/drivers/rendition)
+ InstallDriverSDKNonExecFile(cmd2d.h,$(DRIVERSDKDIR)/drivers/rendition)
+
+-InstallDriverSDKNonExecFile(v10002d.uc,$(DRIVERSDKDIR)/drivers/rendition)
+-InstallDriverSDKNonExecFile(v20002d.uc,$(DRIVERSDKDIR)/drivers/rendition)
+-
+-InstallDriverSDKNonExecFile(README.uc,$(DRIVERSDKDIR)/drivers/rendition)
+-
+ InstallDriverSDKObjectModule(rendition,$(DRIVERSDKMODULEDIR),drivers)
Reply to: