[debian-edu-commits] debian-edu/slbackup.git (#17) - wheezy-proposed-updates (branch) updated: debian/0.0.12-3-14-gab84ae9

[Holger Levsen]

The branch, wheezy-proposed-updates has been updated
       via  ab84ae9568b34bf19742a4f776344d2bcff53db2 (commit)
      from  83de6c0abe83fe875e920cb2d1c29c0e150d8a08 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 +-
 debian/control   |    1 +
 debian/postinst  |    6 ++----
 debian/postrm    |    2 ++
 debian/preinst   |    8 ++++++++
 5 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 debian/preinst

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e825e8a..278f0c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ slbackup (0.0.12-4) UNRELEASED; urgency=low
   * New maintainer: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>.
   * Drop CRON job /etc/cron.daily/slbackup. Re-enable configuration
     of slbackup via debconf templates (closes: #662914).
-  * Explicitly remove /etc/cron.daily/slbackup in postinst script.
+  * Remove conffile /etc/cron.daily/slbackup via dpkg−maintscript−helper.
   * Bump Standards:-version to 3.9.3.
   * Translations:
     - Italian, thanks to Beatrice Torracca. (Closes: #666917).
diff --git a/debian/control b/debian/control
index f930e7f..7cd5312 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Homepage: http://slbackup.alioth.debian.org/
 
 Package: slbackup
 Architecture: all
+Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: ${perl:Depends}, ${misc:Depends}, rdiff-backup, logrotate, libconfig-general-perl, libnet-dns-perl, libperl4-corelibs-perl | perl (<< 5.12.3-7)
 Recommends: ssh
 Description: Skolelinux Backup system
diff --git a/debian/postinst b/debian/postinst
index 4b46704..92a31a8 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -76,12 +76,10 @@ if ($ARGV[0] and $ARGV[0] eq "configure") {
 	close(CRONFILE);
     }
 
-    if (system("dpkg --compare-versions \"".$ARGV[1]."\" le \"0.0.12-3\"") == 0) {
-        system("test -f /etc/cron.daily/slbackup && rm /etc/cron.daily/slbackup");
-    }
-
 }
 
+system("dpkg-maintscript-helper rm_conffile /etc/cron.daily/slbackup 0.0.12-3 -- \"". at ARGV."\"");
+
 system('
 #DEBHELPER#
 ');
diff --git a/debian/postrm b/debian/postrm
index 898a128..8fef604 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -27,6 +27,8 @@ case "$1" in
     ;;
 esac
 
+dpkg-maintscript-helper rm_conffile /etc/cron.daily/slbackup 0.0.12-3 -- "$@"
+
 #DEBHELPER#
 
 exit 0
diff --git a/debian/preinst b/debian/preinst
new file mode 100644
index 0000000..3d3e91e
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/cron.daily/slbackup 0.0.12-3 -- "$@"
+
+#DEBHELPER#
+


hooks/post-receive
-- 
slbackup.git (Debian package slbackup)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup.git" (Debian package slbackup).