[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.9.5-1-6-g07e33c7

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit b5f2f218475be22e994550c0f8c8f5069c74c76b
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Mar 24 22:55:04 2011 +0800

    Handle banshee-1 rename back to banshee

diff --git a/debian/Banshee.GStreamer.dll.config b/debian/Banshee.GStreamer.dll.config
index 2166af8..c684f1d 100644
--- a/debian/Banshee.GStreamer.dll.config
+++ b/debian/Banshee.GStreamer.dll.config
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="libbanshee.dll" target="/usr/lib/banshee-1/libbanshee.so"/>
+  <dllmap dll="libbanshee.dll" target="/usr/lib/banshee/libbanshee.so"/>
 </configuration>
diff --git a/debian/Banshee.NowPlaying.X11.dll.config b/debian/Banshee.NowPlaying.X11.dll.config
index 80a63ee..9725e4b 100644
--- a/debian/Banshee.NowPlaying.X11.dll.config
+++ b/debian/Banshee.NowPlaying.X11.dll.config
@@ -1,4 +1,4 @@
 <configuration>
-  <dllmap dll="libbnpx11" target="/usr/lib/banshee-1/Backends/libbnpx11.so"/>
+  <dllmap dll="libbnpx11" target="/usr/lib/banshee/Backends/libbnpx11.so"/>
   <dllmap dll="libgobject-2.0.so" target="libgobject-2.0.so.0"/>
 </configuration>
diff --git a/debian/banshee-meego.install b/debian/banshee-meego.install
index 74bfcfe..20c7c62 100644
--- a/debian/banshee-meego.install
+++ b/debian/banshee-meego.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/banshee-1/MeeGo.exe
-debian/tmp/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll*
+debian/tmp/usr/lib/banshee/MeeGo.exe
+debian/tmp/usr/lib/banshee/Extensions/Banshee.MeeGo.dll*
 debian/tmp/usr/share/mutter-meego
 debian/tmp/usr/share/dbus-1/services/com.meego*
diff --git a/debian/banshee.1 b/debian/banshee.1
index f6dc3e6..b1a1b3c 100644
--- a/debian/banshee.1
+++ b/debian/banshee.1
@@ -5,7 +5,7 @@ Banshee \- Media Management and Playback application
 .br
 Muinshee \- Media Management and Playback application
 .SH SYNOPSIS
-.B banshee-1
+.B banshee
 [\fIoptions\fR...] [\fIfiles|URIs\fR...]
 .
 .br
diff --git a/debian/banshee.install b/debian/banshee.install
index 339c5c9..4e39ac9 100644
--- a/debian/banshee.install
+++ b/debian/banshee.install
@@ -1,7 +1,7 @@
 debian/tmp/usr/bin
 debian/tmp/usr/share
 debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/banshee-1/
+debian/tmp/usr/lib/banshee/
 debian/banshee.xpm /usr/share/pixmaps
-debian/Banshee.GStreamer.dll.config /usr/lib/banshee-1/Backends
-debian/Banshee.NowPlaying.X11.dll.config /usr/lib/banshee-1/Backends
+debian/Banshee.GStreamer.dll.config /usr/lib/banshee/Backends
+debian/Banshee.NowPlaying.X11.dll.config /usr/lib/banshee/Backends
diff --git a/debian/banshee.links b/debian/banshee.links
index 87fc0a9..383fddc 100644
--- a/debian/banshee.links
+++ b/debian/banshee.links
@@ -1,4 +1,2 @@
-usr/bin/banshee-1 usr/bin/banshee
-usr/bin/banshee-1 usr/bin/muinshee
-usr/share/man/man1/banshee.1.gz usr/share/man/man1/banshee-1.1.gz
+usr/bin/banshee usr/bin/muinshee
 usr/share/man/man1/banshee.1.gz usr/share/man/man1/muinshee.1.gz
diff --git a/debian/rules b/debian/rules
index 163b429..cf8d215 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,18 +72,18 @@ override_dh_install:
 	dh_install
 	# Remove MeeGo stuff from banshee binary package
 	rm -r debian/banshee/usr/share/mutter-meego/ \
-	      debian/banshee/usr/lib/banshee-1/MeeGo.exe \
-	      debian/banshee/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll* \
+	      debian/banshee/usr/lib/banshee/MeeGo.exe \
+	      debian/banshee/usr/lib/banshee/Extensions/Banshee.MeeGo.dll* \
 	      debian/banshee/usr/share/dbus-1/services/com.meego*
 ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
 	# Remove U1MS and Sound Menu stuff from banshee
-	rm -r debian/banshee/usr/lib/banshee-1/Extensions/Banshee.SoundMenu.* \
-	      debian/banshee/usr/lib/banshee-1/Extensions/Banshee.UbuntuOneMusicStore.*
+	rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.SoundMenu.* \
+	      debian/banshee/usr/lib/banshee/Extensions/Banshee.UbuntuOneMusicStore.*
 	cd po; intltool-update --pot
 
 	for d in $$(find debian/ -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
 	    sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \
-	    echo "X-Ubuntu-Gettext-Domain=banshee-1" >> $$d; \
+	    echo "X-Ubuntu-Gettext-Domain=banshee" >> $$d; \
 	done
 endif
 
diff --git a/debian/watch b/debian/watch
index 446da96..023477b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-http://download.banshee.fm/banshee/unstable/(\d\.\d\.\d)/banshee-1-(.*)\.tar\.gz
-http://download.banshee.fm/banshee/stable/(\d\.\d\.\d)/banshee-1-(.*)\.tar\.gz
+http://download.banshee.fm/banshee/unstable/(\d\.\d\.\d)/banshee-(.*)\.tar\.gz
+http://download.banshee.fm/banshee/stable/(\d\.\d\.\d)/banshee-(.*)\.tar\.gz

-- 
banshee