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

[Florian Boucault]

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

[Ugo Riboni (uriboni)]

Works as advertised after upgrading to latest Natty

review: Approve

=== modified file 'debian/unity-2d-launcher.install'
--- debian/unity-2d-launcher.install	2011-01-18 15:23:53 +0000
+++ debian/unity-2d-launcher.install	2011-03-10 15:04:46 +0000
@@ -8,9 +8,3 @@
 usr/lib/qt4/imports/UnityApplications/libUnityApplications.so.1.0.0
 usr/lib/qt4/imports/UnityApplications/qmldir
 usr/lib/qt4/imports/UnityApplications/libUnityApplications.so
-
-# Install places artwork to work around bug #672447 in Unity.
-# See https://launchpad.net/bugs/672450.
-usr/share/unity-2d/applications.png
-usr/share/unity-2d/files.png
-
 
=== modified file 'launcher/CMakeLists.txt'
--- launcher/CMakeLists.txt	2011-02-11 15:41:43 +0000
+++ launcher/CMakeLists.txt	2011-03-10 15:04:46 +0000
@@ -18,10 +18,4 @@
 
 install(DIRECTORY artwork
     DESTINATION ${UNITY_2D_DIR}/launcher
-    PATTERN "artwork/applications.png" EXCLUDE
-    PATTERN "artwork/files.png" EXCLUDE
-    )
-
-install(FILES artwork/applications.png artwork/files.png
-    DESTINATION ${UNITY_2D_DIR}
     )
 
=== removed file 'launcher/artwork/applications.png'
 Binary 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
=== removed file 'launcher/artwork/files.png'
 Binary 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