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

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



Author: branden
Date: 2004-08-12 16:35:05 -0500 (Thu, 12 Aug 2004)
New Revision: 1733

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/TODO
   trunk/debian/changelog
   trunk/debian/patches/907_debian_xterm.diff
Log:
Fix wrong comment character in Debian customizations to XTerm application
defaults file.  (Closes: #252274)


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2004-08-12 21:22:41 UTC (rev 1732)
+++ trunk/debian/CHANGESETS	2004-08-12 21:35:05 UTC (rev 1733)
@@ -358,4 +358,8 @@
 (Closes: #258986)
     1732
 
+Fix wrong comment character in Debian customizations to XTerm application
+defaults file.  (Closes: #252274)
+    1733
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO	2004-08-12 21:22:41 UTC (rev 1732)
+++ trunk/debian/TODO	2004-08-12 21:35:05 UTC (rev 1733)
@@ -61,8 +61,6 @@
   + #261777: Problems handling multiple detected video cards; see what can be
     done about this [BR]
 * Add FAQ entry describing Debian's plans in the X department.
-* #252274: fix bad comment character in Debian's mods to XTerm's app-defaults
-  file
 * #256706: keep swatting away at the keyboard modifer issue; Ivan Pascal told
   BR:
     There is not modifier_del instruction in 'XKB language' but ...

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-08-12 21:22:41 UTC (rev 1732)
+++ trunk/debian/changelog	2004-08-12 21:35:05 UTC (rev 1733)
@@ -272,6 +272,9 @@
     Jorg Schuler).  Update manpage to document this fact.  Resync patch #911.
     (Closes: #258986)
 
+  * Fix wrong comment character in Debian customizations to XTerm application
+    defaults file.  (Closes: #252274)
+
   Changes by Fabio M. Di Nitto and Branden Robinson:
 
   * Support building only the parts of the source tree needed by
@@ -313,7 +316,7 @@
     autodetection would cause the script to think it had detected one X server
     or XFree86 video driver instead ($(echo "" | wc -l) is "1", not "0").
 
- -- Branden Robinson <branden@debian.org>  Thu, 12 Aug 2004 16:16:21 -0500
+ -- Branden Robinson <branden@debian.org>  Thu, 12 Aug 2004 16:27:28 -0500
 
 xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
 

Modified: trunk/debian/patches/907_debian_xterm.diff
===================================================================
--- trunk/debian/patches/907_debian_xterm.diff	2004-08-12 21:22:41 UTC (rev 1732)
+++ trunk/debian/patches/907_debian_xterm.diff	2004-08-12 21:35:05 UTC (rev 1733)
@@ -98,15 +98,14 @@
 +foreground      gray60;\
 +lines           -1,0,0,0,0,-1
 +#endif
-diff -urN xc/programs/xterm~/XTerm.ad xc/programs/xterm/XTerm.ad
---- xc/programs/xterm~/XTerm.ad	2004-07-14 17:49:32.000000000 -0500
-+++ xc/programs/xterm/XTerm.ad	2004-07-14 17:50:19.000000000 -0500
+--- xc/programs/xterm/XTerm.ad~	2004-08-12 16:25:22.000000000 -0500
++++ xc/programs/xterm/XTerm.ad	2004-08-12 16:25:51.000000000 -0500
 @@ -115,3 +115,7 @@
  *tek4014*font2: 8x13
  *tek4014*font3: 6x13
  *tek4014*fontSmall: 6x10
 +
-+# Debian package customizations follow.
++! Debian package customizations follow.
 +*backarrowKeyIsErase: true
 +*ptyInitialErase: true
 diff -urN xc/programs/xterm~/termcap xc/programs/xterm/termcap



Reply to: