[SCM] Debian packaging of wesnoth branch, oneiric-backports, updated. debian/1.10.4-1-15-g325eced

[Gerfried Fuchs]

The following commit has been merged in the oneiric-backports branch:
commit 258cac59b146630054b61144309c51299171aeac
Merge: d4510c3a78d4391f4c9a75df4b21858054f9b050 efe8c5b5b8aeee2fa528f4d007aaff411195f4da
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Fri Sep 21 07:46:32 2012 +0200

    Merge tag 'debian/1.10.4-1' into oneiric-backports
    
    Uploaded 1:1.10.4-1 to experimental
    
    Conflicts:
    	debian/changelog
    	debian/rules

diff --combined debian/changelog
index 8520cba,199ea14..2e413b0
--- 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 <rhonda at 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 <rhonda at debian.org>  Sun, 02 Sep 2012 13:11:51 +0200
+ 
 +wesnoth-1.10 (1:1.10.3-1~oneiric1) oneiric-backports; urgency=low
 +
 +  * Backport to oneiric, changes kept:
 +    - Switch to use ttf-droid instead of fonts-droid which is not available in
 +      oneiric.
 +
 + -- Gerfried Fuchs <rhonda at 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 <rhonda at debian.org>  Fri, 08 Jun 2012 01:04:39 +0200
  
 +wesnoth-1.10 (1:1.10.2-1~oneiric1) oneiric-backports; urgency=low
 +
 +  * Backport to oneiric, changes kept:
 +    - Switch to use ttf-droid instead of fonts-droid which is not available in
 +      oneiric.
 +
 + -- Gerfried Fuchs <rhonda at 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 <rhonda at debian.org>  Sun, 08 Apr 2012 16:16:17 +0200
  
 +wesnoth-1.10 (1:1.10.1-1~oneiric1) oneiric-backports; urgency=low
 +
 +  * Backport to oneiric, changes kept:
 +    - Switch to use ttf-droid instead of fonts-droid which is not available in
 +      oneiric.
 +
 + -- Gerfried Fuchs <rhonda at 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 <rhonda at debian.org>  Tue, 28 Feb 2012 00:44:18 +0100
  
 +wesnoth-1.10 (1:1.10-1~oneiric1) oneiric-backports; urgency=low
 +
 +  * Backport to oneiric (LP: #932011)
 +  * Switch to use ttf-droid instead of fonts-droid which is not available in
 +    oneiric.
 +
 + -- Gerfried Fuchs <rhonda at 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