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

[Chow Loong Jin]

The following commit has been merged in the ppa/intrepid branch:
commit 907c05ad0f6f3052df88cf2cff508322a3b7051d
Merge: eb5eb1eae7594f3b80097d822a69e1ae2f5ed06b 0cd1e35a677d674337f97b50a0fad02750ad0bb4
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Tue Aug 18 01:23:40 2009 +0800

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

diff --combined debian/changelog
index 26a554f,32749c3..8277a8f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,23 +1,39 @@@
++tangerine (0.3.2.2-0ubuntu1~hyper2~intrepid) intrepid; urgency=low
++
++  * Merge from Jaunty PPA, remaining changes:
++    + Use libmono-dev and mono-gmcs build-dep instead of mono-devel
++    + Don't pass MCS=/usr/bin/csc to configure
++
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 18 Aug 2009 01:16:24 +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:
+     + Remove /etc/xdg/autostart/tangerine.desktop since it starts
+       tangerine-properties when logging in, which is undesirable
+   * debian/control:
+     + No-change bump to Standards 3.8.3
+   * debian/README.source:
+     + Copy over README.source from /usr/share/quilt/doc to satisfy lintian
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 18 Aug 2009 00:41:02 +0800
+ 
 +tangerine (0.3.2.2-0ubuntu1~hyper1~intrepid1) intrepid; urgency=low
 +
 +  * Merge from Jaunty, remaining changes:
 +    + Use libmono-dev and mono-gmcs build-dep instead of mono-devel
 +    + Don't pass MCS=/usr/bin/csc to configure
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 17 Aug 2009 14:58:37 +0800
 +
  tangerine (0.3.2.2-0ubuntu1~hyper1~jaunty1) jaunty; urgency=low
  
    * debian/control, debian/rules:
diff --combined debian/control
index 4975e30,3613283..ec97717
--- a/debian/control
+++ b/debian/control
@@@ -7,9 -7,8 +7,9 @@@ Uploaders: Jose Carlos Garcia Sogo <jso
             Chow Loong Jin <hyperair at ubuntu.com>
  Build-Depends: debhelper (>= 7.0.50),
                 quilt (>= 0.46-7~),
 -               mono-devel (>= 2.0.1),
 +               libmono-dev,
                 cli-common-dev (>= 0.5.7),
 +               mono-gmcs | c-sharp-2.0-compiler,
                 pkg-config,
                 autotools-dev,
                 intltool,
@@@ -24,7 -23,7 +24,7 @@@
                 libsm-dev,
                 banshee (>= 1.4.2),
                 beagle-dev (>= 0.1.4)
- Standards-Version: 3.8.2
+ Standards-Version: 3.8.3
  Homepage: http://launchpad.net/tangerine/
  Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/tangerine.git
  Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/tangerine.git
diff --combined debian/rules
index 657d57f,e74c0ab..8e63b8d
--- a/debian/rules
+++ b/debian/rules
@@@ -20,6 -20,7 +20,6 @@@ get-orig-source
  
  override_dh_auto_configure:
  	dh_auto_configure -- \
 -		MCS=/usr/bin/csc \
  		--enable-debug \
  		--enable-banshee \
  		--enable-beagle \
@@@ -34,10 -35,14 +34,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