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

[dobey]

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

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'rules'
--- rules	2013-02-26 21:27:25 +0000
+++ rules	2013-03-13 19:51:20 +0000
@@ -16,28 +16,10 @@
 
 override_dh_install:
 	dh_install --fail-missing
-
 	dh_installmime -i
-
 	dh_link $(share)/software-center usr/bin/software-center \
 	        $(share)/update-software-center usr/sbin/update-software-center
 
-	# Drop Ubuntu stuff if not on Ubuntu
-	# TODO: We should do this on the 'upstream' level, e.g. in setup.py.
-	set -e; if ! dpkg-vendor --derives-from Ubuntu; then \
-		cd debian/software-center; \
-		cd usr/share/applications; \
-		mv ubuntu-software-center.desktop software-center.desktop; \
-		cd ../icons/; \
-		rm hicolor/*/apps/softwarecenter.*; \
-		for size in 16x16 24x24 32x32; do \
-			ln -sf ../../../gnome/$$size/apps/system-software-install.png \
-			       hicolor/$$size/apps/softwarecenter.png; \
-		done; \
-		ln -sf ../../../gnome/scalable/apps/system-software-install.svg \
-		       hicolor/scalable/apps/softwarecenter.svg; \
-	fi;
-
 	# Remove empty directories.
 	find debian/*/usr -type d -empty -delete