X Strike Force X.Org X11 SVN commit: r3893 - in trunk/debian/xorg/debian: . local local/Xresources
Author: julien
Date: 2006-10-23 19:11:50 -0400 (Mon, 23 Oct 2006)
New Revision: 3893
Added:
trunk/debian/xorg/debian/local/Xresources/
trunk/debian/xorg/debian/local/Xresources/x11-common
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/rules
trunk/debian/xorg/debian/x11-common.install
Log:
* Readd /etc/X11/Xresources/x11-common which was lost in the transition from
the monolith. This enables the -color customization, and closes: #365358.
* Delete stampdir in debian/rules clean.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-10-23 22:07:11 UTC (rev 3892)
+++ trunk/debian/xorg/debian/changelog 2006-10-23 23:11:50 UTC (rev 3893)
@@ -7,8 +7,13 @@
[ Debconf translations added ]
* Turkish.
- -- Christian Perrier <bubulle@debian.org> Fri, 20 Oct 2006 19:19:57 +0200
+ [ Julien Cristau ]
+ * Readd /etc/X11/Xresources/x11-common which was lost in the transition from
+ the monolith. This enables the -color customization, and closes: #365358.
+ * Delete stampdir in debian/rules clean.
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 24 Oct 2006 01:09:15 +0200
+
xorg (1:7.1.0-5) unstable; urgency=low
[ Debconf translation added ]
Copied: trunk/debian/xorg/debian/local/Xresources/x11-common (from rev 3892, tags/monolith/6.9.0.dfsg.1-6/debian/local/Xresources/x11-common)
===================================================================
--- trunk/debian/xorg/debian/local/Xresources/x11-common (rev 0)
+++ trunk/debian/xorg/debian/local/Xresources/x11-common 2006-10-23 23:11:50 UTC (rev 3893)
@@ -0,0 +1,10 @@
+! $Id$
+
+! load color-specific resources for clients that have them
+#ifdef COLOR
+*customization: -color
+#endif
+
+! make Xaw (Athena widget set) clients understand the delete key
+! this causes problems with some non-Xaw apps, use with care
+! *Text.translations: #override ~Shift ~Meta <Key>Delete: delete-next-character()
Modified: trunk/debian/xorg/debian/rules
===================================================================
--- trunk/debian/xorg/debian/rules 2006-10-23 22:07:11 UTC (rev 3892)
+++ trunk/debian/xorg/debian/rules 2006-10-23 23:11:50 UTC (rev 3893)
@@ -41,6 +41,7 @@
clean: cleanscripts
dh_testdir
dh_clean stamp-* debian/local/X debian/po/pothead
+ -rm -rf stampdir
-debconf-updatepo
Modified: trunk/debian/xorg/debian/x11-common.install
===================================================================
--- trunk/debian/xorg/debian/x11-common.install 2006-10-23 22:07:11 UTC (rev 3892)
+++ trunk/debian/xorg/debian/x11-common.install 2006-10-23 23:11:50 UTC (rev 3893)
@@ -5,3 +5,4 @@
debian/local/Xsession.d/* etc/X11/Xsession.d
debian/local/Xsession.options etc/X11
debian/changelog.Debian.old usr/share/doc/x11-common
+debian/local/Xresources/x11-common etc/X11/Xresources
Reply to: