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

X Strike Force XFree86 SVN commit: r2281 - trunk/debian



Author: branden
Date: 2005-06-09 12:16:53 -0500 (Thu, 09 Jun 2005)
New Revision: 2281

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/TODO
   trunk/debian/changelog
   trunk/debian/rules
Log:
Fix clean rule in rules file to remove the uncompressed plain-text Debian
X FAQ file generated from FAQ.xhtml.


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2005-06-08 07:54:41 UTC (rev 2280)
+++ trunk/debian/CHANGESETS	2005-06-09 17:16:53 UTC (rev 2281)
@@ -8,47 +8,8 @@
 (It should always be safe to merge the latest version of TODO or CHANGESETS
 files anywhere.)
 
-Backport libxpm from X.org stable release (099za_libxpm_spopen_fix.diff).
-(Closes: #308783)
-    2259, 2262, 2263, 2264
+Fix clean rule in rules file to remove the uncompressed plain-text Debian
+X FAQ file generated from FAQ.xhtml.
+    2281
 
-Fix grammar error in Spanish debconf template translations (thanks, Steve
-Langasek).  (Closes: #309450)
-    2266
-
-Add documentation of what should (and should not) go in
-000_stolen_from_HEAD.diff at the top of the file.
-    2268
-
-Grab fixes from freedesktop.org xorg CVS that make the DPMS extension
-header (dpms.h) and Xpm library header file (xpm.h) usable with C++ code
-by using the _XFUNCPROTO{BEGIN,END} macros instead of nothing at all (in
-the DPMS case) or a literal 'extern "C" {' construct (in the XPM case).
-C++ applications using the DPMS headers were likely to crash; see
-<URL: https://bugs.freedesktop.org/show_bug.cgi?id=830 >.  The DPMS fix
-also adds a header self-inclusion guard to dpms.h.
-    2269
-
-Replace s_popen()-based fix for CAN-2004-0914 with a better fix from
-freedesktop.org xorg CVS.  There were several problems with s_popen(),
-some merely functional, and some themselves security-flawed.  There does
-not appear to be a MITRE CVE candidate ID for this problem.  The only
-differences between the Xpm library code in this package release and that
-in freedesktop.org xorg CVS HEAD as of 2005-05-26 are 1) whitespace
-differences; 2) RCS keyword differences; 3) preprocessor directives to
-support autotoolization of the library; 4) support for pre-ANSI C
-compilers in function declarations; 5) removal of some dead code in
-create.c; and 6) preprocessor-enforced ignorance of PutPixel32() on 64-bit
-systems (whose implementation was already disabled on 64-bit systems).
-(Closes: #308783)
-    2270, 2271
-
-Invert sense of tests invoking has_multiplexed_mouse; the comments were
-right, but the logic was exactly backwards.  This should fix warp-speed
-and left-handed configuration mouse device problems introduced (or simply
-not fixed for USB and PS/2 mouse users of Linux 2.6) in -13.  Thanks to
-Steve Langasek for eyeballing the code and catching my thinko.
-(Closes: #311184)
-    2272, 2273
-
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO	2005-06-08 07:54:41 UTC (rev 2280)
+++ trunk/debian/TODO	2005-06-09 17:16:53 UTC (rev 2281)
@@ -14,7 +14,7 @@
 scheduled.  However, the package release manager can put an explicit freeze on
 those by marking the package version section accordingly.
 
-4.3.0.dfsg.1-14
+4.3.0.dfsg.1-15
 ---------------
 
 Post 4.3.0-1

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-06-08 07:54:41 UTC (rev 2280)
+++ trunk/debian/changelog	2005-06-09 17:16:53 UTC (rev 2281)
@@ -1,3 +1,10 @@
+xfree86 (4.3.0.dfsg.1-14+SVN) unstable; urgency=low
+
+  * Fix clean rule in rules file to remove the uncompressed plain-text Debian
+    X FAQ file generated from FAQ.xhtml.
+
+ -- Branden Robinson <branden@debian.org>  Thu,  9 Jun 2005 12:14:10 -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/rules
===================================================================
--- trunk/debian/rules	2005-06-08 07:54:41 UTC (rev 2280)
+++ trunk/debian/rules	2005-06-09 17:16:53 UTC (rev 2281)
@@ -138,7 +138,7 @@
 	rm -rf $(STAMP_DIR) $(SOURCE_DIR)
 	perl $(SCRIPT_DIR)/dbs_split clean
 	rm -rf imports debian/local/xlibmesa-drm-source/modules
-	dh_clean debian/local/xserver-wrapper debian/local/FAQ.gz \
+	dh_clean debian/local/xserver-wrapper debian/local/FAQ \
 	         debian/local/xterm.faq.gz debian/shlibs.local \
 	         debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \
 	         debian/po/pothead



Reply to: