Ubuntu Software Center

Merge lp:~dobey/software-center/no-unbranded into lp:software-center

  1. no-unbranded
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 3297
Merged at revision: 3298
Proposed branch: lp:~dobey/software-center/no-unbranded
Merge into: lp:software-center
Diff against target: 64 lines (+2/-20)
5 files modified
.bzrignore (+2/-0)
data/unbranded-software-center.desktop.in (+0/-13)
po/POTFILES.in (+0/-1)
setup.cfg (+0/-1)
softwarecenter/version.py (+0/-5)
To merge this branch: bzr merge lp:~dobey/software-center/no-unbranded
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Roberto Alsina Approve
Review via email: mp+153231@code.launchpad.net

Commit message

Remove the unbranded .desktop file, to avoid unnecessary duplication.
Remove the softwarecenter/version.py and ignore it, to avoid useless conflicts.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) wrote :

Looks good to me.

review: Approve
Revision history for this message
Mike McCracken (mikemc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-07-06 13:38:50 +0000
3+++ .bzrignore 2013-03-13 19:41:21 +0000
4@@ -1,4 +1,5 @@
5 build/
6+softwarecenter/version.py
7 tests/.coverage
8 tests/coverage_html
9 tests/coverage_summary
10@@ -6,3 +7,4 @@
11 help/*
12 data/xapian/*
13 .backup
14+
15
16=== removed file 'data/unbranded-software-center.desktop.in'
17--- data/unbranded-software-center.desktop.in 2012-04-09 12:57:56 +0000
18+++ data/unbranded-software-center.desktop.in 1970-01-01 00:00:00 +0000
19@@ -1,13 +0,0 @@
20-[Desktop Entry]
21-_Name=Software Center
22-_GenericName=Software Center
23-_Comment=Lets you choose from thousands of applications available for your system
24-Exec=/usr/bin/software-center %u
25-Icon=softwarecenter
26-Terminal=false
27-Type=Application
28-Categories=PackageManager;GTK;System;Settings;
29-MimeType=application/x-deb;application/x-debian-package;x-scheme-handler/apt;
30-StartupNotify=true
31-X-Ubuntu-Gettext-Domain=software-center
32-_Keywords=Sources;PPA;Install;Uninstall;Remove;Purchase;Catalogue;Store;
33
34=== modified file 'po/POTFILES.in'
35--- po/POTFILES.in 2012-09-18 06:58:04 +0000
36+++ po/POTFILES.in 2013-03-13 19:41:21 +0000
37@@ -2,7 +2,6 @@
38 software-center
39 utils/update-software-center
40 data/ubuntu-software-center.desktop.in
41-data/unbranded-software-center.desktop.in
42 [type: gettext/xml] data/featured.menu.in
43 [type: gettext/xml] data/whats_new.menu.in
44 [type: gettext/xml] data/software-center.menu.in
45
46=== modified file 'setup.cfg'
47--- setup.cfg 2012-09-18 04:43:14 +0000
48+++ setup.cfg 2013-03-13 19:41:21 +0000
49@@ -21,5 +21,4 @@
50 ),
51 ]
52 schemas_files=[]
53-#bug_contact="Michael Vogt <mvo@ubuntu.com>"
54
55
56=== removed file 'softwarecenter/version.py'
57--- softwarecenter/version.py 2012-08-21 13:17:13 +0000
58+++ softwarecenter/version.py 1970-01-01 00:00:00 +0000
59@@ -1,5 +0,0 @@
60-
61-VERSION = '5.3.7'
62-CODENAME = 'UNRELEASED'
63-DISTRO = 'Ubuntu'
64-RELEASE = '12.10'

Subscribers

People subscribed via source and target branches