← Back to branch summary

~kelemeng/software-center/bug625859

Viewing all changes in revision 46.

  • Committer: Bazaar Package Importer
  • Author(s): Julian Andres Klode
  • Date: 2010-04-29 18:40:59 UTC
  • Revision ID: james.westby@ubuntu.com-20100429184059-9qiw6qoe10xgp1k5
Tags: 2.0.3debian1
http://bugs.debian.org/579534
http://bugs.debian.org/573776
* Merge from Ubuntu lucid branch.
* debian/control:
  - Only conflict with gnome-app-install versions << 1 (Closes: #579534).
* softwarecenter/view/catview.py:
  - Use "Software Center" instead of "Ubuntu Software Center" on non-Ubuntu.
* debian/rules:
  - Do not use "Debian Software Center", but "Software Center"; and replace
    "for Debian" with "for your system" (Closes: #573776)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: