[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-836-g931cbb1

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit b030ed2d730a7c3944ba69a1460a7e2d7bbe9405
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Thu Jun 21 03:01:06 2012 +0200

    p.deb: cleanup obsolete /etc/piuparts/piuparts.conf
    
    Use dpkg-maintscript-helper to do the cleanup before piuparts-master
    gets installed which could ship this file in the future.
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 5d9a836..c5b9bbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -176,6 +176,8 @@ piuparts (0.45) UNRELEASED; urgency=low
   * Ship custom scripts in the piuparts package.
   * Comment sudoers and crontabs shipped in the master/slave packages,
     requiring explicit editing after installation to activate them.
+  * Bump debhelper and dpkg dependencies for using dpkg-maintscript-helper.
+  * Remove obsolete /etc/piuparts/piuparts.conf from old piuparts package.
 
   [ Leo Iannacone ]
   * piuparts.py: add --existing-chroot option, specify a directory as source
diff --git a/debian/control b/debian/control
index 6ec2094..0fc2887 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Section: devel
 Priority: extra
 Standards-Version: 3.9.3
 Build-Depends:
- debhelper (>=8),
+ debhelper (>= 8.1.0~),
  python (>=2.6.6-3~),
 Build-Depends-Indep:
  asciidoc,
@@ -19,6 +19,8 @@ X-Python-Version: >= 2.6
 
 Package: piuparts
 Architecture: all
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
 Depends:
  debootstrap,
  lsb-release,
diff --git a/debian/piuparts.maintscript b/debian/piuparts.maintscript
new file mode 100644
index 0000000..c80d54a
--- /dev/null
+++ b/debian/piuparts.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/piuparts/piuparts.conf 0.45~

-- 
piuparts git repository