The following commit has been merged in the lucid-backports branch:
commit 9f719b068f1ec4f80d505a686705e98659798322
Merge: b8c6eede9f759eca3c24514b7887242cba147831
efe8c5b5b8aeee2fa528f4d007aaff411195f4da
Author: Gerfried Fuchs <rho...@debian.org>
Date: Thu Sep 13 20:51:37 2012 +0200
Merge tag 'debian/1.10.4-1' into lucid-backports
Uploaded 1:1.10.4-1 to experimental
Conflicts:
debian/changelog
debian/rules
diff --combined debian/changelog
index d295b08,199ea14..b9db6d7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,17 +1,25 @@@
+ wesnoth-1.10 (1:1.10.4-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * Remove the extra ln handling in debian/rules.
+
+ -- Gerfried Fuchs <rho...@debian.org> Mon, 03 Sep 2012 12:49:56 +0200
+
+ wesnoth-1.10 (1:1.10.3-2) unstable; urgency=low
+
+ [ Vincent Cheng ]
+ * Fix broken font symlink in debian/rules. (closes: #681556)
+
+ -- Gerfried Fuchs <rho...@debian.org> Sun, 02 Sep 2012 13:11:51 +0200
+
+wesnoth-1.10 (1:1.10.3-1~lucid1) lucid-backports; urgency=low
+
+ * Backport to lucid, changes kept:
+ - Switch to use ttf-droid instead of fonts-droid which is not available in
+ lucid.
+
+ -- Gerfried Fuchs <rho...@ubuntu.com> Thu, 28 Jun 2012 15:42:17 +0200
+
wesnoth-1.10 (1:1.10.3-1) unstable; urgency=low
* New upstream stable release (closes: #676460)
@@@ -16,14 -22,6 +30,14 @@@
-- Gerfried Fuchs <rho...@debian.org> Fri, 08 Jun 2012 01:04:39 +0200
+wesnoth-1.10 (1:1.10.2-1~lucid1) lucid-backports; urgency=low
+
+ * Backport to lucid, changes kept:
+ - Switch to use ttf-droid instead of fonts-droid which is not available in
+ lucid.
+
+ -- Gerfried Fuchs <rho...@ubuntu.com> Fri, 13 Apr 2012 11:57:17 +0200
+
wesnoth-1.10 (1:1.10.2-1) unstable; urgency=low
* New upstream stable release.
@@@ -33,14 -31,6 +47,14 @@@
-- Gerfried Fuchs <rho...@debian.org> Sun, 08 Apr 2012 16:16:17 +0200
+wesnoth-1.10 (1:1.10.1-1~lucid1) lucid-backports; urgency=low
+
+ * Backport to lucid, changes kept:
+ - Switch to use ttf-droid instead of fonts-droid which is not available in
+ lucid.
+
+ -- Gerfried Fuchs <rho...@ubuntu.com> Tue, 06 Mar 2012 13:32:11 +0100
+
wesnoth-1.10 (1:1.10.1-1) unstable; urgency=low
* New upstream stable release, making fix-xdg-path patch obsolete.
@@@ -49,14 -39,6 +63,14 @@@
-- Gerfried Fuchs <rho...@debian.org> Tue, 28 Feb 2012 00:44:18 +0100
+wesnoth-1.10 (1:1.10-1~lucid1) lucid-backports; urgency=low
+
+ * Backport to lucid (LP: #932011)
+ * Switch to use ttf-droid instead of fonts-droid which is not available in
+ lucid.
+
+ -- Gerfried Fuchs <rho...@ubuntu.com> Sun, 12 Feb 2012 11:41:50 +0100
+
wesnoth-1.10 (1:1.10-1) unstable; urgency=low
* New upstream stable release! \o/
--
Debian packaging of wesnoth
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
