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

X Strike Force XFree86 SVN commit: r1967 - in trunk/debian: . patches



Author: branden
Date: 2004-10-20 01:44:18 -0500 (Wed, 20 Oct 2004)
New Revision: 1967

Added:
   trunk/debian/patches/914_debian_Xserver_send_bugs_to_us.diff
Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
Log:
Replace XFree86 X server pre-release banner message with long boilerplate
that declaims the release as heavily modified by Debian, and directs users
to the Debian Bug Tracking System and the Debian X FAQ instead of XFree86
mailing lists; also replace an occurence of an XFree86 mailing list
address in a tseng driver message (patch #914).


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2004-10-18 18:03:43 UTC (rev 1966)
+++ trunk/debian/CHANGESETS	2004-10-20 06:44:18 UTC (rev 1967)
@@ -190,4 +190,11 @@
 xconsole-related logic is not restored.  (Closes: #275329)
     1966
 
+Replace XFree86 X server pre-release banner message with long boilerplate
+that declaims the release as heavily modified by Debian, and directs users
+to the Debian Bug Tracking System and the Debian X FAQ instead of XFree86
+mailing lists; also replace an occurence of an XFree86 mailing list
+address in a tseng driver message (patch #914).
+    1967
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-10-18 18:03:43 UTC (rev 1966)
+++ trunk/debian/changelog	2004-10-20 06:44:18 UTC (rev 1967)
@@ -91,6 +91,12 @@
     xdm.install and MANIFEST.* files to ship Xreset script.  The old
     xconsole-related logic is not restored.  (Closes: #275329)
 
+  * Replace XFree86 X server pre-release banner message with long boilerplate
+    that declaims the release as heavily modified by Debian, and directs users
+    to the Debian Bug Tracking System and the Debian X FAQ instead of XFree86
+    mailing lists; also replace an occurence of an XFree86 mailing list
+    address in a tseng driver message (patch #914).
+
   Changes by Denis Barbier and Fabio M. Di Nitto:
 
   * Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -161,7 +167,7 @@
     + Set UseBios default to "no" for PROSAVAGE_DDR and PROSAVAGE_DDRK, as
       described at <URL: http://www.probo.com/timr/savage40.html >.
 
- -- Branden Robinson <branden@debian.org>  Mon, 18 Oct 2004 12:57:18 -0500
+ -- Branden Robinson <branden@debian.org>  Wed, 20 Oct 2004 00:38:46 -0500
 
 xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
 

Added: trunk/debian/patches/914_debian_Xserver_send_bugs_to_us.diff
===================================================================
--- trunk/debian/patches/914_debian_Xserver_send_bugs_to_us.diff	2004-10-18 18:03:43 UTC (rev 1966)
+++ trunk/debian/patches/914_debian_Xserver_send_bugs_to_us.diff	2004-10-20 06:44:18 UTC (rev 1967)
@@ -0,0 +1,74 @@
+$Id$
+
+The XFree86 Project, Inc., is no longer Debian's upstream for the X Window
+System, and in any event our source tree is patched to the moon.  Don't
+send our users to XFree86's mailing list or private patch list.
+
+This patch by Branden Robinson.
+
+diff -urN xc/programs/Xserver/hw/xfree86~/common/xf86Init.c xc/programs/Xserver/hw/xfree86/common/xf86Init.c
+--- xc/programs/Xserver/hw/xfree86~/common/xf86Init.c	2004-10-19 14:05:13.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c	2004-10-19 14:09:43.000000000 -0500
+@@ -1683,6 +1683,7 @@
+ #ifndef OSVENDOR
+ #define OSVENDOR ""
+ #endif
++/* PRE_RELEASE is unused in Debian. */
+ #ifndef PRE_RELEASE
+ #define PRE_RELEASE XF86_VERSION_SNAP
+ #endif
+@@ -1690,15 +1691,7 @@
+ static void
+ xf86PrintBanner()
+ {
+-#if PRE_RELEASE
+-  ErrorF("\n"
+-    "This is a pre-release version of XFree86, and is not supported in any\n"
+-    "way.  Bugs may be reported to XFree86@XFree86.Org and patches submitted\n"
+-    "to fixes@XFree86.Org.  Before reporting bugs in pre-release versions,\n"
+-    "please check the latest version in the XFree86 CVS repository\n"
+-    "(http://www.XFree86.Org/cvs).\n");
+-#endif
+-  ErrorF("\nXFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
++  ErrorF("XFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
+ 					XF86_VERSION_PATCH);
+ #if XF86_VERSION_SNAP > 0
+   ErrorF(".%d", XF86_VERSION_SNAP);
+@@ -1733,8 +1726,20 @@
+ #if defined(BUILDERSTRING)
+   ErrorF("%s \n",BUILDERSTRING);
+ #endif
+-  ErrorF("\tBefore reporting problems, check http://www.XFree86.Org/\n";
+-	 "\tto make sure that you have the latest version.\n");
++  ErrorF("\n"
++    "This version of XFree86 has been extensively modified by the Debian\n"
++    "Project, and is not supported by the XFree86 Project, Inc., in any\n"
++    "way.  Bugs should be reported to the Debian Bug Tracking System; see\n"
++    "<URL: http://www.debian.org/Bugs/Reporting >.\n"
++    "\n"
++    "We strongly encourage the use of the \"reportbug\" package and command\n"
++    "to ensure that bug reports contain as much useful information as\n"
++    "possible.\n"
++    "\n"
++    "Before filing a bug report, you may want to consult the Debian X FAQ:\n"
++    "       XHTML version: file:///usr/share/doc/xfree86-common/FAQ.xhtml\n"
++    "  plain text version: file:///usr/share/doc/xfree86-common/FAQ.gz\n"
++    "\n");
+ #ifdef XFree86LOADER
+   ErrorF("Module Loader present\n");
+ #endif
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/tseng/tseng_driver.c xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c
+--- xc/programs/Xserver/hw/xfree86~/drivers/tseng/tseng_driver.c	2004-10-19 14:05:13.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c	2004-10-19 14:05:24.000000000 -0500
+@@ -1471,7 +1471,10 @@
+ 		break;
+ 	    default:
+ 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+-		    "TsengNonPciLinMem(): Internal error. This should not happen: please report to XFree86@XFree86.Org\n");
++		    "TsengNonPciLinMem(): Internal error. This should not"
++		    " happen: please report\n\tthis problem along with the"
++		    " complete X server log file to the\n\tDebian Bug Tracking"
++		    " System.\n");
+ 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		    "    Falling back to banked mode.\n");
+ 		pTseng->UseLinMem = FALSE;


Property changes on: trunk/debian/patches/914_debian_Xserver_send_bugs_to_us.diff
___________________________________________________________________
Name: svn:keywords
   + Id



Reply to: