diff -u backuppc-3.1.0/debian/control backuppc-3.1.0/debian/control --- backuppc-3.1.0/debian/control +++ backuppc-3.1.0/debian/control @@ -1,14 +1,15 @@ Source: backuppc Section: utils Priority: optional -Maintainer: Ludovic Drolez +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Ludovic Drolez Build-Depends-Indep: perl (>= 5.6.0), patch Build-Depends: debhelper (>= 4.1.16), par2 Standards-Version: 3.7.3 Package: backuppc Architecture: all -Depends: ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>=1.8.3), apache (>> 1.3) | apache-ssl | apache-perl | apache2 | httpd, perl-suid, ${misc:Depends}, smbclient, samba-common | samba-tng-common, bzip2 +Depends: ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>=1.8.3), apache2 | httpd, perl-suid, ${misc:Depends}, smbclient, samba-common | samba-tng-common, bzip2 Recommends: rsync, libfile-rsyncp-perl (>= 0.68), openssh-client | ssh-client, exim4 | sendmail | postfix | mail-transport-agent, rrdtool Suggests: w3m | www-browser, par2 Conflicts: libfile-rsyncp-perl (<< 0.68) diff -u backuppc-3.1.0/debian/rules backuppc-3.1.0/debian/rules --- backuppc-3.1.0/debian/rules +++ backuppc-3.1.0/debian/rules @@ -63,12 +63,10 @@ pod2man --section=8 --center="BackupPC manual" doc/BackupPC.pod backuppc.8 perl -e "s/.IX Title.*/.SH NAME\nbackuppc \\- BackupPC manual/g" -p -i.tmp backuppc.8 - -mv -f debian/backuppc/var/lib/backuppc/conf/* debian/backuppc/etc/backuppc mv -f debian/backuppc/usr/share/backuppc/cgi-bin/* debian/backuppc/usr/share/backuppc/cgi-bin/index.cgi install --mode=644 conf/hosts debian/backuppc/etc/backuppc install --mode=644 debian/localhost.pl debian/backuppc/etc/backuppc install --mode=644 debian/apache.conf debian/backuppc/etc/backuppc - -rmdir debian/backuppc/var/lib/backuppc/conf/ (cd debian/backuppc/usr/share/backuppc/cgi-bin; ln -s ../image) patch --no-backup-if-mismatch -p0 < debian/config.pl.diff @@ -85,7 +83,7 @@ dh_installexamples debian/examples/* mv -f debian/backuppc/usr/share/backuppc/doc/* debian/backuppc/usr/share/doc/backuppc/ dh_installmenu - dh_installinit + dh_installinit -- start 20 2 3 4 5 . stop 20 1 . dh_installcron dh_installman backuppc.8 dh_installinfo diff -u backuppc-3.1.0/debian/backuppc.init backuppc-3.1.0/debian/backuppc.init --- backuppc-3.1.0/debian/backuppc.init +++ backuppc-3.1.0/debian/backuppc.init @@ -10,7 +10,7 @@ # Should-Start: $local_fs # Should-Stop: $local_fs # Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Default-Stop: 1 # Short-Description: Launch backuppc server # Description: Launch backuppc server, a high-performance, # enterprise-grade system for backing up PCs. diff -u backuppc-3.1.0/debian/changelog backuppc-3.1.0/debian/changelog --- backuppc-3.1.0/debian/changelog +++ backuppc-3.1.0/debian/changelog @@ -1,3 +1,26 @@ +backuppc (3.1.0-3ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #180352), remaining changes: + - We like apache 2 more, so move it first to the alternatives list. + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488656 + - Munge Maintainer field as per spec. + - Don't move /var/lib/backuppc/conf/* (and then delete) to /etc/backuppc + in rules, upstream is shipping the config files in /etc/backuppc + themselves. + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488659 + * Move rsync and libfile-rsyncp-perl to Recommends, as they will now + be installed, but not forced. + * Move away from "multiuser" for update-rc.d. + - Use "start 20 2 3 4 5 . stop 20 1 ." as arguments to update-rc.d via + dh_installinit. + - Change "Default-Stop: 0 1 6" to "Default-Stop: 1" in + debian/backuppc.init. + - https://wiki.ubuntu.com/Teardown + - Remove stop script symlinks from rc0 and rc6. + - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488660 + + -- James Westby Mon, 30 Jun 2008 11:20:59 +0100 + backuppc (3.1.0-3) unstable; urgency=low * Added backuppc to /etc/aliases. Closes: #438331 @@ -30,12 +53,57 @@ -- Ludovic Drolez Fri, 7 Dec 2007 10:54:44 +0100 +backuppc (3.0.0-4ubuntu1) hardy; urgency=low + + * Merge from Debian unstable + * Remaining Ubuntu changes: + - Use LSB functions in the init script, and make /var/run/backuppc if + needed. + - Remove dependancy on wwwconfig-common. + - We like apache 2 more, so move it first to the alternatives list. + - Bump libfile-rsyncp-perl and rsync from Suggests to Depends. + - Remove stop script symlinks from rc0 and rc6. + - Don't chown /var/run/backuppc in the postinst. + - Don't move /var/lib/backuppc/conf/* (and then delete) to /etc/backuppc + in rules, upstream is shipping the config files in /etc/backuppc + themselves. + - Unfuzzify debian/config.pl.diff. + - Munge Maintainer field as per spec. + - Add .conf to the symlink removal code in prerm. (LP: #84487) + + -- Reinhard Tartler Wed, 24 Oct 2007 15:55:31 +0200 + backuppc (3.0.0-4) unstable; urgency=high * Clear the remaining password in config.dat. Closes: #436681 -- Ludovic Drolez Mon, 27 Aug 2007 18:28:25 +0200 +backuppc (3.0.0-3ubuntu2) gutsy; urgency=low + + * Add .conf to the symlink removal code in prerm. (LP: #84487) + + -- Karl Goetz Mon, 27 Aug 2007 21:49:15 +0930 + +backuppc (3.0.0-3ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable + * Remaining Ubuntu changes: + - Use LSB functions in the init script, and make /var/run/backuppc if + needed. + - Remove dependancy on wwwconfig-common. + - We like apache 2 more, so move it first to the alternatives list. + - Bump libfile-rsyncp-perl and rsync from Suggests to Depends. + - Remove stop script symlinks from rc0 and rc6. + - Don't chown /var/run/backuppc in the postinst. + - Don't move /var/lib/backuppc/conf/* (and then delete) to /etc/backuppc + in rules, upstream is shipping the config files in /etc/backuppc + themselves. + - Unfuzzify debian/config.pl.diff. + - Munge Maintainer field as per spec. + + -- Steve Kowalik Fri, 25 May 2007 11:10:27 +1000 + backuppc (3.0.0-3) unstable; urgency=medium * Added bzip2 in the dependencies. Closes: #420030 @@ -52,6 +120,27 @@ -- Luk Claes Thu, 17 May 2007 00:37:56 +0200 +backuppc (3.0.0-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - Use LSB functions in the init script, and make /var/run/backuppc if + needed. + - Remove dependancy on wwwconfig-common. + - We like apache 2 more, so move it first to the alternatives list. + - Bump libfile-rsyncp-perl and rsync from Suggests to Depends. + - Remove stop script symlinks from rc0 and rc6. + * Ubuntu changes dropped: + - Don't use wwwconfig-common in post{inst,rm}. + * Don't chown /var/run/backuppc in the postinst. + * Don't move /var/lib/backuppc/conf/* (and then delete) to /etc/backuppc + in rules, upstream is shipping the config files in /etc/backuppc + themselves. + * Unfuzzify debian/config.pl.diff. + * Munge Maintainer field as per spec. + + -- Steve Kowalik Thu, 10 May 2007 15:14:19 +1000 + backuppc (3.0.0-2) unstable; urgency=low * Bzip2 path changed. Closes: #410858 @@ -71,6 +160,24 @@ -- Ludovic Drolez Mon, 5 Feb 2007 10:12:51 +0100 +backuppc (2.1.2-5ubuntu3) edgy; urgency=low + + * Remove stop script symlinks from rc0 and rc6. + + -- Scott James Remnant Fri, 15 Sep 2006 16:53:57 +0100 + +backuppc (2.1.2-5ubuntu2) edgy; urgency=low + + * debian/control, debian/postinst: Get rid of wwwconfig-common. + + -- Martin Pitt Wed, 12 Jul 2006 11:09:27 +0200 + +backuppc (2.1.2-5ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Martin Pitt Fri, 30 Jun 2006 08:25:52 +0200 + backuppc (2.1.2-5) unstable; urgency=medium * upstream patch 2.1.2pl1 applied. Closes: #369425, #355112 @@ -95,6 +202,40 @@ -- Ludovic Drolez Sun, 8 Jan 2006 23:52:56 +0100 +backuppc (2.1.2-2ubuntu5) dapper; urgency=low + + * Bump libfile-rsyncp-perl and rsync from Suggests: to Depends: to make the + package work out of the box in a nice way. Thanks to Christian Bjälevik + for the suggestion. + + -- Martin Pitt Thu, 27 Apr 2006 19:50:38 +0200 + +backuppc (2.1.2-2ubuntu4) dapper; urgency=low + + * Oops, this seemed to get double-fixed. + + -- Scott James Remnant Tue, 11 Apr 2006 20:56:27 +0100 + +backuppc (2.1.2-2ubuntu3) dapper; urgency=low + + * Make /var/run/backuppc in the init script, and set its ownership; rather + than shipping it in the package. + + -- Scott James Remnant Mon, 10 Apr 2006 17:44:15 +0100 + +backuppc (2.1.2-2ubuntu2) dapper; urgency=low + + * We like apache 2 more than apache 1, so move that first in the Depends + line. + + -- Tollef Fog Heen Thu, 1 Dec 2005 13:58:24 +0100 + +backuppc (2.1.2-2ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. (me!) + + -- Scott James Remnant Thu, 17 Nov 2005 00:41:29 +0000 + backuppc (2.1.2-2) unstable; urgency=low * Added misc:Depends in control file. Closes: #331756. @@ -127,6 +268,24 @@ -- Ludovic Drolez Tue, 28 Jun 2005 13:02:06 +0200 +backuppc (2.1.1-2ubuntu3) breezy; urgency=low + + * Remove dependency on wwwconfig-common, dropped in sync. + + -- Matthias Klose Thu, 26 May 2005 19:35:30 +0000 + +backuppc (2.1.1-2ubuntu2) breezy; urgency=low + + * Suggest: postfix | mail-transport-agent + + -- LaMont Jones Mon, 2 May 2005 19:22:39 -0600 + +backuppc (2.1.1-2ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Jeff Bailey Wed, 20 Apr 2005 09:34:20 -0400 + backuppc (2.1.1-2) unstable; urgency=low * Added a patch to have backuppc detach correclty. Closes: #301057 @@ -147,6 +306,21 @@ -- Ludovic Drolez Fri, 18 Mar 2005 20:25:47 +0100 +backuppc (2.1.0-10ubuntu1) hoary; urgency=low + + * Sync Debian packaging with 2.1.1-1, but leave the upstream release + at 2.1.1, as the Debian packaging fixes all seem needed, but I'm not + prepared to trust a new upstream release this close to Hoary's release. + * Changes from Debian's 2.1.1-1: + - Do not modify config.pl in the postinst. (Ubuntu bug #8117) + Thanks to Peter Palfrader for the patch. Closes: #301076. + - Moved the 'rm -rf /etc/backuppc'. Closes: #301084. + - Check that backuppc.config is not run 2 times before generating + a random password. Closes: #301087. + - Added /bin/sh as shell for the backuppc user. Closes: #299852. + + -- Adam Conrad Thu, 24 Mar 2005 00:21:53 +0000 + backuppc (2.1.0-10) unstable; urgency=medium * Explicitly run /usr/bin/env : do not rely on the PATH. @@ -168,12 +342,28 @@ -- Ludovic Drolez Tue, 28 Dec 2004 15:38:06 +0100 +backuppc (2.1.0-8ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Sun, 05 Dec 2004 12:45:53 +0000 + backuppc (2.1.0-8) unstable; urgency=low * Postinst script fixed. Closes: Bug#283755 -- Ludovic Drolez Sat, 4 Dec 2004 01:54:02 +0100 +backuppc (2.1.0-7ubuntu1) hoary; urgency=low + + * Nathaniel McCallum: + - debian/backuppc.init: pretty initscript + - debian/control: versioned depend on lsb-base + + * Remove dependency on wwwconfig-common + + -- Thom May Mon, 29 Nov 2004 10:45:26 +0000 + backuppc (2.1.0-7) unstable; urgency=low * Depends on libfile-rsyncp-perl >= 0.50. Closes: #279649 diff -u backuppc-3.1.0/debian/postinst backuppc-3.1.0/debian/postinst --- backuppc-3.1.0/debian/postinst +++ backuppc-3.1.0/debian/postinst @@ -124,6 +124,11 @@ # change the rights of /etc/backuppc so that the CGI can modify the conf. chown -R backuppc /etc/backuppc + # Remove shutdown and reboot links; this init script does not need them. + if dpkg --compare-versions "$2" lt "2.1.2-5ubuntu3"; then + rm -f /etc/rc0.d/K20backuppc /etc/rc6.d/K20backuppc + fi + ;; abort-upgrade|abort-remove|abort-deconfigure)