[SCM] Debian packaging of wesnoth branch, natty-backports, updated. debian/1.10.2-1-10-g23bacaa

[Gerfried Fuchs]

The following commit has been merged in the natty-backports branch:
commit 7995d6f19d174176dcc9908a8fbe20f1232a5b2e
Merge: ca2e8a38673a163edf11de50dd151cd1cd05f9d8 2b5c6c052c593b0904bca8e99315dbe104b5087c
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Fri Apr 13 11:55:31 2012 +0200

    Merge tag 'debian/1.10.2-1' into natty-backports
    
    Uploading 1:1.10.2-1 to unstable
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 57a4a57,17232a1..ad47de4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,20 @@@
+ wesnoth-1.10 (1:1.10.2-1) unstable; urgency=low
+ 
+   * New upstream stable release.
+   * Also install wesnoth-help translations into -data package, thanks to Petr
+     Gajdůšek for noticing (closes: #664164)
+   * Bump to Standards-Version 3.9.3.
+ 
+  -- 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.
@@@ -14,14 -15,6 +23,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/
diff --combined debian/control
index f3bf7b7,e28943d..43b30be
--- a/debian/control
+++ b/debian/control
@@@ -9,7 -9,7 +9,7 @@@ Build-Depends: debhelper (>= 7), libsdl
    libboost-serialization-dev, libboost-system-dev, libboost-thread-dev,
    libboost-program-options-dev,
    libpango1.0-dev, cmake (>= 2.6)
- Standards-Version: 3.9.2
+ Standards-Version: 3.9.3
  Uploaders: Gerfried Fuchs <rhonda at debian.org>
  Homepage: http://wesnoth.org/
  Vcs-Git: git://git.debian.org/git/pkg-games/wesnoth.git
@@@ -18,7 -18,7 +18,7 @@@ Vcs-Browser: http://git.debian.org/?p=p
  Package: wesnoth-1.10-data
  Architecture: all
  Depends: ${misc:Depends}, ttf-dejavu
 -Recommends: fonts-droid
 +Recommends: ttf-droid
  Suggests: wesnoth-1.10-music
  Description: data files for Wesnoth (branch 1.10)
   This package contains the sound files and graphics for Wesnoth. It is required

-- 
Debian packaging of wesnoth