[SCM] supercollider/master: Declare more installs in *.install files (not rules file).

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7779c20656cf4396c4e565c5fa6f3969186ed8b0
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Feb 8 00:51:41 2012 +0100

    Declare more installs in *.install files (not rules file).

diff --git a/debian/rules b/debian/rules
index 04d18ea..8f4b7f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,15 +58,5 @@ common-install-impl::
 	# fixing some executables in class library and docs for happier lintian
 	find $(DEB_DESTDIR)/usr/share/SuperCollider -type d -exec chmod 755 {} \;; \
 	find $(DEB_DESTDIR)/usr/share/SuperCollider -type f -exec chmod 644 {} \;; \
-	# vim-addon-manager stuff
-	install -d $(DEB_DESTDIR)/usr/share/vim/registry
-	install -m 644 debian/supercollider-vim.yaml $(DEB_DESTDIR)/usr/share/vim/registry
-	# lintian overrides
-	install -m 644 debian/README.extensions $(DEB_DESTDIR)/usr/share/SuperCollider/Extensions/README
-	# icons and metadata for freedesktop-style menu entries
-	install -d $(DEB_DESTDIR)/usr/share/applications
-	install -m 644 debian/*.desktop $(DEB_DESTDIR)/usr/share/applications
-	install -d $(DEB_DESTDIR)/usr/share/pixmaps
-	install -m 644 linux/icons/supercollider.xpm $(DEB_DESTDIR)/usr/share/pixmaps
-	install -m 644 linux/icons/supercollider.png $(DEB_DESTDIR)/usr/share/pixmaps
 
+	install -m 644 debian/README.extensions $(DEB_DESTDIR)/usr/share/SuperCollider/Extensions/README
diff --git a/debian/supercollider-common.install b/debian/supercollider-common.install
index 0600b46..399e386 100644
--- a/debian/supercollider-common.install
+++ b/debian/supercollider-common.install
@@ -1,3 +1,2 @@
 usr/share/SuperCollider/SCClassLibrary
-usr/share/pixmaps/supercollider.xpm
-usr/share/pixmaps/supercollider.png
+linux/icons/* usr/share/pixmaps/
diff --git a/debian/supercollider-emacs.install b/debian/supercollider-emacs.install
index e526b56..2b00e27 100644
--- a/debian/supercollider-emacs.install
+++ b/debian/supercollider-emacs.install
@@ -1,3 +1,3 @@
 usr/share/emacs
 usr/share/SuperCollider/Extensions/scide_scel
-usr/share/applications/scel.desktop
+debian/scel.desktop usr/share/applications/
diff --git a/debian/supercollider-vim.install b/debian/supercollider-vim.install
index 395186a..6f984a1 100644
--- a/debian/supercollider-vim.install
+++ b/debian/supercollider-vim.install
@@ -4,5 +4,5 @@ usr/bin/scvim_make_help
 usr/share/vim
 usr/share/scvim
 usr/share/SuperCollider/Extensions/scvim
-usr/share/vim/registry
-usr/share/applications/scvim.desktop
+debian/supercollider-vim.yaml usr/share/vim/registry/
+debian/scvim.desktop usr/share/applications/

-- 
supercollider packaging