Merge lp:~ubuntu-branches/ubuntu/oneiric/backuppc/oneiric-201106162221 into lp:ubuntu/oneiric/backuppc
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp:~ubuntu-branches/ubuntu/oneiric/backuppc/oneiric-201106162221 |
| Merge into: | lp:ubuntu/oneiric/backuppc |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/oneiric/backuppc/oneiric-201106162221 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/backuppc now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/backuppc/oneiric-201106162221. A merge should be performed if necessary.
Unmerged revisions
- 33. By Allison Randal
-
* 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)
* debian/setuidwrapper. c: New.
* debian/rules: Build setuidwrapper as cgi-bin/index.cgi; install real
index.cgi as lib/realindex.cgi. Closes: #581950.
* control: Remove depends on perl-suid. Change to Architecture any, add
${shlibs:Depends} .
