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

DRAFT: slbackup debdiff for s-p-u



hi all,

I have uploaded a proposal of slbackup for squeeze-updates to mentors.debian.net:
http://mentors.debian.net/package/slbackup

Of course, as with any proposal for squeeze-updates the patch between 0.0.12-2+squeeze1 and 0.0.12-2+squeeze2 has been kept as minimal as possible.

The approach is: drop /etc/cron.daily/slbackup fully and re-enable the debconf code that allows to configure the backup system via dpkg-reconfigure. This configuration run will place a cron job file ,,slbackup'' into /etc/cron.d. This should match the way slbackup-php looks for the file.

Hope that solves the reported issue (BTS #662914).

@all who reported to this BTS issue: could you please download the source package from http://mentors.debian.net/package/slbackup and test with your setup? Thanks.

The Git Vcs is here, btw:
http://anonscm.debian.org/gitweb/?p=debian-edu/slbackup.git;a=tree

$ git clone ssh://git.debian.org/git/debian-edu/slbackup.git
$ git checkout squeeze-updates
$ debuild -uc -us

Mike

<quote type="debdiff">
diff -Nru slbackup-0.0.12/debian/changelog slbackup-0.0.12/debian/changelog
--- slbackup-0.0.12/debian/changelog    2012-04-22 20:07:50.000000000 +0200
+++ slbackup-0.0.12/debian/changelog    2012-04-22 19:47:49.000000000 +0200
@@ -1,3 +1,11 @@
+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).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 22 Apr 2012 19:47:43 +0200
+
 slbackup (0.0.12-2+squeeze1) stable; urgency=low

   * Fixed typo in cron-job (path to configfile). (Closes: #626884)
diff -Nru slbackup-0.0.12/debian/control slbackup-0.0.12/debian/control
--- slbackup-0.0.12/debian/control      2012-04-22 20:07:50.000000000 +0200
+++ slbackup-0.0.12/debian/control      2012-04-22 19:42:30.000000000 +0200
@@ -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 -Nru slbackup-0.0.12/debian/postinst slbackup-0.0.12/debian/postinst
--- slbackup-0.0.12/debian/postinst     2012-04-22 20:07:50.000000000 +0200
+++ slbackup-0.0.12/debian/postinst     2012-04-22 19:34:34.000000000 +0200
@@ -58,24 +58,24 @@
        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);
+    }
 }

 system('
diff -Nru slbackup-0.0.12/debian/slbackup.cron.daily slbackup-0.0.12/debian/slbackup.cron.daily --- slbackup-0.0.12/debian/slbackup.cron.daily 2012-04-22 20:07:50.000000000 +0200 +++ slbackup-0.0.12/debian/slbackup.cron.daily 1970-01-01 01:00:00.000000000 +0100
@@ -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
</quote>



--

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: pgpGnzPcf4O1F.pgp
Description: Digitale PGP-Unterschrift


Reply to: