[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.8.3-2-7-g41bd419

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit 41bd419c0d7602027f830a65bda545f37e03f31b
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Sun Aug 15 22:54:04 2010 +0200

    Move update-alternatives --remove to prerm

diff --git a/debian/changelog b/debian/changelog
index d93cebb..59fb6c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ wesnoth-1.8 (1:1.8.3-3) unstable; urgency=low
   * Bump Standards-Version to 3.9.1.
   * Fix spelling errors in control file.
   * Add lintian override for diversion-for-unknown-file.
+  * Move update-alternatives --remove to prerm.
 
  -- 
 
diff --git a/debian/wesnoth-1.8-core.postrm b/debian/wesnoth-1.8-core.postrm
index fe1c3e2..4f02733 100644
--- a/debian/wesnoth-1.8-core.postrm
+++ b/debian/wesnoth-1.8-core.postrm
@@ -21,15 +21,9 @@ divert_oldfiles()
 	done
 }
 
-setup_alternatives()
-{
-	update-alternatives --remove wesnoth /usr/games/wesnoth-1.8
-}
-
 
 case "$1" in
 	purge|remove)
-		setup_alternatives
 		divert_oldfiles
 	;;
 esac
diff --git a/debian/wesnoth-1.8-core.prerm b/debian/wesnoth-1.8-core.prerm
new file mode 100644
index 0000000..68acd06
--- /dev/null
+++ b/debian/wesnoth-1.8-core.prerm
@@ -0,0 +1,22 @@
+#!/bin/sh
+# prerm script for wesnoth-1.8-core
+# Copyright 2010 by Gerfried Fuchs <rhonda at debian.at>
+# Licensed under WTFPLv2
+
+set -e
+
+setup_alternatives()
+{
+	update-alternatives --remove wesnoth /usr/games/wesnoth-1.8
+}
+
+
+case "$1" in
+	remove)
+		setup_alternatives
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/wesnoth-BRANCH-core.postrm.in b/debian/wesnoth-BRANCH-core.postrm.in
index c48cfa9..9afdef4 100644
--- a/debian/wesnoth-BRANCH-core.postrm.in
+++ b/debian/wesnoth-BRANCH-core.postrm.in
@@ -21,15 +21,9 @@ divert_oldfiles()
 	done
 }
 
-setup_alternatives()
-{
-	update-alternatives --remove wesnoth /usr/games/wesnoth-BRANCH
-}
-
 
 case "$1" in
 	purge|remove)
-		setup_alternatives
 		divert_oldfiles
 	;;
 esac
diff --git a/debian/wesnoth-BRANCH-core.prerm.in b/debian/wesnoth-BRANCH-core.prerm.in
new file mode 100644
index 0000000..97510dd
--- /dev/null
+++ b/debian/wesnoth-BRANCH-core.prerm.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+# prerm script for wesnoth-BRANCH-core
+# Copyright 2010 by Gerfried Fuchs <rhonda at debian.at>
+# Licensed under WTFPLv2
+
+set -e
+
+setup_alternatives()
+{
+	update-alternatives --remove wesnoth /usr/games/wesnoth-BRANCH
+}
+
+
+case "$1" in
+	remove)
+		setup_alternatives
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

-- 
Debian packaging of wesnoth