[Pkg-cli-apps-commits] [SCM] tangerine branch, master, updated. upstream/0.3.2.1-31-g0653f04

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 0653f04c79678a8ebd04ce04c59a2c941db95865
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Tue Aug 18 00:38:48 2009 +0800

    Remove /etc/xdg/autostart/tangerine.desktop since it starts tangerine-properties when logging in, which is undesirable

diff --git a/debian/changelog b/debian/changelog
index ff5dc4e..0081e0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ tangerine (0.3.2.2-1) UNRELEASED; urgency=low
     + Add dh_{,cli}strip overrides to strip into tangerine-dbg
     + Remove /usr/share/doc/tangerine/sample.conf since it's handled by
       dh_installexamples
+    + Remove /etc/xdg/autostart/tangerine.desktop since it starts
+      tangerine-properties when logging in, which is undesirable
   * debian/compat:
     + Bump to 7
   * debian/copyright:
diff --git a/debian/rules b/debian/rules
index 92da701..62e6ecd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,10 +35,14 @@ override_dh_clistrip:
 # disable dh_makeshlibs (problems with /usr/lib/tangerine/*.so*)
 override_dh_makeshlibs:
 
-# delete sample.conf (handled by dh_installexamples)
+# delete sample.conf (handled by dh_installexamples) and tangerine.desktop in
+# autostart (supposed to have been removed), annoyingly starts
+# tangerine-properties when logging in
 override_dh_auto_install:
 	dh_auto_install -- DESTDIR="$(CURDIR)/debian/tangerine"
-	rm debian/tangerine/usr/share/doc/tangerine/sample.conf
+	rm \
+		debian/tangerine/usr/share/doc/tangerine/sample.conf
+		debian/tangerine/etc/xdg/autostart/tangerine.desktop
 
 %:
 	dh --with=quilt $@

-- 
tangerine