Merge ~ahasenack/ubuntu/+source/backuppc:eoan-backuppc-merge into ubuntu/+source/backuppc:debian/sid

[Andreas Hasenack]

PPA with a test build: ppa:ahasenack/backuppc-merge
https://launchpad.net/~ahasenack/+archive/ubuntu/backuppc-merge

DEP8 tests passed locally.

This merge from debian almost became a sync. It still can, but maybe not.

The remaining delta, part of the change to fix http://bugs.debian.org/488660, still has an effect in the package:

Without the delta:
$ l /etc/rc?.d/*backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:26 /etc/rc0.d/K01backuppc -> ../init.d/backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:26 /etc/rc1.d/K01backuppc -> ../init.d/backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:26 /etc/rc2.d/S01backuppc -> ../init.d/backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:26 /etc/rc3.d/S01backuppc -> ../init.d/backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:26 /etc/rc4.d/S01backuppc -> ../init.d/backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:26 /etc/rc5.d/S01backuppc -> ../init.d/backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:26 /etc/rc6.d/K01backuppc -> ../init.d/backuppc

With the delta:
$ l /etc/rc?.d/*backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:28 /etc/rc1.d/K01backuppc -> ../init.d/backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:28 /etc/rc2.d/S01backuppc -> ../init.d/backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:28 /etc/rc3.d/S01backuppc -> ../init.d/backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:28 /etc/rc4.d/S01backuppc -> ../init.d/backuppc
lrwxrwxrwx 1 root root 18 Jun 6 18:28 /etc/rc5.d/S01backuppc -> ../init.d/backuppc

We see that the rc6.d and rc0.d stop links are gone, as intended. How important is that nowadays? I'm not sure. The spec that was referenced in the debian bug is https://wiki.ubuntu.com/Teardown

I could perhaps send an email to ubuntu-devel@ perhaps asking about this.

[Bryce Harrington (bryce)]

These are ancient, pre-upstart even. Are these init scripts even used now, with systemd? If not, then I think you are safe to just drop them. I think a big part of the reason to move to upstart/systemd was to better handle start/stop with more of an event driven architecture.

Even if they are still used in some fashion, my guess is they're not impacting the shutdown time. And, if they do, then I'd wonder if they were doing something important that shouldn't be ignored.

+1 to sync :-)

[Christian Ehrhardt  (paelzer)]

In favor of a sync as well, I'd assume that the generator does not care about the links and still stops it.
But a check would be better, how does a journalctl -b -1 look like?

[Christian Ehrhardt  (paelzer)]

This is a boot & shutdown cycle with backuppc installed.
Hence the delta has no actual effect on systemd systems.

Jun 07 05:11:14 e systemd[1]: Starting LSB: Launch backuppc server...
Jun 07 05:11:14 e backuppc[2800]: * Starting backuppc...
Jun 07 05:11:15 e backuppc[2800]: ...done.
Jun 07 05:11:15 e systemd[1]: Started LSB: Launch backuppc server.
Jun 07 05:12:03 e systemd[1]: Stopping LSB: Launch backuppc server...
Jun 07 05:12:03 e backuppc[3749]: * Stopping backuppc...
Jun 07 05:12:04 e backuppc[3749]: ...done.
Jun 07 05:12:04 e systemd[1]: backuppc.service: Succeeded.
Jun 07 05:12:04 e systemd[1]: Stopped LSB: Launch backuppc server.

With that, strong +1 on making it a sync instead of the proposed merge.

[Andreas Hasenack (ahasenack)]

Thanks for the tests and comments. Sync it is!

[Andreas Hasenack (ahasenack)]

$ syncpackage -r eoan-proposed -V 3.3.2-2 --force backuppc
syncpackage: Source backuppc -> eoan/Proposed: current version 3.3.1-4ubuntu2, new version 3.3.2-2
syncpackage: New changes:
backuppc (3.3.2-2) unstable; urgency=low

  * There are no logs to chown upon a first installation, so don't try to
    chown them. (Fixes issue found by piuparts.)
  * Avoid recursive chown to /etc/backuppc, just chown /etc/backuppc and
    all files in it. By default it has no subdirectories.
  * Update line numbers in debian/config.pl.diff.

 -- Axel Beckert <email address hidden> Wed, 14 Nov 2018 23:27:21 +0100

backuppc (3.3.2-1) unstable; urgency=low

  [ Axel Beckert ]
  * Set Maintainer to the new Debian BackupPC team. (Closes: #887490)
    + Add Tobias Frost and myself to Uploaders.
  * Import new 3.3.2 upstream release.
    + Drop some hunks from 01-debian.patch which upstream applied or fixed
      otherwise:
      - lib/BackupPC/CGI/Browse.pm
      - all hunks which fix "{" to "\{" in regular expressions.
    + Refresh the remaining part of 01-debian.patch and fix non-applying
      hunks manually.
    + Remove unnecessary whitesapce changes from 01-debian.patch.
    + 01-debian.patch: Continue to use UTF-8 in doc/BackupPC.pod despite
      upstream has chose to explicitly declare it as ISO8859-1.
    + Refresh 02-fix-spelling-errors.patch.
  * Ship https://sourceforge.net/p/backuppc/mailman/message/27416276/ as
    debian/jLib.pm and install as BackupPC::jLib. (Closes: #876190)
    Thanks: Martin F Krafft and Alex Vandiver.
  * Run "wrap-and-sort -a".
  * Support IPv6 by extracting the according patch hunks from Ubuntu's
    backuppc package. (Closes: #876233, #610932)
    + Expand patch with web configuration editor support by lynxis
      lazus. (LP: #1349031)
  * Add lintian overrides for these false positives:
    + spelling-error-in-readme-debian (User and group name are the same
      and trigger a "duplicate word" case).
    + unused-debconf-template (mentioned template is used)
  * Fix typo in 3.3.1-4 changelog entry.
  * Add patch to replace the rather unlucky "IS" with "IT support" in mail
    templates. (Closes: #808241)
  * Add patch to fix bad e-mail headers in Polish and Czech mail templates
    as well as the encoding of the Czech mail templates. (Closes: #675013)
    Thanks Vladislav Kurz for the bug report!
  * debian/apache.conf:
    + Switch to Apache 2.4 syntax.
    + Only grant access from localhost by default (as by default HTTPS is
      not enforced). Mention that in NEWS.Debian.
    + Fix typo in comment.
  * Suggest a bunch of letsencrypt clients with certbot as default.
  * Document conf/sorttable.js in debian/copyright.
  * Unconditionally use invoke-rc.d in post{inst,rm}, drop existence check
  * Consistently use debian/<name> instead of debian/backuppc.<name> and
    not half/half.
    + Rename debian/examples directory to debian/example-configs to avoid
      name conflict. Update debian/examples file accordingly.
  * debian/config: Use "set -e" instead of "-e" in the shebang line.
  * debian/post{inst,rm}: Add "set -e" at the beginning.
  * Apply patch to run rrdtool as the backuppc user rather than as the
    www-data us...

Unmerged commits

bca517e... by Andreas Hasenack on 2019-06-06

update-maintainer

a2a40f2... by Andreas Hasenack on 2019-06-06

reconstruct-changelog

d9ff95d... by Andreas Hasenack on 2019-06-06

merge-changelogs

2a36b88... by Andreas Hasenack on 2019-06-05

    - d/t/{control,smb-backup}: simple smb-based DEP8 test (LP: #1677755)
      [Added in 3.3.2-1]

a0fc744... by Andreas Hasenack on 2019-06-05

    - (Inline) apply patch to add support for ipv6. (LP: #54918). Depend and
      Build-Depend on libsocket6-perl for that. (LP: #1515986)
      [Fixed in 3.3.2-1 via 03-ipv6.patch]

de37a4e... by Andreas Hasenack on 2019-06-05

    - d/p/setuid.patch: Fix status page pool graphs by running rddtool as the
      backuppc user. (LP: #1612600)
      [Fixed in 3.3.2-1 via 06-fix-rrd-graph-permissions.patch]

07b72dc... by Andreas Hasenack on 2019-06-06

  * Dropped:
    - debian/rules: installing setuid wrapper with setuid bit set, and no
      permissions granted to other (mode 4750).
      [This is done in postinst, and dh_fixperms undoes it anyway at
      package build time]

c3c042e... by Andreas Hasenack on 2019-06-05

    - debian/backuppc.init: Do not call init script on shutdown and
      reboot (TearDown) (Closes: #488660).
      [Removed the d/rules dh_installinit override, we can rely on the
      LSB header change]

diff --git a/debian/changelog b/debian/changelog
index c5b2b16..d11d8c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+backuppc (3.3.2-2ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/backuppc.init: Do not call init script on shutdown and
+      reboot (TearDown) (Closes: #488660).
+      [Removed the d/rules dh_installinit override, we can rely on the
+      LSB header change]
+  * Dropped:
+    - debian/rules: installing setuid wrapper with setuid bit set, and no
+      permissions granted to other (mode 4750).
+      [This is done in postinst, and dh_fixperms undoes it anyway at
+      package build time]
+    - d/p/setuid.patch: Fix status page pool graphs by running rddtool as the
+      backuppc user.  (LP #1612600)
+      [Fixed in 3.3.2-1 via 06-fix-rrd-graph-permissions.patch]
+    - (Inline) apply patch to add support for ipv6. (LP #54918). Depend and
+      Build-Depend on libsocket6-perl for that. (LP #1515986)
+      [Fixed in 3.3.2-1 via 03-ipv6.patch]
+    - d/t/{control,smb-backup}: simple smb-based DEP8 test (LP #1677755)
+      [Added in 3.3.2-1]
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 06 Jun 2019 18:34:09 +0000
+
 backuppc (3.3.2-2) unstable; urgency=low
 
   * There are no logs to chown upon a first installation, so don't try to
@@ -108,6 +131,34 @@ backuppc (3.3.1-5) unstable; urgency=medium
 
  -- Adrian Bunk <[e-mail]>  Fri, 16 Feb 2018 16:48:37 +0200
 
+backuppc (3.3.1-4ubuntu2) disco; urgency=medium
+
+  * d/t/{control,smb-backup}: simple smb-based DEP8 test (LP: #1677755)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 09 Nov 2018 21:08:22 -0200
+
+backuppc (3.3.1-4ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/backuppc.init, debian/rules: Do not call init script on shutdown
+      and reboot (TearDown) (Closes: #488660).
+    - (Inline) apply patch to add support for ipv6. (LP: #54918). Depend and
+      Build-Depend on libsocket6-perl for that. (LP: #1515986)
+    - debian/rules: installing setuid wrapper with setuid bit set, and no
+      permissions granted to other (mode 4750).
+  * Dropped changes:
+    - Dropping par2 from build-deps. We can b-d on universe packages now.
+    - Versioned dep on libcgi-pm-perl. The last LTS has the version we need.
+    - Escaping braces in Perl regex. Debian added this too.
+    - Depending on default-mta instead of enumerated list. Debian did similar.
+    - Moving config.pl.diff. Makes it hard to stay in sync with Debian and
+      doesn't add any benefit except cleanliness of the path.
+  * debian/patches/setuid.patch:
+    - Fix status page pool graphs by running rddtool as the backuppc user.
+      (LP: #1612600)
+
+ -- Michael Terry <[e-mail]>  Wed, 14 Dec 2016 15:44:17 -0500
+
 backuppc (3.3.1-4) unstable; urgency=low
 
   * Added dependency on libcgi-pm-perl. Closes: #820092
@@ -127,6 +178,43 @@ backuppc (3.3.1-3) unstable; urgency=medium
 
  -- Ludovic Drolez <[e-mail]>  Mon, 23 May 2016 14:11:28 +0200
 
+backuppc (3.3.1-2ubuntu4) yakkety; urgency=medium
+
+  * Make dependency on libcgi-pm-perl a versioned one so that upgrades from
+    14.04 work. (LP: #1610756)
+
+ -- Brian Murray <[e-mail]>  Thu, 15 Sep 2016 12:04:22 -0700
+
+backuppc (3.3.1-2ubuntu3) xenial; urgency=medium
+
+  * Add build dependency on libcgi-pm-perl. LP: #1571278, Closes: 820092
+
+ -- Simon Deziel <[e-mail]>  Sun, 17 Apr 2016 12:23:32 +0000
+
+backuppc (3.3.1-2ubuntu2) xenial; urgency=medium
+
+  * Escape braces in Perl regex. LP: #1570987, Closes: 820110 
+
+ -- Simon Deziel <[e-mail]>  Fri, 15 Apr 2016 17:31:50 +0000
+
+backuppc (3.3.1-2ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/backuppc.init, debian/rules: Do not call init script on shutdown
+      and reboot (TearDown) (Closes: #488660).
+    - debian/control:
+      + Depend on default-mta | mail-transport-agent, instead of enumerating a
+        long list of alternative MTAs.
+      + Drop build dependency to 'par2', it's in universe.
+      + Add build dependency on libsocket6-perl.
+    - configure.pl: Do not test for par2 being available at build time.
+    - (Inline) apply patch to add support for ipv6. (LP: #54918). Depend on
+      libsocket6-perl for that. (LP: #1515986)
+    - debian/rules: installing setuid wrapper with setuid bit set, and no
+      permissions granted to other (mode 4750).
+
+ -- Martin Pitt <[e-mail]>  Tue, 12 Jan 2016 10:18:11 +0100
+
 backuppc (3.3.1-2) unstable; urgency=medium
 
   * Perl 5.22 fix. Closes: #809626
@@ -135,6 +223,21 @@ backuppc (3.3.1-2) unstable; urgency=medium
 
  -- Ludovic Drolez <[e-mail]>  Tue, 05 Jan 2016 20:48:20 +0100
 
+backuppc (3.3.1-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/backuppc.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Closes: #488660).
+    - debian/control:
+      + Depend on default-mta | mail-transport-agent, instead of enumerating a
+        long list of alternative MTAs.
+      + Drop build dependency to 'par2', it's in universe.
+      + Add build dependency on libsocket6-perl.
+    - configure.pl: Do not test for par2 being available at build time.
+  * Depend on libsocket6-perl as well as build-depend.  LP: #1515986
+
+ -- Jackson Doak <[e-mail]>  Sat, 14 Nov 2015 09:38:40 +1100
+
 backuppc (3.3.1-1) unstable; urgency=low
 
   * New upstream release
@@ -143,6 +246,20 @@ backuppc (3.3.1-1) unstable; urgency=low
 
  -- Ludovic Drolez <[e-mail]>  Mon, 10 Aug 2015 18:10:59 +0200
 
+backuppc (3.3.0-2ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/backuppc.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Closes: #488660).
+    - debian/control:
+      + Depend on default-mta | mail-transport-agent, instead of enumerating a
+        long list of alternative MTAs.
+      + Drop build dependency to 'par2', it's in universe.
+      + Add build dependency on libsocket6-perl
+    - configure.pl: Do not test for par2 being available at build time.
+
+ -- Jackson Doak <[e-mail]>  Fri, 22 Aug 2014 06:59:23 +1000
+
 backuppc (3.3.0-2) unstable; urgency=low
 
   * Depends on apache2-utils
@@ -152,6 +269,18 @@ backuppc (3.3.0-2) unstable; urgency=low
 
  -- Ludovic Drolez <[e-mail]>  Thu, 06 Feb 2014 12:41:22 +0100
 
+backuppc (3.3.0-1ubuntu1) trusty-proposed; urgency=low
+
+  * Merge from Debian unstable. Remaining changes: (LP: #1201029)
+    - debian/backuppc.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Closes: #488660).
+    - debian/control:
+      + Remove estraneous libtime-modules-perl (Closes: #734356).
+      + Depend on default-mta | mail-transport-agent, instead of enumerating a
+        long list of alternative MTAs.
+
+ -- Louis Bouchard <[e-mail]>  Wed, 15 Jan 2014 09:33:13 -0600
+
 backuppc (3.3.0-1) unstable; urgency=low
 
   * New upstream release. Closes: #716824
@@ -190,6 +319,30 @@ backuppc (3.2.1-5) unstable; urgency=low
 
  -- Ludovic Drolez <[e-mail]>  Thu, 03 Jan 2013 17:27:35 +0100
 
+backuppc (3.2.1-4ubuntu2) trusty; urgency=medium
+
+  * Specify pod2man encoding.
+
+ -- Dimitri John Ledkov <[e-mail]>  Fri, 20 Dec 2013 02:17:32 +0000
+
+backuppc (3.2.1-4ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/backuppc.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660).
+    - debian/control:
+      + Add dependency for libsocket6-perl.
+      + Drop build dependency to 'par2', it's in universe.
+      + Depend on default-mta | mail-transport-agent, instead of enumerating a
+        long list of alternative MTAs.
+    - configure.pl: Do not test for par2 being available at build time.
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+    - debian/rules: installing setuid wrapper with setuid bit set, and no
+      permissions granted to other (mode 4750).
+
+ -- Logan Rosen <[e-mail]>  Sun, 06 Jan 2013 03:04:32 -0500
+
 backuppc (3.2.1-4) unstable; urgency=low
 
   * init.d status support. Closes: #651539
@@ -197,6 +350,21 @@ backuppc (3.2.1-4) unstable; urgency=low
 
  -- Ludovic Drolez <[e-mail]>  Thu, 20 Dec 2012 17:59:28 +0100
 
+backuppc (3.2.1-3ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Add dependency for libsocket6-perl.
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+    - debian/rules: installing setuid wrapper with setuid bit set, and no
+      permissions granted to other (mode 4750)
+
+ -- Logan Rosen <[e-mail]>  Wed, 14 Nov 2012 13:30:30 -0500
+
 backuppc (3.2.1-3) unstable; urgency=high
 
   * urgency set to high because of a security fix
@@ -207,12 +375,59 @@ backuppc (3.2.1-3) unstable; urgency=high
 
  -- Ludovic Drolez <[e-mail]>  Thu, 31 May 2012 11:51:16 +0200
 
+backuppc (3.2.1-2ubuntu2) quantal; urgency=low
+
+  * SECURITY UPDATE: XSS in CGI/RestoreFile.pm
+    - lib/BackupPC/CGI/RestoreFile.pm: update to escape share and backup
+      number
+    - CVE-2011-5081
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 17 May 2012 15:46:43 -0500
+
+backuppc (3.2.1-2ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing.  Remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Add dependency for libsocket6-perl.
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+    - debian/rules: installing setuid wrapper with setuid bit set, and no
+      permissions granted to other (mode 4750)
+
+ -- Chuck Short <[e-mail]>  Sun, 06 Nov 2011 05:47:04 +0000
+
 backuppc (3.2.1-2) unstable; urgency=high
 
   * Really fix CVE-2011-3361. Closes: #646865
 
  -- Ludovic Drolez <[e-mail]>  Thu, 02 Nov 2011 11:03:38 +0100
 
+backuppc (3.2.1-1ubuntu2) precise; urgency=low
+
+  * SECURITY UPDATE: XSS in CGI/View.pm
+    - lib/BackupPC/CGI/View.pm: update to verify backup number is numeric
+    - CVE-2011-XXXX
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 27 Oct 2011 14:47:58 -0500
+
+backuppc (3.2.1-1ubuntu1) oneiric; urgency=high
+
+  * Merge from debian unstable. (LP: #852484) Remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Add dependency for libsocket6-perl.
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+    - debian/rules: installing setuid wrapper with setuid bit set, and no
+      permissions granted to other (mode 4750)
+
+ -- Allison Randal <[e-mail]>  Sun, 18 Sep 2011 17:37:55 -0700
+
 backuppc (3.2.1-1) unstable; urgency=high
 
   * New upstream release. Closes: #641450
@@ -227,6 +442,21 @@ backuppc (3.2.0-4.1) unstable; urgency=low
 
  -- Bernd Zeimetz <[e-mail]>  Tue, 28 Jun 2011 22:31:10 +0200
 
+backuppc (3.2.0-4ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Add dependency for libsocket6-perl.
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+    - debian/rules: installing setuid wrapper with setuid bit set, and no
+      permissions granted to other (mode 4750)
+
+ -- Allison Randal <[e-mail]>  Wed, 15 Jun 2011 16:28:41 -0700
+
 backuppc (3.2.0-4) unstable; urgency=low
 
   * debian/setuidwrapper.c: New.
@@ -237,6 +467,45 @@ backuppc (3.2.0-4) unstable; urgency=low
 
  -- Ludovic Drolez <[e-mail]>  Sat, 07 May 2011 10:11:56 -0500
 
+backuppc (3.2.0-3ubuntu5) oneiric; urgency=low
+
+  * Replace dependency on perl-suid with a small setuid wrapper, since the
+    perl-suid package been removed in Perl 5.12. (LP: #786250) 
+
+ -- Allison Randal <[e-mail]>  Sun, 29 May 2011 17:49:10 -0700
+
+backuppc (3.2.0-3ubuntu4) natty; urgency=low
+
+  * debian/control: Add dependency for libsocket6-perl. 
+    (LP: #742748) 
+
+ -- Chuck Short <[e-mail]>  Mon, 04 Apr 2011 07:32:43 -0400
+
+backuppc (3.2.0-3ubuntu3) natty; urgency=low
+
+  * Fix FTBFS. 
+
+ -- Chuck Short <[e-mail]>  Mon, 07 Mar 2011 12:31:14 -0500
+
+backuppc (3.2.0-3ubuntu2) natty; urgency=low
+
+  * Applied ipv6-support.dpatch, debian/control:
+    Add support for ipv6. (LP: #54918)
+
+ -- Chuck Short <[e-mail]>  Mon, 07 Mar 2011 11:35:50 -0500
+
+backuppc (3.2.0-3ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable. (LP: #702812) Remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+
+ -- Angel Abad <[e-mail]>  Fri, 14 Jan 2011 11:02:06 +0100
+
 backuppc (3.2.0-3) unstable; urgency=low
 
   * Shell characters are now properly escaped. Closes: #516626
@@ -245,6 +514,18 @@ backuppc (3.2.0-3) unstable; urgency=low
 
  -- Ludovic Drolez <[e-mail]>  Mon, 10 Jan 2011 12:29:07 +0100
 
+backuppc (3.2.0-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable. (LP: #698028) Remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+
+ -- Angel Abad <[e-mail]>  Thu, 06 Jan 2011 10:34:00 +0100
+
 backuppc (3.2.0-2) unstable; urgency=low
 
   * re-added the xfs/rfs pool size patch. Closes: #600654
@@ -252,6 +533,18 @@ backuppc (3.2.0-2) unstable; urgency=low
 
  -- Ludovic Drolez <[e-mail]>  Sun, 02 Jan 2011 19:33:07 +0100
 
+backuppc (3.2.0-1.1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #690073). Remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+
+ -- Angel Abad <[e-mail]>  Tue, 14 Dec 2010 08:54:57 +0100
+
 backuppc (3.2.0-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -259,6 +552,21 @@ backuppc (3.2.0-1.1) unstable; urgency=low
 
  -- Patrick Winnertz <[e-mail]>  Fri, 26 Nov 2010 14:37:21 +0100
 
+backuppc (3.2.0-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable. (LP: #677799) Remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+  * Dropped changes:
+    - Suggest libio-dirent-perl, its in universe (now in main)
+    - debian/control: Add libtime-modules-perl to Depends (applied in Debian)
+
+ -- Angel Abad <[e-mail]>  Sun, 21 Nov 2010 14:59:53 +0100
+
 backuppc (3.2.0-1) unstable; urgency=low
 
   * New upstream release
@@ -272,6 +580,26 @@ backuppc (3.1.0-10) unstable; urgency=low
 
  -- Ludovic Drolez <[e-mail]>  Mon, 12 Apr 2010 20:30:28 +0200
 
+backuppc (3.1.0-9ubuntu2) maverick; urgency=low
+
+  * debian/control: Add libtime-modules-perl to Depends (LP: #525395)
+    Forwarded to Debian as b.d.o/570843
+
+ -- Angel Abad <[e-mail]>  Sun, 21 Feb 2010 20:56:57 +0100
+
+backuppc (3.1.0-9ubuntu1) lucid; urgency=low
+
+  * Resynchronize with debian, remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+    - Suggest libio-dirent-perl, its in universe.
+
+ -- Chuck Short <[e-mail]>  Fri, 18 Dec 2009 10:44:41 -0500
+
 backuppc (3.1.0-9) unstable; urgency=low
 
   * chown/chmod only the needed dirs. Closes: #531948
@@ -286,6 +614,19 @@ backuppc (3.1.0-9) unstable; urgency=low
 
  -- Ludovic Drolez <[e-mail]>  Tue, 24 Nov 2009 10:34:10 +0100
 
+backuppc (3.1.0-8ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+    - Suggest libio-dirent-perl, its in universe.
+
+ -- Chuck Short <[e-mail]>  Fri, 06 Nov 2009 00:30:12 +0000
+
 backuppc (3.1.0-8) unstable; urgency=high
 
   * Really fix the alias bug. Closes: #542218
@@ -301,6 +642,42 @@ backuppc (3.1.0-7) unstable; urgency=high
 
  -- Ludovic Drolez <[e-mail]>  Tue, 01 Sep 2009 14:43:36 +0200
 
+backuppc (3.1.0-6ubuntu4) karmic; urgency=low
+
+  * SECURITY UPDATE: authorization bypass via ClientNameAlias function
+    - debian/patches/security-CVE-2009-3369.dpatch: disable ClientNameAlias
+      usage by normal users in lib/BackupPC/CGI/EditConfig.pm.
+    - CVE-2009-3369 
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 05 Oct 2009 11:40:41 -0400
+
+backuppc (3.1.0-6ubuntu3) karmic; urgency=low
+
+  * Add dpatch system to package.
+    - debian/control: Add build dependency on dpatch.
+    - debian/rules: Add dpatch targets.
+  * Add missing "use Encode" in sendEmail. (LP: #430879)
+  * Fix encoding of special characters in french translation. (LP: #373327)
+
+ -- Michael Jeanson <[e-mail]>  Wed, 16 Sep 2009 18:04:03 -0400
+
+backuppc (3.1.0-6ubuntu2) karmic; urgency=low
+
+  * debian/control: depend on default-mta | mail-transport-agent, instead of
+    enumerating a long list of alternative MTAs.
+
+ -- Steve Langasek <[e-mail]>  Mon, 03 Aug 2009 17:28:07 +0000
+
+backuppc (3.1.0-6ubuntu1) karmic; urgency=low
+
+  * Merge with Debian unstable; remaining Ubuntu changes:
+    - debian/backuppc.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time.
+
+ -- Martin Pitt <[e-mail]>  Tue, 28 Apr 2009 13:26:14 +0200
+
 backuppc (3.1.0-6) unstable; urgency=high
 
   * Fix the permissions of the CGI script. Closes: #518518
diff --git a/debian/control b/debian/control
index be4a396..ad3cce0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: backuppc
 Section: utils
 Priority: optional
-Maintainer: Debian BackupPC Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian BackupPC Team <[e-mail]>
 Uploaders: Tobias Frost <[e-mail]>,
            Axel Beckert <[e-mail]>
 Build-Depends: debhelper (>= 11),
diff --git a/debian/init b/debian/init
index c01621a..096d0ee 100644
--- a/debian/init
+++ b/debian/init
@@ -10,7 +10,7 @@
 # Should-Start:      $local_fs autofs
 # Should-Stop:       $local_fs autofs
 # 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.