[debian-edu-commits] debian-edu/slbackup.git (#34) - wheezy-proposed-updates (branch) updated: debian/0.0.12-5-1-g0271e77

[Holger Levsen]

The branch, wheezy-proposed-updates has been updated
       via  0271e7718734b5e5eec40901613315532bc2181b (commit)
      from  0bf8c71afc9fa050f53add1c2c2897a222f5c10a (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 -----------------------------------------------------------------
commit 0271e7718734b5e5eec40901613315532bc2181b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Oct 8 14:02:16 2013 +0200

    Revert "Remove conffile /etc/cron.daily/slbackup via dpkg−maintscript−helper."
    
    This reverts commit ab84ae9568b34bf19742a4f776344d2bcff53db2.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 +-
 debian/control   |    2 --
 debian/postinst  |    6 ++++--
 debian/postrm    |    2 --
 4 files changed, 5 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 13e14e8..41ccc82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,7 +31,7 @@ slbackup (0.0.12-4) experimental; urgency=low
   * Change in conffile management:
     + Drop CRON job /etc/cron.daily/slbackup. Re-enable configuration
       of slbackup via debconf templates (closes: #662914).
-    + Remove conffile /etc/cron.daily/slbackup via dpkg−maintscript−helper.
+    + Explicitly remove /etc/cron.daily/slbackup in postinst script.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 27 Jul 2012 10:24:56 +0200
 
diff --git a/debian/control b/debian/control
index 9006d47..507a783 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,6 @@ Homepage: http://slbackup.alioth.debian.org/
 
 Package: slbackup
 Architecture: all
-Pre-Depends:
- dpkg (>= 1.15.7.2),
 Depends:
  ${perl:Depends},
  ${misc:Depends},
diff --git a/debian/postinst b/debian/postinst
index 9c03599..aa2224d 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -85,9 +85,11 @@ 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 432b148..0a34d8a 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -30,8 +30,6 @@ case "$1" in
     ;;
 esac
 
-dpkg-maintscript-helper rm_conffile /etc/cron.daily/slbackup 0.0.12-3 -- "$@"
-
 #DEBHELPER#
 
 exit 0


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).