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

[Holger Levsen]

The branch, wheezy-proposed-updates has been updated
       via  65b6d40835db688ef38390a45cf8860a94275070 (commit)
      from  87d1f9a1f09c51ed8f521ea8430cc4236dd5101b (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/postinst            |   36 ++++++++++++++++++------------------
 debian/slbackup.cron.daily |    5 -----
 3 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 debian/slbackup.cron.daily

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 80428b0..0895d58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 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).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 22 Apr 2012 19:54:39 +0200
 
diff --git a/debian/postinst b/debian/postinst
index 7fc5c29..96f234c 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -58,24 +58,24 @@ if ($ARGV[0] and $ARGV[0] eq "configure") {
 	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 --git a/debian/slbackup.cron.daily b/debian/slbackup.cron.daily
deleted file mode 100644
index 46bae21..0000000
--- a/debian/slbackup.cron.daily
+++ /dev/null
@@ -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


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