debian/NEWS | 2 +-
debian/changelog | 7 ++++---
debian/compat | 2 +-
debian/control | 4 ++--
debian/rules | 4 ++--
5 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 9f64961ef09f3f6f576f08cc23158e11bdca47d1
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Sep 2 21:34:07 2009 -0400
Fix whitespace in NEWS entry
diff --git a/debian/NEWS b/debian/NEWS
index 77d7814..b14e13b 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -5,6 +5,6 @@ xkeyboard-config (1.6-2) unstable; urgency=low
would like to re-enable this feature, you may do so in your
desktop's Keyboard Preferences application. You may also enable it
for the current session using the command
- "setxkbmap -option terminate:ctrl_alt_bksp".
+ "setxkbmap -option terminate:ctrl_alt_bksp".
-- David Nusinow <dnusi...@debian.org> Tue, 25 Aug 2009 12:52:38 -0400
commit b727063edd684fbd2dd6146478e3defece169545
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Sep 2 21:26:46 2009 -0400
Bump debhelper build-dep to 7
diff --git a/debian/control b/debian/control
index 593cf02..b7fef9e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Mohammed Adnène Trojette <adn+...@diwi.org>, Julien Cristau
<jcris...@debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt
+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
Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data
commit d3b24dc3f3c2d59beffe65f8271902c0a99d9d77
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Sep 2 21:20:42 2009 -0400
Update standards version to 3.8.3.0. No changes necessary.
diff --git a/debian/changelog b/debian/changelog
index b234f75..36c816c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xkeyboard-config (1.6-2) UNRELEASED; urgency=low
* Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a
* Update to debhelper version 7
+ Fix up dh_clean calls
+ * Update standards version to 3.8.3.0. No changes necessary.
[ Julien Cristau ]
* Don't install base.xml in /etc/X11/xkb. Modifying this creates more
diff --git a/debian/control b/debian/control
index 01df4b4..593cf02 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>, Julien Cristau
<jcris...@debian.org>
Build-Depends: debhelper (>= 5.0.0), quilt
Build-Depends-Indep: libxml-parser-perl, x11-xkb-utils, automake, intltool,
libglib2.0-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3.0
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 3c76eadca60c8c8a0380f3fe290db21e7fe615fe
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Sep 2 21:14:44 2009 -0400
Update to debhelper version 7
Fix up dh_clean calls
diff --git a/debian/changelog b/debian/changelog
index 7098317..b234f75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xkeyboard-config (1.6-2) UNRELEASED; urgency=low
[ David Nusinow ]
* Add a note about re-enabling ctrl-alt-backspace killing to NEWS.Debian.
* Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a
+ * Update to debhelper version 7
+ + Fix up dh_clean calls
[ Julien Cristau ]
* Don't install base.xml in /etc/X11/xkb. Modifying this creates more
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/rules b/debian/rules
index d237d45..7a61b23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ endif
xkb_base := /usr/share/X11/xkb
configure: $(STAMP_DIR)/patch
+ dh_prep
intltoolize -c -f
autoreconf -vfi
@@ -49,10 +50,10 @@ clean: xsfclean
-rm -f intltool-extract intltool-merge intltool-update
-rm -f rules/base.xml
-rm -f po/.intltool-merge-cache config.status.lineno
- dh_clean
rm -f compat/compat.dir geometry/geometry.dir keycodes/keycodes.dir
rm -f keymap/keymap.dir symbols/symbols.dir types/types.dir rules/base
rm -f rules/compat/base.l[2-4]*.part rules/compat/base.m*.part
+ dh_clean
deb:
dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn'
@@ -70,7 +71,6 @@ dir:
install: build
dh_testdir
dh_testroot
- dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/xkb-data
commit 7040420121b63ddcd9661c814d2f63e8bb72b55b
Author: David Nusinow <dnusi...@debian.org>
Date: Wed Sep 2 21:05:38 2009 -0400
Fix up changelog a bit
diff --git a/debian/changelog b/debian/changelog
index 82680b3..7098317 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,14 +2,12 @@ xkeyboard-config (1.6-2) UNRELEASED; urgency=low
[ David Nusinow ]
* Add a note about re-enabling ctrl-alt-backspace killing to NEWS.Debian.
+ * Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a
[ Julien Cristau ]
* Don't install base.xml in /etc/X11/xkb. Modifying this creates more
problems than it solves (closes: #497341).
- [ David Nusinow ]
- * Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a
-
-- David Nusinow <dnusi...@debian.org> Wed, 26 Aug 2009 23:27:13 -0400
xkeyboard-config (1.6-1) unstable; urgency=low
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
