[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.10-1-1-gfb39f0a

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit fb39f0aa16bc9b74fc745a41fa06a9bd7e12348f
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Tue Jan 31 09:46:13 2012 +0100

    Use proper name for the nolog alternative

diff --git a/debian/changelog b/debian/changelog
index 2e031b7..a73b889 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wesnoth-1.10 (1:1.10-2) unstable; urgency=low
+
+  * Use proper name for the nolog alternative. Thanks to Paul Wise for
+    noticing (closes: #658078)
+
+ -- 
+
 wesnoth-1.10 (1:1.10-1) unstable; urgency=low
 
   * New upstream stable release!  \o/
diff --git a/debian/wesnoth-1.10-core.postinst b/debian/wesnoth-1.10-core.postinst
index ee8637a..48c8932 100644
--- a/debian/wesnoth-1.10-core.postinst
+++ b/debian/wesnoth-1.10-core.postinst
@@ -36,7 +36,7 @@ setup_alternatives()
 	done)
 	slaves="$slaves --slave /usr/share/man/man6/wesnoth.6.gz wesnoth.6.gz /usr/share/man/man6/wesnoth-1.10.6.gz"
 
-	slaves="$slaves --slave /usr/games/wesnoth-nolog wesnoth-nolog /usr/games/wesnoth-nolog-1.10"
+	slaves="$slaves --slave /usr/games/wesnoth-nolog wesnoth-nolog /usr/games/wesnoth-1.10-nolog"
 
 	update-alternatives --install /usr/games/wesnoth wesnoth \
 		/usr/games/wesnoth-1.10 110 \
diff --git a/debian/wesnoth-BRANCH-core.postinst.in b/debian/wesnoth-BRANCH-core.postinst.in
index 339a547..656a8ef 100644
--- a/debian/wesnoth-BRANCH-core.postinst.in
+++ b/debian/wesnoth-BRANCH-core.postinst.in
@@ -36,7 +36,7 @@ setup_alternatives()
 	done)
 	slaves="$slaves --slave /usr/share/man/man6/wesnoth.6.gz wesnoth.6.gz /usr/share/man/man6/wesnoth-BRANCH.6.gz"
 
-	slaves="$slaves --slave /usr/games/wesnoth-nolog wesnoth-nolog /usr/games/wesnoth-nolog-BRANCH"
+	slaves="$slaves --slave /usr/games/wesnoth-nolog wesnoth-nolog /usr/games/wesnoth-BRANCH-nolog"
 
 	update-alternatives --install /usr/games/wesnoth wesnoth \
 		/usr/games/wesnoth-BRANCH BRANODOT \

-- 
Debian packaging of wesnoth