← Back to branch summary

~ubuntu-branches/ubuntu/raring/software-center/raring-proposed

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Package Import Robot
  • Author(s): Rodney Dawes
  • Date: 2013-03-20 15:52:01 UTC
  • mfrom: (204.1.2)
  • Revision ID: package-import@ubuntu.com-20130320155201-kobcps25j00suh4e
Tags: 5.5.6-0ubuntu1
https://launchpad.net/bugs/1076189
https://launchpad.net/bugs/1081691
https://launchpad.net/bugs/1153548
* New upstream release.
  - Remove "foo" tooltip from account login/creation dialogs. (LP: #1076189)
  - Add new icons from design team. (LP: #1081691)
  - Remove extra .desktop file that we don't need. (LP: #1153548)
* debian/rules:
  - Remove complicated unbranding rule.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
24
24
from DistUtilsExtra.auto import setup
25
25
 
26
26
# The VERSION of software-center
27
 
VERSION = '5.5.5'
 
27
VERSION = '5.5.6'
28
28
 
29
 
# double check that we have the latest distro series and fail if not
 
29
# Get the distribution information for various functions.
30
30
(distro, release, codename) = platform.dist()
31
 
if distro == "Ubuntu":
32
 
    import softwarecenter.distro.ubuntu
33
 
    if not codename in softwarecenter.distro.ubuntu.Ubuntu.DISTROSERIES:
34
 
            raise ValueError("Could not find '%s' in ubuntu distro class "
35
 
                             "please add it to DISTROSERIES", codename)
36
31
 
37
32
 
38
33
def merge_authors_into_about_dialog():
62
57
DISTRO = '%s'
63
58
RELEASE = '%s'
64
59
""" % (VERSION, codename, distro, release))
 
60
    # double check that we have the latest distro series and fail if not
 
61
    if distro == "Ubuntu":
 
62
        import softwarecenter.distro.ubuntu
 
63
        if not codename in softwarecenter.distro.ubuntu.Ubuntu.DISTROSERIES:
 
64
            raise ValueError("Could not find '%s' in ubuntu distro class "
 
65
                             "please add it to DISTROSERIES", codename)
65
66
 
66
67
 
67
68
# update po4a