The following commit has been merged in the master branch:
commit 26b737022b3fcfaf528b0f03b5bf4b607e9170b0
Author: Colin Watson <cjwat...@ubuntu.com>
Date: Sun Feb 19 00:34:31 2012 +0100
Use maintscript support in dh_installdeb and pre-depend on the appropriate
version of dpkg.
diff --git a/debian/changelog b/debian/changelog
index 561c98b..2d83244 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+stella (3.5.5-2) unstable; urgency=low
+
+ * Use maintscript support in dh_installdeb rather than writing out
+ dpkg-maintscript-helper commands by hand. We now simply Pre-Depend
+ on a new enough version of dpkg rather than using 'dpkg-maintscript-
+ helper supports' guards, leading to more predictable behaviour on
+ upgrades. Thanks to Colin Watson for the patch (closes: #659792).
+
+ -- Stephen Kitt <st...@sk2.org> Wed, 15 Feb 2012 08:32:12 +0100
+
stella (3.5.5-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/control b/debian/control
index 8931b66..30949d0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,14 @@ Maintainer: Debian Games Team
<pkg-games-de...@lists.alioth.debian.org>
Uploaders: Stephen Kitt <st...@sk2.org>
DM-Upload-Allowed: yes
Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, zlib1g-dev, libpng12-dev,
autotools-dev
+Build-Depends: debhelper (>= 8.1.0~), libsdl1.2-dev, zlib1g-dev, libpng12-dev,
autotools-dev
Homepage: http://stella.sf.net
Vcs-Git: git://git.debian.org/git/pkg-games/stella.git
Vcs-Browser: http://git.debian.org/?p=pkg-games/stella.git
Package: stella
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Atari 2600 Emulator for SDL & the X Window System
Stella is a portable emulator of the old Atari 2600 video-game
diff --git a/debian/maintscript b/debian/maintscript
new file mode 100644
index 0000000..8276bc0
--- /dev/null
+++ b/debian/maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/stella.pro 3.2-1
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 053bb79..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# postinst script for stella
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <postinst> `abort-remove'
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-if dpkg-maintscript-helper supports rm_conffile; then
- dpkg-maintscript-helper rm_conffile /etc/stella.pro 3.2-1 stella -- "$@"
-fi
-
-case "$1" in
- configure)
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index 4bc6f36..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-# postrm script for stella
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postrm> `remove'
-# * <postrm> `purge'
-# * <old-postrm> `upgrade' <new-version>
-# * <new-postrm> `failed-upgrade' <old-version>
-# * <new-postrm> `abort-install'
-# * <new-postrm> `abort-install' <old-version>
-# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <overwriter>
-# <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-if dpkg-maintscript-helper supports rm_conffile; then
- dpkg-maintscript-helper rm_conffile /etc/stella.pro 3.2-1 stella -- "$@"
-fi
-
-case "$1" in
- purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/preinst b/debian/preinst
deleted file mode 100644
index 28c6928..0000000
--- a/debian/preinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# preinst script for stella
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-if dpkg-maintscript-helper supports rm_conffile; then
- dpkg-maintscript-helper rm_conffile /etc/stella.pro 3.2-1 stella -- "$@"
-fi
-
-case "$1" in
- install|upgrade)
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
--
Atari 2600 Emulator for SDL & the X Window System
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
