Merge lp:~allison/ubuntu/oneiric/backuppc/merge-debian-inetutils into lp:ubuntu/oneiric/backuppc

[Allison Randal]

Merged backuppc from Debian unstable 3.2.0-4.1.

Unmerged revisions

34. By Allison Randal on 2011-08-02

* 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)
* Non-maintainer upload.
* Use inetutils-ping as an alternative to iputils-ping. Closes: #630777

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-15 16:28:41 +0000
+++ debian/changelog	2011-08-02 19:11:31 +0000
@@ -1,3 +1,25 @@
+backuppc (3.2.0-4.1ubuntu1) 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]>  Tue, 02 Aug 2011 11:51:02 -0700
+
+backuppc (3.2.0-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use inetutils-ping as an alternative to iputils-ping. Closes: #630777
+
+ -- 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:

=== modified file 'debian/control'
--- debian/control	2011-06-15 16:28:41 +0000
+++ debian/control	2011-08-02 19:11:31 +0000
@@ -8,7 +8,7 @@
 
 Package: backuppc
 Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>=1.8.3), apache2 | httpd, ${misc:Depends}, smbclient, samba-common-bin, bzip2, default-mta | mail-transport-agent, iputils-ping, ucf, libtime-modules-perl, libwww-perl, libsocket6-perl
+Depends: ${shlibs:Depends}, ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>=1.8.3), apache2 | httpd, ${misc:Depends}, smbclient, samba-common-bin, bzip2, default-mta | mail-transport-agent, iputils-ping | inetutils-ping, ucf, libtime-modules-perl, libwww-perl, libsocket6-perl
 Recommends: rsync, libfile-rsyncp-perl (>= 0.68), openssh-client | ssh-client, rrdtool, libio-dirent-perl
 Suggests: w3m | www-browser, par2
 Conflicts: libfile-rsyncp-perl (<< 0.68)