[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r879 - in branches/6.9/debian: . patches patches/debian



Author: dnusinow
Date: 2005-11-14 14:14:13 -0500 (Mon, 14 Nov 2005)
New Revision: 879

Added:
   branches/6.9/debian/patches/debian/993_debian_no_pclcomp.diff
Modified:
   branches/6.9/debian/changelog
   branches/6.9/debian/patches/series
Log:
* Add debian/993_debian_no_pclcomp.diff to cope with pclcomp removal


Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog	2005-11-14 15:16:32 UTC (rev 878)
+++ branches/6.9/debian/changelog	2005-11-14 19:14:13 UTC (rev 879)
@@ -20,8 +20,9 @@
   * Have x-window-system-core alternately depend on the mesa packages. Thanks
     Xavier Bestel.
   * Prune pclcomp from our programs, as it is non-free. Thanks Daniel Stone.
+    + Add debian/993_no_pclcomp.diff to cope with this
 
- -- David Nusinow <dnusinow@debian.org>  Mon, 14 Nov 2005 00:09:36 -0500
+ -- David Nusinow <dnusinow@debian.org>  Mon, 14 Nov 2005 14:13:13 -0500
 
 xorg-x11 (6.8.2.dfsg.1-10+SVN) unstable; urgency=low
 

Added: branches/6.9/debian/patches/debian/993_debian_no_pclcomp.diff
===================================================================
--- branches/6.9/debian/patches/debian/993_debian_no_pclcomp.diff	2005-11-14 15:16:32 UTC (rev 878)
+++ branches/6.9/debian/patches/debian/993_debian_no_pclcomp.diff	2005-11-14 19:14:13 UTC (rev 879)
@@ -0,0 +1,15 @@
+Index: 6.9/xc/programs/Imakefile
+===================================================================
+--- 6.9.orig/xc/programs/Imakefile	2005-11-14 14:08:57.000000000 -0500
++++ 6.9/xc/programs/Imakefile	2005-11-14 14:11:21.000000000 -0500
+@@ -103,10 +103,6 @@
+       GLXCLIENTDIRS = glxinfo glxgears
+ #endif
+ 
+-#if XpRasterDDX
+-        XPRASTERFILTERDIRS = pclcomp
+-#endif
+-
+         XLOADDIR = xload
+ 
+ #if BuildRandRLibrary

Modified: branches/6.9/debian/patches/series
===================================================================
--- branches/6.9/debian/patches/series	2005-11-14 15:16:32 UTC (rev 878)
+++ branches/6.9/debian/patches/series	2005-11-14 19:14:13 UTC (rev 879)
@@ -109,3 +109,4 @@
 debian/916_add_XKBPATH_env_variable.diff
 debian/989_ubuntu_add_extra_modelines_from_xorg.diff -p0
 debian/992_debian_allow_build_from_svn.diff
+debian/993_debian_no_pclcomp.diff



Reply to: