[SCM] VLC media player packaging branch, sid, updated. debian/1.0.5-1-6-gd74e689

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit d74e689ccc005c25f39743551b0cdd9c5996b79b
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Feb 28 00:10:05 2010 +0100

    Install icons in all available sizes (LP: #521744).

diff --git a/debian/rules b/debian/rules
index 11422b3..ab1e012 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,7 +119,6 @@ endif
 
 # A few shortcuts
 VIDDIR := usr/share/vlc
-PIXDIR := usr/share/pixmaps
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
@@ -188,9 +187,17 @@ install: build
 	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
 	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
 	rm -rf debian/tmp/usr/share/man/man1
-	# Move stuff around
-	mkdir -p debian/tmp/$(PIXDIR)
-	mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/$(PIXDIR)/vlc.png
+	# Move icons around
+	mkdir -p debian/tmp/usr/share/icons/hicolor/16x16/apps
+	mv debian/tmp/$(VIDDIR)/vlc16x16.png debian/tmp/usr/share/icons/hicolor/16x16/apps/vlc.png
+	mkdir -p debian/tmp/usr/share/icons/hicolor/32x32/apps
+	mv debian/tmp/$(VIDDIR)/vlc32x32.png debian/tmp/usr/share/icons/hicolor/32x32/apps/vlc.png
+	mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps
+	mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/usr/share/icons/hicolor/48x48/apps/vlc.png
+	mv debian/tmp/$(VIDDIR)/vlc48x48-christmas.png debian/tmp/usr/share/icons/hicolor/48x48/apps/vlc-christmas.png
+	mkdir -p debian/tmp/usr/share/icons/hicolor/128x128/apps
+	mv debian/tmp/$(VIDDIR)/vlc128x128.png debian/tmp/usr/share/icons/hicolor/128x128/apps/vlc.png
+	mv debian/tmp/$(VIDDIR)/vlc128x128-christmas.png debian/tmp/usr/share/icons/hicolor/128x128/apps/vlc-christmas.png
 	mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
 	# Install stuff
 	dh_install -si --fail-missing --sourcedir=debian/tmp
@@ -204,8 +211,6 @@ install: build
 	    mkdir -p  debian/$${pkg}/usr/share/bug/$${pkg}; \
 	    cp debian/bug/* debian/$${pkg}/usr/share/bug/$${pkg}; \
 	done
-	# Clean up
-	rm -f debian/vlc/$(VIDDIR)/*.png
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	# Check that we did not install a plugin linked with libX11 in vlc-nox
 	BORKED=no; \
diff --git a/debian/vlc-data.install b/debian/vlc-data.install
index 1dc62a6..9689906 100644
--- a/debian/vlc-data.install
+++ b/debian/vlc-data.install
@@ -1,4 +1,4 @@
 usr/share/doc
 usr/share/locale
 usr/share/vlc
-usr/share/pixmaps
+usr/share/icons

-- 
VLC media player packaging