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

Proposed by dobey on 2013-03-13
Status: Merged
Approved by: dobey on 2013-03-13
Approved revision: 2
Merged at revision: 2
Proposed branch: lp:~dobey/software-center/pkg-no-unbranded
Merge into: lp:software-center/packaging-dailies
Diff against target: 31 lines (+0/-18)
1 file modified
rules (+0/-18)
To merge this branch: bzr merge lp:~dobey/software-center/pkg-no-unbranded
Reviewer Review Type Date Requested Status
Mike McCracken (community) 2013-03-13 Approve on 2013-03-13
Review via email: mp+153233@code.launchpad.net

Commit message

Remove the extra bits for unbranded version, as it's not needed.

To post a comment you must log in.
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 'rules'
2--- rules 2013-02-26 21:27:25 +0000
3+++ rules 2013-03-13 19:51:20 +0000
4@@ -16,28 +16,10 @@
5
6 override_dh_install:
7 dh_install --fail-missing
8-
9 dh_installmime -i
10-
11 dh_link $(share)/software-center usr/bin/software-center \
12 $(share)/update-software-center usr/sbin/update-software-center
13
14- # Drop Ubuntu stuff if not on Ubuntu
15- # TODO: We should do this on the 'upstream' level, e.g. in setup.py.
16- set -e; if ! dpkg-vendor --derives-from Ubuntu; then \
17- cd debian/software-center; \
18- cd usr/share/applications; \
19- mv ubuntu-software-center.desktop software-center.desktop; \
20- cd ../icons/; \
21- rm hicolor/*/apps/softwarecenter.*; \
22- for size in 16x16 24x24 32x32; do \
23- ln -sf ../../../gnome/$$size/apps/system-software-install.png \
24- hicolor/$$size/apps/softwarecenter.png; \
25- done; \
26- ln -sf ../../../gnome/scalable/apps/system-software-install.svg \
27- hicolor/scalable/apps/softwarecenter.svg; \
28- fi;
29-
30 # Remove empty directories.
31 find debian/*/usr -type d -empty -delete
32

Subscribers

People subscribed via source and target branches