lp:ubuntu/precise/aptitude
- Get this branch:
- bzr branch lp:ubuntu/precise/aptitude
Branch merges
Branch information
- Owner:
- Ubuntu branches
- Status:
- Mature
Recent revisions
- 71. By Micah Gersten
-
* Merge from debian unstable. (LP: #933259) Remaining changes:
- debian/05aptitude: never autoremove kernels
- drop aptitude-doc to Suggests
- 03_branding.dpatch: ubuntu branding
- 04_changelog.dpatch: take changelogs from changelogs. ubuntu. com
- 09_ubuntu_fortify_ source. dpatch: Suppress a number of warnings (turned
into errors by -Werror) triggered by Ubuntu's default of
-D_FORTIFY_ SOURCE= 2.
- 11_ubuntu_uses_sudo. dpatch: fix status line of 'Become root' menu entry
to not refer to su.
- 12_point_manpage_ to_doc_ package. dpatch: point Finnish manpage to the
correct place for further info
- 14_html2text_preferred. dpatch: switch back to html2text in favor of
elinks, since html2text is in main and elinks isn't.
- 15_ftbfs_new_apt
- no-google-mock patch: don't use google-mock as it and libgtest-dev are in
universe* Refresh no-google-mock patch for build system changes
- update debian/patches/ no-google- mock
* Actually drop 01_intltool_update patch as it's a 60k line diff we don't
need as we don't have any po diffs anymore
- update debian/patches/ series
- remove debian/patches/ 01_intltool_ update - 66. By Michael Vogt
-
* Merge from debian unstable. Remaining changes:
- debian/05aptitude: never autoremove kernels
- drop aptitude-doc to Suggests
- 03_branding.dpatch: ubuntu branding
- 04_changelog.dpatch: take changelogs from changelogs. ubuntu. com
- 09_ubuntu_fortify_ source. dpatch: Suppress a number of warnings (turned
into errors by -Werror) triggered by Ubuntu's default of
-D_FORTIFY_ SOURCE= 2.
- 11_ubuntu_uses_sudo. dpatch: fix status line of 'Become root' menu entry
to not refer to su.
- 12_point_manpage_ to_doc_ package. dpatch: point Finnish manpage to the
correct place for further info
- 14_html2text_preferred. dpatch: switch back to html2text in favor of
elinks, since html2text is in main and elinks isn't.
* dropped 01_intltool_update. dpatch
* updated 15_ftbfs_new_apt - 65. By Michael Vogt
-
* Merge from debian unstable. Remaining changes:
- debian/05aptitude: never autoremove kernels
- drop aptitude-doc to Suggests
- 01_intltool_update. dpatch: run intltool-update against the source
directory, so that irrelevant cosmetic .po file changes don't end up
tangled in other patches.
- 03_branding.dpatch: ubuntu branding
- 04_changelog.dpatch: take changelogs from changelogs. ubuntu. com
- 09_ubuntu_fortify_ source. dpatch: Suppress a number of warnings (turned
into errors by -Werror) triggered by Ubuntu's default of
-D_FORTIFY_ SOURCE= 2.
- 11_ubuntu_uses_sudo. dpatch: fix status line of 'Become root' menu entry
to not refer to su.
- 12_point_manpage_ to_doc_ package. dpatch: point Finnish manpage to the
correct place for further info
- debian/rules: build with --disable-werror
- 14_html2text_preferred. dpatch: switch back to html2text in favor of
elinks, since html2text is in main and elinks isn't.
* dropped:
- 13_screensize.dpatch: applied upstream
- 15_ftbfs_new_apt. dpatch: applied upstream
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/quantal/aptitude