Author: dnusinow
Date: 2006-03-16 23:06:55 -0500 (Thu, 16 Mar 2006)
New Revision: 1470
Modified:
branches/modular/app/xbase-clients-7.0.0/debian/changelog
branches/modular/app/xbase-clients-7.0.0/debian/patches/10_debian_add_xkbpath_env_variable.diff
branches/modular/app/xbase-clients-7.0.0/debian/patches/11_xkb_documentation_updates.diff
Log:
* Document the bump in version number to match upstream's current katamar
release
Modified: branches/modular/app/xbase-clients-7.0.0/debian/changelog
===================================================================
--- branches/modular/app/xbase-clients-7.0.0/debian/changelog 2006-03-17
03:56:55 UTC (rev 1469)
+++ branches/modular/app/xbase-clients-7.0.0/debian/changelog 2006-03-17
04:06:55 UTC (rev 1470)
@@ -5,8 +5,9 @@
[ David Nusinow ]
* Update to x11perf 1.4.1 and setxkbmap 1.0.2 upstream releases
+ * Bump version number to match upstream's current katamari release
- -- David Nusinow <[EMAIL PROTECTED]> Thu, 16 Mar 2006 22:50:38 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Thu, 16 Mar 2006 23:06:15 -0500
xbase-clients (1:1.0.1-2) experimental; urgency=low
Modified:
branches/modular/app/xbase-clients-7.0.0/debian/patches/10_debian_add_xkbpath_env_variable.diff
===================================================================
---
branches/modular/app/xbase-clients-7.0.0/debian/patches/10_debian_add_xkbpath_env_variable.diff
2006-03-17 03:56:55 UTC (rev 1469)
+++
branches/modular/app/xbase-clients-7.0.0/debian/patches/10_debian_add_xkbpath_env_variable.diff
2006-03-17 04:06:55 UTC (rev 1470)
@@ -9,10 +9,10 @@
This patch will not be submitted upstream.
-Index: setxkbmap-X11R7.0-1.0.1/setxkbmap.c
+Index: setxkbmap-1.0.2/setxkbmap.c
===================================================================
---- setxkbmap-X11R7.0-1.0.1/setxkbmap.c
-+++ setxkbmap-X11R7.0-1.0.1/setxkbmap.c
+--- setxkbmap-1.0.2/setxkbmap.c
++++ setxkbmap-1.0.2/setxkbmap.c
@@ -318,9 +318,13 @@
int i;
Bool ok;
Modified:
branches/modular/app/xbase-clients-7.0.0/debian/patches/11_xkb_documentation_updates.diff
===================================================================
---
branches/modular/app/xbase-clients-7.0.0/debian/patches/11_xkb_documentation_updates.diff
2006-03-17 03:56:55 UTC (rev 1469)
+++
branches/modular/app/xbase-clients-7.0.0/debian/patches/11_xkb_documentation_updates.diff
2006-03-17 04:06:55 UTC (rev 1470)
@@ -5,10 +5,10 @@
This patch by Branden Robinson.
-Index: setxkbmap-X11R7.0-1.0.1/setxkbmap.man
+Index: setxkbmap-1.0.2/setxkbmap.man
===================================================================
---- setxkbmap-X11R7.0-1.0.1/setxkbmap.man.orig 2006-02-18 14:56:06.000000000
-0500
-+++ setxkbmap-X11R7.0-1.0.1/setxkbmap.man 2006-02-28 23:24:35.000000000
-0500
+--- setxkbmap-1.0.2/setxkbmap.man.orig 2006-02-18 14:56:06.000000000 -0500
++++ setxkbmap-1.0.2/setxkbmap.man 2006-02-28 23:24:35.000000000 -0500
@@ -1,120 +1,167 @@
.\"
.\" $XFree86: xc/programs/setxkbmap/setxkbmap.man,v 3.6 2003/01/20 04:15:08
dawes Exp $
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
