[Pkg-cli-apps-commits] [SCM] tangerine branch, ppa/jaunty, updated. upstream/0.3.2.2-44-g16f75ca

[Chow Loong Jin]

The following commit has been merged in the ppa/jaunty branch:
commit 16f75ca880f1cfe64083da4ffe48ce4536685b7d
Merge: 0cd1e35a677d674337f97b50a0fad02750ad0bb4 d3e53b1a72987a230518d74fb053e88a0d97b02f
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Tue Aug 18 01:58:39 2009 +0800

    Merge branch 'ppa/karmic' into ppa/jaunty
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 32749c3,d6f03de..931308f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,27 @@@
++tangerine (0.3.2.2-0ubuntu1~hyper3~jaunty) jaunty; urgency=low
++
++  * Merge from Karmic PPA, remaining changes:
++    + debian/control, debian/rules: Use old mono-devel and /usr/bin/csc
++      since Jaunty doesn't have mono-csc
++
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 18 Aug 2009 01:58:14 +0800
++
+ tangerine (0.3.2.2-0ubuntu1~hyper3~karmic) karmic; urgency=low
+ 
+   * debian/rules:
+     + Don't remove /etc/xdg/autostart/tangerine.desktop (it doesn't exist,
+       was an artifact from previous testing packages
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 18 Aug 2009 01:56:09 +0800
+ 
 +tangerine (0.3.2.2-0ubuntu1~hyper2~jaunty) jaunty; urgency=low
 +
 +  * Merge from Karmic PPA, remaining changes:
 +    + debian/control, debian/rules: Use old mono-devel and /usr/bin/csc
 +      since Jaunty doesn't have mono-csc
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 18 Aug 2009 01:12:16 +0800
 +
  tangerine (0.3.2.2-0ubuntu1~hyper2~karmic) karmic; urgency=low
  
    * debian/rules:
@@@ -18,14 -18,7 +34,14 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 18 Aug 2009 00:41:02 +0800
  
 -tangerine (0.3.2.2-0ubuntu1~hyper1~karmic) karmic; urgency=low
 +tangerine (0.3.2.2-0ubuntu1~hyper1~jaunty1) jaunty; urgency=low
 +
 +  * debian/control, debian/rules:
 +    + Go back to using /usr/bin/csc since Jaunty does not have it
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 17 Aug 2009 11:18:27 +0800
 +
 +tangerine (0.3.2.2-0ubuntu1~hyper1~jaunty) jaunty; urgency=low
  
    [ Jo Shields ]
    * debian/patches/06_no_amarok.patch,
diff --combined debian/rules
index e74c0ab,92da701..f4e7969
--- a/debian/rules
+++ b/debian/rules
@@@ -20,7 -20,7 +20,7 @@@ get-orig-source
  
  override_dh_auto_configure:
  	dh_auto_configure -- \
 -		MCS=/usr/bin/mono-csc \
 +		MCS=/usr/bin/csc \
  		--enable-debug \
  		--enable-banshee \
  		--enable-beagle \
@@@ -35,14 -35,10 +35,10 @@@ override_dh_clistrip
  # disable dh_makeshlibs (problems with /usr/lib/tangerine/*.so*)
  override_dh_makeshlibs:
  
- # delete sample.conf (handled by dh_installexamples) and tangerine.desktop in
- # autostart (supposed to have been removed), annoyingly starts
- # tangerine-properties when logging in
+ # delete sample.conf (handled by dh_installexamples)
  override_dh_auto_install:
  	dh_auto_install -- DESTDIR="$(CURDIR)/debian/tangerine"
- 	rm \
- 		debian/tangerine/usr/share/doc/tangerine/sample.conf
- 		debian/tangerine/etc/xdg/autostart/tangerine.desktop
+ 	rm debian/tangerine/usr/share/doc/tangerine/sample.conf
  
  %:
  	dh --with=quilt $@

-- 
tangerine