~juliank/software-center/debian-next

Viewing all changes in revision 468.

  • Committer: Julian Andres Klode
  • Date: 2010-08-02 15:20:09 UTC
  • mfrom: (429.62.230 trunk)
  • Revision ID: jak@debian.org-20100802152009-r5s64zd6rb43g7pa
* Merge with Ubuntu's 2.1 series (2.1.7 + bzr), remaining differences:
  - po/cs.po: Updated.
  - softwarecenter/app.py: Remove views menu when not on Ubuntu.
  - setup.py: Support + and - in version numbers.
  - setup.py, setup.cfg: Use unbranded stuff.
  - debian/control:
    - Update Standards-Version
    - Change Vcs-Bzr, Maintainer to Debian.
    - Do not depend on humanity-icon-theme, but gnome-icon-theme.
    - Remove Ubuntu from package description-
  - debian/rules:
    - Drop the old hack for handling non-Ubuntu systems.
    - Run build_i18n in clean.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: