debian/changelog | 11 +++++++++--
debian/control | 12 ++++++++++--
debian/rules | 4 ++++
3 files changed, 23 insertions(+), 4 deletions(-)
New commits:
commit 1b8a02656850c08c63368f94a819490eb20d97fe
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Mar 15 14:25:12 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index e919594..6acd2eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xkeyboard-config (1.8-1) UNRELEASED; urgency=low
+xkeyboard-config (1.8-1) unstable; urgency=low
[ Julien Cristau ]
* Remove myself from Uploaders
@@ -11,7 +11,7 @@ xkeyboard-config (1.8-1) UNRELEASED; urgency=low
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
* Add Depends: ${misc:Depends} to xkb-data.
- -- Julien Cristau <jcris...@debian.org> Sun, 07 Mar 2010 14:50:26 +0100
+ -- Cyril Brulebois <k...@debian.org> Mon, 15 Mar 2010 14:24:43 +0100
xkeyboard-config (1.7-2) unstable; urgency=low
commit 9562e7b278475b04d7c5c7f9306665b98864e0d8
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Mar 15 14:24:35 2010 +0100
Add Depends: ${misc:Depends} to xkb-data.
diff --git a/debian/changelog b/debian/changelog
index 634a6c2..e919594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xkeyboard-config (1.8-1) UNRELEASED; urgency=low
* Add udeb needed for the graphical installer: xkb-data-udeb.
* Add myself to Uploaders.
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+ * Add Depends: ${misc:Depends} to xkb-data.
-- Julien Cristau <jcris...@debian.org> Sun, 07 Mar 2010 14:50:26 +0100
diff --git a/debian/control b/debian/control
index 9130925..7cb0dbf 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/data/xkb-data.git
Homepage: http://www.freedesktop.org/Software/XKeyboardConfig
Package: xkb-data
+Depends: ${misc:Depends}
Breaks: libx11-6 (<< 2:1.1)
Architecture: all
Description: X Keyboard Extension (XKB) configuration data
commit 42b0647d148b4ae57837b38a381ecbe89e9c5378
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Mar 15 14:21:13 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 cc73b13..634a6c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xkeyboard-config (1.8-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add udeb needed for the graphical installer: xkb-data-udeb.
* Add myself to Uploaders.
+ * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
-- Julien Cristau <jcris...@debian.org> Sun, 07 Mar 2010 14:50:26 +0100
diff --git a/debian/control b/debian/control
index eb86ddb..9130925 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Mohammed Adnène Trojette <adn+...@diwi.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends: debhelper (>= 7.0.0), quilt
Build-Depends-Indep: libxml-parser-perl, x11-xkb-utils, automake, intltool,
libglib2.0-dev
-Standards-Version: 3.8.3.0
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xkb-data.git
Homepage: http://www.freedesktop.org/Software/XKeyboardConfig
commit 811de8cb44ac37f4def970e1a12fd6195d7d8487
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Mar 15 14:20:21 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index b2c338a..cc73b13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xkeyboard-config (1.8-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add udeb needed for the graphical installer: xkb-data-udeb.
+ * Add myself to Uploaders.
-- Julien Cristau <jcris...@debian.org> Sun, 07 Mar 2010 14:50:26 +0100
diff --git a/debian/control b/debian/control
index 24d57fd..eb86ddb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xkeyboard-config
Section: x11
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Mohammed Adnène Trojette <adn+...@diwi.org>
+Uploaders: Mohammed Adnène Trojette <adn+...@diwi.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends: debhelper (>= 7.0.0), quilt
Build-Depends-Indep: libxml-parser-perl, x11-xkb-utils, automake, intltool,
libglib2.0-dev
Standards-Version: 3.8.3.0
commit f030f1b4b946fb7cdfe0b60b16ec140a60826416
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Feb 25 04:10:29 2010 +0000
Remove messages (*.mo) from the udeb.
diff --git a/debian/rules b/debian/rules
index 472e174..7c64bb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,8 +77,9 @@ install: build
# Remove this symlink, it is no more needed
rm -f $(CURDIR)/debian/xkb-data/$(xkb_base)/compiled
- # Treat the udeb as an exact copy
+ # Treat the udeb as an exact copy, but remove messages:
cp -r $(CURDIR)/debian/xkb-data/* $(CURDIR)/debian/xkb-data-udeb
+ rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/locale
# Build architecture-dependent files here.
binary-arch: build install
commit d18ee6c168a323b65348fe0b766a5160654802a8
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Feb 25 04:08:44 2010 +0000
Use XC-Package-Type to save some memory.
diff --git a/debian/control b/debian/control
index 56ba9aa..24d57fd 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Description: X Keyboard Extension (XKB) configuration data
to provide a central repository that could be used by all vendors.
Package: xkb-data-udeb
-Package-Type: udeb
+XC-Package-Type: udeb
Section: debian-installer
Architecture: all
Description: X Keyboard Extension (XKB) configuration data
commit d415110f4c186f836153dec519996e3f238bea31
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Feb 7 02:12:22 2010 +0000
Add udeb needed for the graphical installer: xkb-data-udeb.
diff --git a/debian/changelog b/debian/changelog
index 47dd79b..b2c338a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xkeyboard-config (1.8-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Remove myself from Uploaders
* New upstream release
+ Fix Win key as third level chooser (closes: #531771)
+ [ Cyril Brulebois ]
+ * Add udeb needed for the graphical installer: xkb-data-udeb.
+
-- Julien Cristau <jcris...@debian.org> Sun, 07 Mar 2010 14:50:26 +0100
xkeyboard-config (1.7-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 96df974..56ba9aa 100644
--- a/debian/control
+++ b/debian/control
@@ -22,3 +22,10 @@ Description: X Keyboard Extension (XKB) configuration data
designers have to send their layouts to several places. The
xkeyboard-config project has been launched at FreeDesktop in order
to provide a central repository that could be used by all vendors.
+
+Package: xkb-data-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: all
+Description: X Keyboard Extension (XKB) configuration data
+ This is a udeb, or a microdeb, for the debian-installer.
diff --git a/debian/rules b/debian/rules
index dd2c018..472e174 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,6 +77,9 @@ install: build
# Remove this symlink, it is no more needed
rm -f $(CURDIR)/debian/xkb-data/$(xkb_base)/compiled
+ # Treat the udeb as an exact copy
+ cp -r $(CURDIR)/debian/xkb-data/* $(CURDIR)/debian/xkb-data-udeb
+
# Build architecture-dependent files here.
binary-arch: build install
# We have nothing to do by default.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nsm5d-0005hi...@alioth.debian.org
