Merge lp:~fboucault/unity-2d/dont_ship_place_icons into lp:unity-2d/3.0

Proposed by Florian Boucault
Status: Merged
Approved by: Ugo Riboni
Approved revision: 438
Merged at revision: 444
Proposed branch: lp:~fboucault/unity-2d/dont_ship_place_icons
Merge into: lp:unity-2d/3.0
Diff against target: 33 lines (+0/-12)
2 files modified
debian/unity-2d-launcher.install (+0/-6)
launcher/CMakeLists.txt (+0/-6)
To merge this branch: bzr merge lp:~fboucault/unity-2d/dont_ship_place_icons
Reviewer Review Type Date Requested Status
Ugo Riboni (community) Approve
Review via email: mp+52861@code.launchpad.net

Description of the change

[launcher] Stop shipping applications and files place icons as they are now part of their respective packages.

To post a comment you must log in.
Revision history for this message
Ugo Riboni (uriboni) wrote :

Works as advertised after upgrading to latest Natty

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/unity-2d-launcher.install'
2--- debian/unity-2d-launcher.install 2011-01-18 15:23:53 +0000
3+++ debian/unity-2d-launcher.install 2011-03-10 15:04:46 +0000
4@@ -8,9 +8,3 @@
5 usr/lib/qt4/imports/UnityApplications/libUnityApplications.so.1.0.0
6 usr/lib/qt4/imports/UnityApplications/qmldir
7 usr/lib/qt4/imports/UnityApplications/libUnityApplications.so
8-
9-# Install places artwork to work around bug #672447 in Unity.
10-# See https://launchpad.net/bugs/672450.
11-usr/share/unity-2d/applications.png
12-usr/share/unity-2d/files.png
13-
14
15=== modified file 'launcher/CMakeLists.txt'
16--- launcher/CMakeLists.txt 2011-02-11 15:41:43 +0000
17+++ launcher/CMakeLists.txt 2011-03-10 15:04:46 +0000
18@@ -18,10 +18,4 @@
19
20 install(DIRECTORY artwork
21 DESTINATION ${UNITY_2D_DIR}/launcher
22- PATTERN "artwork/applications.png" EXCLUDE
23- PATTERN "artwork/files.png" EXCLUDE
24- )
25-
26-install(FILES artwork/applications.png artwork/files.png
27- DESTINATION ${UNITY_2D_DIR}
28 )
29
30=== removed file 'launcher/artwork/applications.png'
31Binary files launcher/artwork/applications.png 2010-11-08 10:20:10 +0000 and launcher/artwork/applications.png 1970-01-01 00:00:00 +0000 differ
32=== removed file 'launcher/artwork/files.png'
33Binary files launcher/artwork/files.png 2010-11-08 10:20:10 +0000 and launcher/artwork/files.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches