[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

slbackup for s-p-u



Dear Release Team,

the Debian Edu team would like to request an update of slbackup.

An explanation of the issue has been posted to BTS:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662914#59

A fix of #662914 will be important for Debian Edu r1, so we hope this change gets accepted.

Thanks,
Mike



<debdiff>
slbackup_0.0.12-2+squeeze1.dsc slbackup_0.0.12-2+squeeze2.dsc
reverted:
--- slbackup-0.0.12/debian/slbackup.cron.daily
+++ slbackup-0.0.12.orig/debian/slbackup.cron.daily
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-test -r /etc/slbackup/slbackup.conf || exit 0
-test -x /usr/share/slbackup/slbackup-cron || exit 0
-/usr/share/slbackup/slbackup-cron
diff -u slbackup-0.0.12/debian/changelog slbackup-0.0.12/debian/changelog
--- slbackup-0.0.12/debian/changelog
+++ slbackup-0.0.12/debian/changelog
@@ -1,3 +1,12 @@
+slbackup (0.0.12-2+squeeze2) stable; urgency=low
+
+  * New maintainer: Mike Gabriel <mike.gabriel@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.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 23 Apr 2012 23:28:02 +0200
+
 slbackup (0.0.12-2+squeeze1) stable; urgency=low

   * Fixed typo in cron-job (path to configfile). (Closes: #626884)
diff -u slbackup-0.0.12/debian/control slbackup-0.0.12/debian/control
--- slbackup-0.0.12/debian/control
+++ slbackup-0.0.12/debian/control
@@ -1,7 +1,7 @@
 Source: slbackup
 Section: utils
 Priority: optional
-Maintainer: Morten Werner Forsbring <werner@debian.org>
+Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: po-debconf
 Standards-Version: 3.8.4
diff -u slbackup-0.0.12/debian/postinst slbackup-0.0.12/debian/postinst
--- slbackup-0.0.12/debian/postinst
+++ slbackup-0.0.12/debian/postinst
@@ -13,7 +13,6 @@
 ## subsections
 sub writeconfig {
     my ($datafilename, $data) = @_;
-
 }

 ## start postinst
@@ -58,24 +57,29 @@
        my $datafile = new Config::General();
        $datafile->save_file("/etc/slbackup/slbackup.conf", $config);
     }
-
-#    # check if file specifying cron-job exists and if the user wanted to
-#    # configure slbackup now, and make one the answers to both questions
-#    # are "yes"
-#    if ( ! -e "/etc/cron.d/slbackup" and $enable eq "true") {
-#      # make cron-job
-#      my $crontab = "# cron job for Skolelinux Backup (once a day)\n";
-#      if ($enable eq "false") { $crontab .= "#"; }
-#      my ($hour, $min) = split(/:/, $backuptime);
-#      $crontab .= "$min $hour * * * root if [ -x " .
-#          "/usr/share/slbackup/slbackup-cron -a -f " .
-#          "/etc/slbackup/slbackup.conf ]; then " .
-#          "/usr/share/slbackup/slbackup-cron ; fi\n";
-#
-#      open(CRONFILE, ">/etc/cron.d/slbackup");
-#      print(CRONFILE "$crontab");
-#      close(CRONFILE);
-#    }
+
+    # check if file specifying cron-job exists and if the user wanted to
+    # configure slbackup now, and make one the answers to both questions
+    # are "yes"
+    if ( ! -e "/etc/cron.d/slbackup" and $enable eq "true") {
+       # make cron-job
+       my $crontab = "# cron job for Skolelinux Backup (once a day)\n";
+       if ($enable eq "false") { $crontab .= "#"; }
+       my ($hour, $min) = split(/:/, $backuptime);
+       $crontab .= "$min $hour * * * root if [ -x " .
+           "/usr/share/slbackup/slbackup-cron -a -f " .
+           "/etc/slbackup/slbackup.conf ]; then " .
+           "/usr/share/slbackup/slbackup-cron ; fi\n";
+
+       open(CRONFILE, ">/etc/cron.d/slbackup");
+       print(CRONFILE "$crontab");
+       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('
</debdiff>

--

DAS-NETZWERKTEAM
mike gabriel, dorfstr. 27, 24245 barmissen
fon: +49 (4302) 281418, fax: +49 (4302) 281419

GnuPG Key ID 0xB588399B
mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb

Attachment: pgp8th89rbKMO.pgp
Description: Digitale PGP-Unterschrift


Reply to: