The following commit has been merged in the master branch:
commit f78ea14a4747a548abc1b4aa85c99ecb883ef93a
Author: Gerfried Fuchs rho...@debian.org
Date: Thu Jun 7 22:29:40 2012 +0200
Remove divert handling
diff --git a/debian/changelog b/debian/changelog
index aea1e2e..5f7c810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
wesnoth-1.10 (1:1.10.3-1) unstable; urgency=low
* New upstream stable release.
+ * Remove divert handling which was for wesnoth 1.6 (LP: #999378)
--
diff --git a/debian/wesnoth-1.10-core.postinst
b/debian/wesnoth-1.10-core.postinst
index 48c8932..695cb2d 100644
--- a/debian/wesnoth-1.10-core.postinst
+++ b/debian/wesnoth-1.10-core.postinst
@@ -1,6 +1,6 @@
#!/bin/sh
# postinst script for wesnoth-1.10-core
-# Copyright 2010 by Gerfried Fuchs rho...@debian.at
+# Copyright 2010-2012 by Gerfried Fuchs rho...@debian.org
# Licensed under WTFPLv2
set -e
@@ -9,20 +9,18 @@ divert_oldfiles()
{
# programs
for i in wesnoth wesnoth-nolog wesnoth-smallgui wesnoth-editor; do
- if ! dpkg-divert --list /usr/games/$i | grep -q /usr/games/$i;
then
- dpkg-divert --package wesnoth-1.10-core \
- --divert /usr/games/$i-old \
- --rename /usr/games/$i
+ if dpkg-divert --list /usr/games/$i | grep -q /usr/games/$i;
then
+ dpkg-divert --remove --package wesnoth-1.10-core \
+ --rename /usr/games/$i 2/dev/null || true
fi
done
# manpages
for i in ca_ES@valencia cs da de en_GB es et fi fr gl hu it ja \
lt nl pl sk sr sr@latin sv tr zh_CN zh_TW; do
- if ! dpkg-divert --list /usr/share/man/$i/man6/wesnoth.6.gz |
grep -q /usr/share/man/$i/man6/wesnoth.6.gz; then
- dpkg-divert --package wesnoth-1.10-core \
- --divert
/usr/share/man/$i/man6/wesnoth-old.6.gz \
- --rename /usr/share/man/$i/man6/wesnoth.6.gz
+ if dpkg-divert --list /usr/share/man/$i/man6/wesnoth.6.gz |
grep -q /usr/share/man/$i/man6/wesnoth.6.gz; then
+ dpkg-divert --remove --package wesnoth-1.10-core \
+ --rename /usr/share/man/$i/man6/wesnoth.6.gz
2/dev/null || true
fi
done
}
diff --git a/debian/wesnoth-1.10-core.postrm b/debian/wesnoth-1.10-core.postrm
deleted file mode 100644
index d5fed5f..000
--- a/debian/wesnoth-1.10-core.postrm
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# postrm script for wesnoth-1.10-core
-# Copyright 2010 by Gerfried Fuchs rho...@debian.at
-# Licensed under WTFPLv2
-
-set -e
-
-divert_oldfiles()
-{
- # programs
- for i in wesnoth wesnoth-nolog wesnoth-smallgui wesnoth-editor; do
- dpkg-divert --remove --package wesnoth-1.10-core \
- --rename /usr/games/$i 2/dev/null || true
- done
-
- # manpages
- for i in ca_ES@valencia cs da de en_GB es et fi fr gl hu it ja \
- lt nl pl sk sr sr@latin sv tr zh_CN zh_TW; do
- dpkg-divert --remove --package wesnoth-1.10-core \
- --rename /usr/share/man/$i/man6/wesnoth.6.gz
2/dev/null || true
- done
-}
-
-
-case $1 in
- purge|remove)
- divert_oldfiles
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/wesnoth-BRANCH-core.postinst.in
b/debian/wesnoth-BRANCH-core.postinst.in
index 656a8ef..e7b8017 100644
--- a/debian/wesnoth-BRANCH-core.postinst.in
+++ b/debian/wesnoth-BRANCH-core.postinst.in
@@ -1,6 +1,6 @@
#!/bin/sh
# postinst script for wesnoth-BRANCH-core
-# Copyright 2010 by Gerfried Fuchs rho...@debian.at
+# Copyright 2010-2012 by Gerfried Fuchs rho...@debian.org
# Licensed under WTFPLv2
set -e
@@ -9,20 +9,18 @@ divert_oldfiles()
{
# programs
for i in wesnoth wesnoth-nolog wesnoth-smallgui wesnoth-editor; do
- if ! dpkg-divert --list /usr/games/$i | grep -q /usr/games/$i;
then
- dpkg-divert --package wesnoth-BRANCH-core \
- --divert /usr/games/$i-old \
- --rename /usr/games/$i
+ if dpkg-divert --list /usr/games/$i | grep -q /usr/games/$i;
then
+ dpkg-divert --remove --package wesnoth-BRANCH-core \
+ --rename /usr/games/$i 2/dev/null || true
fi
done
# manpages
for i in ca_ES@valencia cs da de en_GB es et fi fr gl hu it ja \
lt nl pl sk sr sr@latin sv tr zh_CN zh_TW; do
- if ! dpkg-divert --list /usr/share/man/$i/man6/wesnoth.6.gz |
grep -q /usr/share/man/$i/man6/wesnoth.6.gz; then
- dpkg-divert --package wesnoth-BRANCH-core \
- --divert
