[Pkg-cli-apps-commits] [SCM] banshee branch, master-devel, updated. debian/1.5.0-3-4-gdc50e0d

[Chow Loong Jin]

The following commit has been merged in the master-devel branch:
commit dc50e0df98b371cd0672cbd00601d05b83461d4c
Merge: ef2f83d539e99b3535d3885180981bdeae424814 f78ab6ba41ab222a59c394f689b5c505f51856b7
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Sat Aug 15 02:04:30 2009 +0800

    Merge branch 'master' into master-devel
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

diff --combined debian/changelog
index 03d6464,fd83f39..17259fd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,14 +1,45 @@@
 -banshee (1.4.3-7) UNRELEASED; urgency=low
++banshee (1.5.0-4) UNRELEASED; urgency=low
+ 
+   * debian/control, debian/changelog:
+     + Use mono-csc instead of csc for MCS.
+     + Bump mono-devel version to 2.4.2 for mono-csc
+ 
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 15 Aug 2009 01:53:40 +0800
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 15 Aug 2009 02:04:20 +0800
+ 
 -banshee (1.4.3-6) unstable; urgency=low
 +banshee (1.5.0-3) experimental; urgency=low
 +
 +  * debian/patches/03_muinshee-booter.patch,
 +    debian/banshee.links,
 +    debian/banshee.1:
 +    + Patch banshee booter script to autodetect whether to use Banshee or
 +      Muinshee interface based on the file name
 +    + Make /usr/bin/muinshee a symlink of /usr/bin/banshee-1
 +    + Update banshee.1 manpage and link it to muinshee.1
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 19 Jul 2009 00:22:34 +0800
 +
 +banshee (1.5.0-2) experimental; urgency=low
 +
 +  * debian/control:
 +    + Replace gstreamer0.10-plugins-ffmpeg with gstreamer0.10-ffmpeg
 +    + Change of my email address
 +    + Bump Standards-Version to 3.8.2
 +  * debian/rules:
 +    + Drop dh_installchangelogs override. We don't want ChangeLog installed
 +      any more.
 +  * debian/banshee.links:
 +    + Updated to symlink the banshee manpage to banshee-1
 +  * debian/patches/01_dispose-sqlite-cmd.patch:
 +    + Fix for BGO #586498, where Banshee leaks memory while rescanning library
 +  * debian/patches/01_remove-bash-dep.patch:
 +    + Delete it for good
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 08 Jul 2009 22:10:27 +0800
 +
 +banshee (1.5.0-1) experimental; urgency=low
  
    [ Chow Loong Jin ]
 +  * New Upstream Version
    * debian/control:
      + Fix grammatical error "an media" to "a media"
      + Set quilt's version to 0.46-7~ instead of 0.46-7 for backportability
@@@ -41,25 -18,26 +49,25 @@@
      + Drop unnecessary build dependencies
    * debian/watch:
      + Updated to include changes in directory structure
 -  * debian/banshee.links:
 -    + Updated to symlink the banshee manpage to banshee-1
 -    + Make /usr/bin/muinshee a symlink to /usr/bin/banshee-1
 -    + Make muinshee.1 manpage a symlink to banshee.1
 -  * debian/banshee.1:
 -    + Update to show muinshee as well
 -  * debian/patches/03_muinshee-booter.patch:
 -    + Patch banshee booter script to autodetect whether to use Banshee or
 -      Muinshee interface based on file name
 +  * debian/patches:
 +    + 02_system_equalizer.patch: drop a hunk, it'll work without it anyway
 +    + 03_fix-lastfm.patch: dropped, applied upstream
 +    + 20_check_notification_support.patch: dropped, applied upstream
  
    [ Iain Lane ]
    * debian/banshee.{1,manpages} Add manpage. This was initially generated by
      help2man from `banshee --help-all' and then edited a bit to be more
      readable and standard. (Closes: #384557)
 -
 +    
    [ Iulian Udrea ]
    * debian/compat:
      - Bump to 7.
  
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 24 Jun 2009 01:57:02 +0800
 +  [ Sebastian Dröge ]
 +  * debian/control:
 +    + Update/remove some build dependencies for the new version.
 +
 + -- Sebastian Dröge <slomo at debian.org>  Thu, 04 Jun 2009 20:01:25 +0200
  
  banshee (1.4.3-5) unstable; urgency=low
  
diff --combined debian/rules
index e29ffc7,338be2d..1b7d695
--- a/debian/rules
+++ b/debian/rules
@@@ -8,8 -8,11 +8,8 @@@ LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as
  override_dh_auto_configure:
  	dh_auto_configure -- --disable-static --enable-release \
  	                     --with-vendor-build-id="`lsb_release -ds`" \
- 	                     MCS=/usr/bin/csc LDFLAGS="$(LDFLAGS)"
+ 	                     MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
  
 -override_dh_installchangelogs:
 -	dh_installchangelogs ChangeLog
 -
  # disable tests
  override_dh_auto_test:
  

-- 
banshee