debian/changelog | 8 ++++++++
debian/rules | 12 ++++++++++++
2 files changed, 20 insertions(+)
New commits:
commit 06f1ab5f1075054aa74e054a0a6a718d62eb6864
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Oct 5 23:28:34 2011 +0300
rules: Bring back the pot file build, very much needed still
This time move the original file away during build, and restore on clean.
(LP: #868554)
diff --git a/debian/changelog b/debian/changelog
index f2b47b0..8d3dd7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xkeyboard-config (2.3-1ubuntu2) UNRELEASED; urgency=low
+
+ * rules: Bring back the pot file build, very much needed still.
+ This time move the original file away during build, and restore
+ on clean. (LP: #868554)
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 05 Oct 2011 21:56:04 +0300
+
xkeyboard-config (2.3-1ubuntu1) oneiric; urgency=low
* Merge from Debian experimental. Remaining Ubuntu changes:
diff --git a/debian/rules b/debian/rules
index c8bf56a..aa2fb87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,24 @@ xkb_base := /usr/share/X11/xkb
override_dh_autoreconf:
dh_autoreconf '(intltoolize -c -f && autoreconf -vfi)'
+override_dh_auto_clean:
+ dh_auto_clean
+ if [ -e $(CURDIR)/po/xkeyboard-config.pot-orig ]; then \
+ mv $(CURDIR)/po/xkeyboard-config.pot-orig \
+ $(CURDIR)/po/xkeyboard-config.pot; \
+ fi
+
override_dh_auto_configure:
dh_auto_configure -- \
--with-xkb-rules-symlink=xfree86,xorg \
--with-xkb-base=$(xkb_base) \
--disable-runtime-deps
+override_dh_auto_build:
+ dh_auto_build
+ mv $(CURDIR)/po/xkeyboard-config.pot
$(CURDIR)/po/xkeyboard-config.pot-orig
+ cd $(CURDIR)/po && intltool-update -p
+
override_dh_auto_install:
# Regular deb:
$(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp
--
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/e1rby5c-0003yz...@vasks.debian.org
