diff -Nru puppet-2.7.9/debian/changelog puppet-2.7.9/debian/changelog --- puppet-2.7.9/debian/changelog 2012-01-02 13:47:34.000000000 +0000 +++ puppet-2.7.9/debian/changelog 2012-02-12 15:07:56.000000000 +0000 @@ -1,3 +1,12 @@ +puppet (2.7.9-1ubuntu2) precise; 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. + + -- Colin Watson Sun, 12 Feb 2012 15:07:46 +0000 + puppet (2.7.9-1ubuntu1) precise; urgency=low * Merge from Debian testing. Remaining changes: diff -Nru puppet-2.7.9/debian/control puppet-2.7.9/debian/control --- puppet-2.7.9/debian/control 2011-12-21 07:00:17.000000000 +0000 +++ puppet-2.7.9/debian/control 2012-02-12 15:07:31.000000000 +0000 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Puppet Package Maintainers Uploaders: Micah Anderson , Andrew Pollock , Nigel Kersten , Stig Sandbeck Mathisen Build-Depends-Indep: ruby (>= 1.8.1), libopenssl-ruby, facter (>= 1.5) -Build-Depends: debhelper (>= 6.0.7~), openssl +Build-Depends: debhelper (>= 8.1.0~), openssl Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-puppet/puppet.git Vcs-Browser: http://git.debian.org/?p=pkg-puppet/puppet.git @@ -35,6 +35,7 @@ Package: puppet Architecture: all +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, puppet-common (= ${binary:Version}), ruby1.8 Recommends: rdoc Suggests: puppet-el, vim-puppet, etckeeper diff -Nru puppet-2.7.9/debian/patches/debian-changes puppet-2.7.9/debian/patches/debian-changes --- puppet-2.7.9/debian/patches/debian-changes 2012-01-02 13:47:37.000000000 +0000 +++ puppet-2.7.9/debian/patches/debian-changes 2012-02-12 15:11:04.000000000 +0000 @@ -5,14 +5,13 @@ information below has been extracted from the changelog. Adjust it or drop it. . - puppet (2.7.9-1ubuntu1) precise; urgency=low + puppet (2.7.9-1ubuntu2) precise; urgency=low . - * Merge from Debian testing. Remaining changes: - + Add 2 patches to fix incompatibility with Augeas 0.10.0: - - augeas_saved_files - - augeas_versioncmp - + Change Maintainer according to policy -Author: Chuck Short + * 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. +Author: Colin Watson --- The information above should follow the Patch Tagging Guidelines, please diff -Nru puppet-2.7.9/debian/puppet.maintscript puppet-2.7.9/debian/puppet.maintscript --- puppet-2.7.9/debian/puppet.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ puppet-2.7.9/debian/puppet.maintscript 2012-02-12 15:10:59.000000000 +0000 @@ -0,0 +1,4 @@ +# Remove renamed configuration files which are now handled by other packages +rm_conffile /etc/logrotate.d/puppet 2.6.4-2 +rm_conffile /etc/logcheck/ignore.d.server/puppet 2.6.4-2 +rm_conffile /etc/emacs/site-start.d/50puppet-mode-init.el 2.6.4-2 diff -Nru puppet-2.7.9/debian/puppet.postinst puppet-2.7.9/debian/puppet.postinst --- puppet-2.7.9/debian/puppet.postinst 2011-12-21 07:00:18.000000000 +0000 +++ puppet-2.7.9/debian/puppet.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -# Remove renamed configuration files which are now handled by other -# packages -if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then - - dpkg-maintscript-helper rm_conffile \ - /etc/logrotate.d/puppet 2.6.4-2 puppet -- "$@" - - dpkg-maintscript-helper rm_conffile \ - /etc/logcheck/ignore.d.server/puppet 2.6.4-2 puppet -- "$@" - - dpkg-maintscript-helper rm_conffile \ - /etc/emacs/site-start.d/50puppet-mode-init.el 2.6.4-2 puppet -- "$@" - -fi - -#DEBHELPER# diff -Nru puppet-2.7.9/debian/puppet.postrm puppet-2.7.9/debian/puppet.postrm --- puppet-2.7.9/debian/puppet.postrm 2011-12-21 07:00:17.000000000 +0000 +++ puppet-2.7.9/debian/puppet.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -# Remove renamed configuration files which are now handled by other -# packages -if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then - - dpkg-maintscript-helper rm_conffile \ - /etc/logrotate.d/puppet 2.6.4-2 puppet -- "$@" - - dpkg-maintscript-helper rm_conffile \ - /etc/logcheck/ignore.d.server/puppet 2.6.4-2 puppet -- "$@" - - dpkg-maintscript-helper rm_conffile \ - /etc/emacs/site-start.d/50puppet-mode-init.el 2.6.4-2 puppet -- "$@" - -fi - -#DEBHELPER# diff -Nru puppet-2.7.9/debian/puppet.preinst puppet-2.7.9/debian/puppet.preinst --- puppet-2.7.9/debian/puppet.preinst 2011-12-21 07:00:17.000000000 +0000 +++ puppet-2.7.9/debian/puppet.preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -# Remove renamed configuration files which are now handled by other -# packages -if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then - - dpkg-maintscript-helper rm_conffile \ - /etc/logrotate.d/puppet 2.6.4-2 puppet -- "$@" - - dpkg-maintscript-helper rm_conffile \ - /etc/logcheck/ignore.d.server/puppet 2.6.4-2 puppet -- "$@" - - dpkg-maintscript-helper rm_conffile \ - /etc/emacs/site-start.d/50puppet-mode-init.el 2.6.4-2 puppet -- "$@" - -fi - -#DEBHELPER#