Package: amarok
Version: 1.4.9.1-2
Severity: wishlist
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu intrepid ubuntu-patch
Hi,
Attached is a suggested patch to activate amarok's mechanism
to offer to install mp3 support when needed. Please consider
applying it.
I realise that this can be a hot topic, and I don't wish to start
a debate on the subject. By forwarding the patch I just want
to ensure that you have had a chance to consider the patch.
Thanks,
James
diff -u amarok-1.4.9.1/debian/patches/series amarok-1.4.9.1/debian/patches/series
--- amarok-1.4.9.1/debian/patches/series
+++ amarok-1.4.9.1/debian/patches/series
@@ -13,0 +14 @@
+kubuntu_04_install_mp3.diff -p1
diff -u amarok-1.4.9.1/debian/amarok.install amarok-1.4.9.1/debian/amarok.install
--- amarok-1.4.9.1/debian/amarok.install
+++ amarok-1.4.9.1/debian/amarok.install
@@ -40,0 +41,3 @@
+
+amarok/src/engine/xine/amarok_xine-mp3_install.desktop /usr/share/services
+debian/install-mp3 /usr/lib/amarok
diff -u amarok-1.4.9.1/debian/rules amarok-1.4.9.1/debian/rules
--- amarok-1.4.9.1/debian/rules
+++ amarok-1.4.9.1/debian/rules
@@ -98,0 +99 @@
+ chmod a+x debian/amarok/usr/lib/amarok/install-mp3
only in patch2:
unchanged:
--- amarok-1.4.9.1.orig/debian/patches/kubuntu_04_install_mp3.diff
+++ amarok-1.4.9.1/debian/patches/kubuntu_04_install_mp3.diff
@@ -0,0 +1,10 @@
+--- amarok/amarok/src/engine/xine/amarok_xine-mp3_install.desktop~ 2006-07-02 19:37:44.000000000 +0000
++++ amarok/amarok/src/engine/xine/amarok_xine-mp3_install.desktop 2006-07-05 01:07:35.000000000 +0000
+@@ -3,5 +3,6 @@
+ ServiceTypes=Amarok/CodecInstall
+ X-KDE-Amarok-codec=mp3
+ X-KDE-Amarok-engine=xine-engine
+-Exec=kdialog --msgbox "Hello World"
++Exec=/usr/lib/amarok/install-mp3
++
+
only in patch2:
unchanged:
--- amarok-1.4.9.1.orig/debian/install-mp3
+++ amarok-1.4.9.1/debian/install-mp3
@@ -0,0 +1,40 @@
+check_mp3() {
+
+ INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
+
+ if [ -z "$INSTALLED" ]; then
+ if [ -x /usr/bin/kdialog ]; then
+ kdialog --msgbox "There was an error installing MP3 support. You need to install the package \"libxine1-ffmpeg\" manually." --icon amarok
+ elif [ -x /usr/bin/zenity ]; then
+ zenity --info --text "There was an error installing MP3 support. You need to install the package \"libxine1-ffmpeg\" manually."
+ else
+ Xdialog --msgbox "There was an error installing MP3 support.\nYou need to install the package \"libxine1-ffmpeg\" manually." 10 60
+ fi
+ exit 1
+ else
+ if [ -x /usr/bin/kdialog ]; then
+ kdialog --msgbox "MP3 support now installed, you will need to restart Amarok." --icon amarok
+ elif [ -x /usr/bin/zenity ]; then
+ zenity --info --text "MP3 support now installed, you will need to restart Amarok."
+ else
+ Xdialog --msgbox "MP3 support now installed, you will need to restart Amarok." 5 60
+ fi
+ exit 0
+ fi
+}
+
+INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
+
+#is available, not installed
+if [ -z "$INSTALLED" ]; then
+ if [ -x /usr/bin/kdesu ] && [ -x /usr/bin/adept_batch ]; then
+ kdesu -d "adept_batch update --icon amarok" && kdesu -d "adept_batch install libxine1-ffmpeg --icon amarok"
+ elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
+ gksudo "apt-get update" && gksudo "echo libxine1-ffmpeg i | synaptic --set-selections --non-interactive"
+ else
+ xterm -e 'sudo apt-get update && sudo apt-get install libxine1-ffmpeg'
+ fi
+ check_mp3
+fi
+
+exit 0
