Skip to content

Commit

Permalink
Use dh_installdeb maintscript support (#659794)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
cjwatson authored and rfrancoise committed Feb 13, 2012
1 parent 505c881 commit b54488d
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 12 deletions.
1 change: 1 addition & 0 deletions debian/control
Expand Up @@ -14,6 +14,7 @@ Vcs-Git: git://git.debian.org/collab-maint/tmux.git


Package: tmux Package: tmux
Architecture: any Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: terminal multiplexer Description: terminal multiplexer
tmux enables a number of terminals (or windows) to be accessed and tmux enables a number of terminals (or windows) to be accessed and
Expand Down
1 change: 1 addition & 0 deletions debian/maintscript
@@ -0,0 +1 @@
rm_conffile /etc/init.d/tmux-cleanup 1.4-6
4 changes: 0 additions & 4 deletions debian/postinst
Expand Up @@ -2,10 +2,6 @@


set -e set -e


if dpkg-maintscript-helper supports rm_conffile; then
dpkg-maintscript-helper rm_conffile /etc/init.d/tmux-cleanup 1.4-6 -- "$@"
fi

if [ "$1" = "configure" ]; then if [ "$1" = "configure" ]; then
if [ -z "$2" ] || dpkg --compare-versions "$2" lt "1.5-3"; then if [ -z "$2" ] || dpkg --compare-versions "$2" lt "1.5-3"; then
add-shell /usr/bin/tmux add-shell /usr/bin/tmux
Expand Down
4 changes: 0 additions & 4 deletions debian/postrm
Expand Up @@ -2,10 +2,6 @@


set -e set -e


if dpkg-maintscript-helper supports rm_conffile; then
dpkg-maintscript-helper rm_conffile /etc/init.d/tmux-cleanup 1.4-6 -- "$@"
fi

if [ "$1" = "remove" ]; then if [ "$1" = "remove" ]; then
remove-shell /usr/bin/tmux remove-shell /usr/bin/tmux
fi fi
Expand Down
4 changes: 0 additions & 4 deletions debian/preinst
Expand Up @@ -7,8 +7,4 @@ if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" 'lt' "1.5-2"; then
update-rc.d -f tmux-cleanup remove >/dev/null update-rc.d -f tmux-cleanup remove >/dev/null
fi fi


if dpkg-maintscript-helper supports rm_conffile; then
dpkg-maintscript-helper rm_conffile /etc/init.d/tmux-cleanup 1.4-6 -- "$@"
fi

#DEBHELPER# #DEBHELPER#

0 comments on commit b54488d

Please sign in to comment.