debian/changelog | 14 +++++++-------
debian/control | 1 -
debian/rules | 6 +-----
3 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit 53a9ad5f57481bf344c7ffb7d2d4b9649030d641
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Aug 11 22:01:54 2011 +0300
releasing version 2.3-1ubuntu1
diff --git a/debian/changelog b/debian/changelog
index 9adc1fd..f2b47b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xkeyboard-config (2.3-1ubuntu1) UNRELEASED; urgency=low
+xkeyboard-config (2.3-1ubuntu1) oneiric; urgency=low
* Merge from Debian experimental. Remaining Ubuntu changes:
+ xkb-data-i18n.install, xkb-data.install, rules: Split out
@@ -13,7 +13,7 @@ xkeyboard-config (2.3-1ubuntu1) UNRELEASED; urgency=low
* No need to build the pot file anymore, upstream version is used.
* Fix dh_autoreconf override in rules (FTBFS).
- -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 11 Aug 2011 17:00:26 +0300
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 11 Aug 2011 22:01:46 +0300
xkeyboard-config (2.3-1) experimental; urgency=low
commit fa5649513f319f92b5099786d86adefeacf68ace
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Aug 11 22:01:12 2011 +0300
Drop a dupe build-dep of intltool.
diff --git a/debian/control b/debian/control
index a0f1ae1..1757e9c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
quilt,
- intltool,
Build-Depends-Indep:
libxml-parser-perl,
x11-xkb-utils,
commit 4e50db0a4e0d394159210cb8fff5ca8b9d0cc2f6
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Aug 11 21:36:14 2011 +0300
Make the merge entry prettier
diff --git a/debian/changelog b/debian/changelog
index 1d247f9..9adc1fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,10 +7,9 @@ xkeyboard-config (2.3-1ubuntu1) UNRELEASED; urgency=low
Keyboard K04
+ 108_fix_intltool_make_check.diff: Fix make check in the presence
of the quilt patch system.
- + xkb-data.postinst.in:
- + Migrate console-setup/keyboard-configuration settings from
- dvorak-intl to dvorak-alt-intl to match rename in xkeyboard-config
- 1.9. (LP: #742683)
+ + xkb-data.postinst.in: Migrate console-setup/keyboard-configuration
+ settings from dvorak-intl to dvorak-alt-intl to match rename in
+ xkeyboard-config 1.9. (LP: 742683)
* No need to build the pot file anymore, upstream version is used.
* Fix dh_autoreconf override in rules (FTBFS).
commit e63cf0aa8d227628d949f24fe2e11d8e162a6410
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Aug 11 21:34:59 2011 +0300
Fix dh_autoreconf override in rules (FTBFS).
diff --git a/debian/changelog b/debian/changelog
index 23168fb..1d247f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xkeyboard-config (2.3-1ubuntu1) UNRELEASED; urgency=low
dvorak-intl to dvorak-alt-intl to match rename in xkeyboard-config
1.9. (LP: #742683)
* No need to build the pot file anymore, upstream version is used.
+ * Fix dh_autoreconf override in rules (FTBFS).
-- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 11 Aug 2011 17:00:26 +0300
diff --git a/debian/rules b/debian/rules
index 87caa41..c8bf56a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
xkb_base := /usr/share/X11/xkb
override_dh_autoreconf:
- dh_autoreconf -- '(intltoolize -c -f && autoreconf -vfi)'
+ dh_autoreconf '(intltoolize -c -f && autoreconf -vfi)'
override_dh_auto_configure:
dh_auto_configure -- \
commit bf722a8a8d8e96a9c2c762bdc778702cd39dc66a
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Aug 11 21:34:18 2011 +0300
No need to build the pot file anymore, upstream version is used.
diff --git a/debian/changelog b/debian/changelog
index 8215fad..23168fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ xkeyboard-config (2.3-1ubuntu1) UNRELEASED; urgency=low
* Merge from Debian experimental. Remaining Ubuntu changes:
+ xkb-data-i18n.install, xkb-data.install, rules: Split out
xkb-data-i18n to be used by console-setup.
- + rules: Generate pot file for translations during build
+ 105_intelligent_keyboard.patch: Add support for the Intelligent
Keyboard K04
+ 108_fix_intltool_make_check.diff: Fix make check in the presence
@@ -12,6 +11,7 @@ xkeyboard-config (2.3-1ubuntu1) UNRELEASED; urgency=low
+ Migrate console-setup/keyboard-configuration settings from
dvorak-intl to dvorak-alt-intl to match rename in xkeyboard-config
1.9. (LP: #742683)
+ * No need to build the pot file anymore, upstream version is used.
-- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 11 Aug 2011 17:00:26 +0300
diff --git a/debian/rules b/debian/rules
index 4e56e81..87caa41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,6 @@ override_dh_auto_configure:
--with-xkb-base=$(xkb_base) \
--disable-runtime-deps
-override_dh_auto_build:
- dh_auto_build
- cd 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/e1qrac9-00048x...@vasks.debian.org
