[SCM] Debian packaging of wesnoth branch, natty-backports, updated. debian/1.10.4-1-14-gd412a57

[Gerfried Fuchs]

The following commit has been merged in the natty-backports branch:
commit 36505b6cf6161e8811ab1cfb0f4e9ae1f9e3e49e
Merge: 1d7cc23e18b06e264e791d6e639b3e8e29f7a88a efe8c5b5b8aeee2fa528f4d007aaff411195f4da
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Sat Sep 15 16:26:54 2012 +0200

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

diff --combined debian/changelog
index 79b87c4,199ea14..fb98135
--- 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~natty1) natty-backports; urgency=low
 +
 +  * Backport to natty, changes kept:
 +    - Switch to use ttf-droid instead of fonts-droid which is not available in
 +      natty.
 +
 + -- 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~natty1) natty-backports; urgency=low
 +
 +  * Backport to natty, changes kept:
 +    - Switch to use ttf-droid instead of fonts-droid which is not available in
 +      natty.
 +
 + -- 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~natty1) natty-backports; urgency=low
 +
 +  * Backport to natty, changes kept:
 +    - Switch to use ttf-droid instead of fonts-droid which is not available in
 +      natty.
 +
 + -- 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~natty1) natty-backports; urgency=low
 +
 +  * Backport to natty (LP: #932011)
 +  * Switch to use ttf-droid instead of fonts-droid which is not available in
 +    natty.
 +
 + -- 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