[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/1.5.5-1ubuntu2-13-g6cd5520

[Chow Loong Jin]

The following commit has been merged in the ubuntu branch:
commit 0728a8d3b59a7b3a01213e8ad42b6a94eb4d4177
Merge: 28ef3fcc520d8b11483845781bc9f1ded63fc59a 35b2c91b755c6b79699209aa22f3dc196467a163
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sun Apr 4 18:26:00 2010 +0800

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/rules

diff --combined debian/rules
index cf912a4,f0a01a7..69fd269
--- a/debian/rules
+++ b/debian/rules
@@@ -12,12 -12,12 +12,12 @@@ override_dh_auto_configure
  		--enable-gnome \
  		--enable-schemas-install \
  		--enable-alarmclock \
- 		--enable-appindicator
 -		--disable-appindicator \
++		--enable-appindicator \
  		--enable-awn \
  		--disable-clutterflow \
  		--enable-coverwallpaper \
  		--enable-lcd \
 -		--disable-lirc \
 +		--enable-lirc \
  		--enable-lyrics \
  		--enable-liveradio \
  		--enable-magnatune \
@@@ -25,7 -25,7 +25,7 @@@
  		--enable-radiostationfetcher \
  		--enable-streamrecorder \
  		--enable-telepathy \
 -		--disable-ubuntuonemusicstore \
 +		--enable-ubuntuonemusicstore \
  		--disable-shave \
  		MCS=/usr/bin/mono-csc
  

-- 
banshee-community-extensions