debian/changelog | 2 +-
debian/rules | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 918a5f48aa10c515f0f6cb4d798c9181025e53ad
Author: David Nusinow <dnusi...@debian.org>
Date: Thu Sep 3 20:10:03 2009 -0400
Put dh_clean's back and replace dh_clean -k with dh_prep
diff --git a/debian/changelog b/debian/changelog
index 36c816c..87894ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ xkeyboard-config (1.6-2) UNRELEASED; urgency=low
* 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
+ + Fix up dh_clean -k to use dh_prep instead
* Update standards version to 3.8.3.0. No changes necessary.
[ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index 7a61b23..ea198e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,6 @@ endif
xkb_base := /usr/share/X11/xkb
configure: $(STAMP_DIR)/patch
- dh_prep
intltoolize -c -f
autoreconf -vfi
@@ -50,10 +49,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'
@@ -71,6 +70,7 @@ dir:
install: build
dh_testdir
dh_testroot
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/xkb-data
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
