[SCM] terminatorx/master: Remove scrollkeeper stuff, install the desktop file to /usr/share/applications/.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ac57e1b8ca99fb88ce1e31c738208e8cbbd95393
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Apr 2 01:45:52 2012 +0200

    Remove scrollkeeper stuff, install the desktop file to /usr/share/applications/.

diff --git a/debian/control b/debian/control
index d942dcb..daa7f5c 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,6 @@ Architecture: any
 Depends:
  ladspa-sdk,
  mpg321,
- scrollkeeper,
  sox,
  vorbis-tools,
  ${misc:Depends},
diff --git a/debian/postinst b/debian/postinst
index 5a3fe72..5bd4240 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,10 +12,6 @@ test -e /usr/share/debconf/confmodule && {
 
 umask 022
 
-if [ "$action" = "configure" ]; then
-    scrollkeeper-update -q
-fi
-
 db_get terminatorx/suid_bin
 suid="$RET"
 
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index 52dd8f5..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
-    scrollkeeper-update -q
-fi
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index a88bb2f..7c83cc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,5 +36,11 @@ override_dh_auto_install:
 	(cd gnome-support && \
 	 cp terminatorX-app.xpm $(CURDIR)/debian/terminatorx/usr/share/pixmaps)
 
+override_dh_install:
+	dh_install
+	mv debian/terminatorx/usr/share/gnome/apps/Multimedia/terminatorX.desktop \
+		debian/terminatorx/usr/share/applications/
+	find debian/terminatorx -type d -empty -delete
+
 override_dh_installman:
 	dh_installman terminatorX.1

-- 
terminatorx packaging