x11-xkb-utils: Changes to 'debian-unstable'
debian/changelog | 20 +++++++++++++++--
debian/control | 16 ++++++++++---
debian/patches/10_debian_add_xkbpath_env_variable.diff | 18 +++++----------
debian/patches/series | 2 -
debian/rules | 4 +--
debian/x11-xkb-utils-udeb.install | 2 +
6 files changed, 41 insertions(+), 21 deletions(-)
New commits:
commit 16a4855fd91f86f5d76607dcbbe0ac1c0164e471
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 22:30:40 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index b21c0a0..b2d495f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
+x11-xkb-utils (7.5+2) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -20,7 +20,7 @@ x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
- Get rid of -p0 in debian/patches/series accordingly.
* Add myself to Uploaders.
- -- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
+ -- Cyril Brulebois <kibi@debian.org> Thu, 11 Mar 2010 22:30:32 +0100
x11-xkb-utils (7.5+1) unstable; urgency=low
commit 290abc91940af7bf8eaec8e6737511f8983e0971
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 22:28:17 2010 +0100
Standardize patch handling.
diff --git a/debian/changelog b/debian/changelog
index 37f9641..b21c0a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
- libxkbfile-dev
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
* Fix dh_makeshlibs/dh_shlibdeps/dh_installdeb order, thanks to lintian.
+ * Standardize patch handling:
+ - Add {a,b}/ to debian/patches/10_debian_add_xkbpath_env_variable.diff
+ - Get rid of -p0 in debian/patches/series accordingly.
* Add myself to Uploaders.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
diff --git a/debian/patches/10_debian_add_xkbpath_env_variable.diff b/debian/patches/10_debian_add_xkbpath_env_variable.diff
index 859292e..f23f764 100644
--- a/debian/patches/10_debian_add_xkbpath_env_variable.diff
+++ b/debian/patches/10_debian_add_xkbpath_env_variable.diff
@@ -15,10 +15,8 @@ This patch will not be submitted upstream.
xkbevd/xkbevd.c | 22 +++++++++++++++-------
3 files changed, 24 insertions(+), 7 deletions(-)
-Index: setxkbmap/setxkbmap.c
-===================================================================
---- setxkbmap/setxkbmap.c.orig 2009-12-06 22:36:21.000000000 +0100
-+++ setxkbmap/setxkbmap.c 2009-12-06 22:41:25.000000000 +0100
+--- a/setxkbmap/setxkbmap.c.orig 2009-12-06 22:36:21.000000000 +0100
++++ b/setxkbmap/setxkbmap.c 2009-12-06 22:41:25.000000000 +0100
@@ -371,9 +371,13 @@
int i;
Bool ok;
@@ -33,10 +31,8 @@ Index: setxkbmap/setxkbmap.c
addToList(&szInclPath, &numInclPath, &inclPath, DFLT_XKB_CONFIG_ROOT);
for (i = 1; (i < argc) && ok; i++)
{
-Index: xkbcomp/xkbpath.c
-===================================================================
---- xkbcomp/xkbpath.c.orig 2009-12-06 22:36:21.000000000 +0100
-+++ xkbcomp/xkbpath.c 2009-12-06 22:41:25.000000000 +0100
+--- a/xkbcomp/xkbpath.c.orig 2009-12-06 22:36:21.000000000 +0100
++++ b/xkbcomp/xkbpath.c 2009-12-06 22:41:25.000000000 +0100
@@ -171,8 +171,13 @@
void
XkbAddDefaultDirectoriesToPath(void)
@@ -51,10 +47,8 @@ Index: xkbcomp/xkbpath.c
XkbAddDirectoryToPath(DFLT_XKB_CONFIG_ROOT);
}
-Index: xkbevd/xkbevd.c
-===================================================================
---- xkbevd/xkbevd.c.orig 2009-12-06 22:36:21.000000000 +0100
-+++ xkbevd/xkbevd.c 2009-12-06 22:41:25.000000000 +0100
+--- a/xkbevd/xkbevd.c.orig 2009-12-06 22:36:21.000000000 +0100
++++ b/xkbevd/xkbevd.c 2009-12-06 22:41:25.000000000 +0100
@@ -481,20 +481,28 @@
else {
file= fopen(cfgFileName,"r");
diff --git a/debian/patches/series b/debian/patches/series
index dfe5c16..fb0a336 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-10_debian_add_xkbpath_env_variable.diff -p0
+10_debian_add_xkbpath_env_variable.diff
#11_xkb_documentation_updates.diff -p0
commit 3b749ee235656bd29460025c5ab59dd742fb87c9
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 22:19:10 2010 +0100
Fix dh_makeshlibs/dh_shlibdeps/dh_installdeb order, thanks to lintian.
diff --git a/debian/changelog b/debian/changelog
index dede107..37f9641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
- libx11-dev
- libxkbfile-dev
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+ * Fix dh_makeshlibs/dh_shlibdeps/dh_installdeb order, thanks to lintian.
* Add myself to Uploaders.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
diff --git a/debian/rules b/debian/rules
index 8a49f6e..7c0c702 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,9 +91,9 @@ binary-arch: build install
dh_strip
dh_compress
dh_fixperms
- dh_installdeb
- dh_shlibdeps
dh_makeshlibs
+ dh_shlibdeps
+ dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
commit e7416073db2225a4713e2e4805b63edc077ff33f
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 22:13:43 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 322d29e..dede107 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
- libx11-dev
- libxkbfile-dev
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+ * Add myself to Uploaders.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
diff --git a/debian/control b/debian/control
index fda49cc..8d00310 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-xkb-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.3.3-2),
libxaw7-dev (>= 1:1.0.1), libxkbfile-dev (>= 1:1.0.6-2), quilt
# Reasons for build-depends:
commit 5843514aa30c7ee32ef053c94bee46b3a4a593f3
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 22:13:10 2010 +0100
Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 5866175..322d29e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
the (recently-added) udebs rather than on the libraries:
- libx11-dev
- libxkbfile-dev
+ * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
diff --git a/debian/control b/debian/control
index 9bf07ec..fda49cc 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.3.3-2),
# xkbevd: libx11-dev, libxkbfile-dev, (bison)
# xkbprint: libx11-dev, libxkbfile-dev
# xkbutils: libx11-dev, libxaw7-dev, libxkbfile-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xkb-utils
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
commit c6d96758c8163a1511a1a1368c66a83853530959
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 26 05:21:00 2010 +0100
Use XC-Package-Type to save some memory.
diff --git a/debian/control b/debian/control
index 1e285f7..9bf07ec 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Description: X11 XKB utilities
xkbwatch shows the changing status of modifiers and LEDs.
Package: x11-xkb-utils-udeb
-Package-Type: udeb
+XC-Package-Type: udeb
Section: debian-installer
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
commit c29368b2ad6d2fee0725eb9e704442710f3ee947
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Feb 7 02:03:33 2010 +0000
Version/Bump some B-D to make sure the udeb gets its dependencies on udebs.
diff --git a/debian/changelog b/debian/changelog
index 11b8360..5866175 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
* Add udeb needed for the graphical installer: x11-xkb-utils-udeb.
* Compared to the normal binary, only setxkbmap and xkbcomp are shipped,
at least for now.
+ * Version/Bump some B-D to make sure the udeb gets its dependencies on
+ the (recently-added) udebs rather than on the libraries:
+ - libx11-dev
+ - libxkbfile-dev
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
diff --git a/debian/control b/debian/control
index a7b0044..1e285f7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0),
- libxaw7-dev (>= 1:1.0.1), libxkbfile-dev (>= 1:1.0.1), quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.3.3-2),
+ libxaw7-dev (>= 1:1.0.1), libxkbfile-dev (>= 1:1.0.6-2), quilt
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
commit c2a1d0320f1d04c419d510bd8ddf0c03ef9b1947
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Feb 7 01:59:42 2010 +0000
Add udeb needed for the graphical installer: x11-xkb-utils-udeb.
diff --git a/debian/changelog b/debian/changelog
index 46016b7..11b8360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ [ Cyril Brulebois ]
+ * Add udeb needed for the graphical installer: x11-xkb-utils-udeb.
+ * Compared to the normal binary, only setxkbmap and xkbcomp are shipped,
+ at least for now.
+
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
x11-xkb-utils (7.5+1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 167f7dd..a7b0044 100644
--- a/debian/control
+++ b/debian/control
@@ -43,3 +43,11 @@ Description: X11 XKB utilities
xkbvleds shows the changing status of keyboard LEDs.
.
xkbwatch shows the changing status of modifiers and LEDs.
+
+Package: x11-xkb-utils-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: X11 XKB utilities
+ This is a udeb, or a microdeb, for the debian-installer.
diff --git a/debian/x11-xkb-utils-udeb.install b/debian/x11-xkb-utils-udeb.install
new file mode 100644
index 0000000..2d77685
--- /dev/null
+++ b/debian/x11-xkb-utils-udeb.install
@@ -0,0 +1,2 @@
+usr/bin/setxkbmap
+usr/bin/xkbcomp
Reply to: