Merge lp:~ubuntu-branches/ubuntu/lucid/acct/lucid-201002130031 into lp:ubuntu/lucid/acct
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/lucid/acct/lucid-201002130031 |
| Merge into: | lp:ubuntu/lucid/acct |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/lucid/acct/lucid-201002130031 |
| Related bugs: |
| James Westby (james-w) wrote | # |
Unmerged revisions
- 14. By Martin Pitt
-
* Merge from Debian testing, remaining changes: (LP: #510177)
- Remove stop links from rc0 and rc6.
* New maintainer (Closes: #543825)
* New upstream release.
- Drop patch 02-manpage.patch, applied upstream.
- Drop patch 03-acct-file.patch. applied upstream.
- Drop patch 04-lastcomm-forwards. patch, applied upstream.
- Drop changes to accounting.info from 01-last.patch, file is rebuilt.
* Updated dump-acct.8 manpage (Closes: #401597)
* Sync strict-match documentation with reality (Closes: #401904)
* Add format, byteswap and ahz swiches to dump-acct manpage (Closes: #401597)
* Re-adding watch file.
* Fixed minor errors in manpages: PD macros.
* Fixed minor typo in lastcomm manpage.
* Use invoke-rc.d in daily crontab.
* Fixed depends for triggerized install-info directory building.
* Set doc-base section to System/Security.
* Added README.source
* Updated copyright to reflect licence and new upstream maintainer.
* Added dircategory and direntry entries in texinfo source.
* Install all files individually from debian/tmp using acct.install.
* Don't split HTML documentation in multiple files.
* Conversion to keep packaging in Bzr source control.
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/acct now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/acct/lucid-201002130031. A merge should be performed if necessary.