Advertising
- ryanakca
- Wednesday, March 7th, 2007 at 12:22:42am UTC
- diff -u amarok-1.4.5/debian/changelog amarok-1.4.5/debian/changelog
- --- amarok-1.4.5/debian/changelog
- +++ amarok-1.4.5/debian/changelog
- @@ -1,3 +1,9 @@
- +amarok (2:1.4.5-0ubuntu6) feisty; urgency=low
- +
- + * Fixed the install-mp3 script
- +
- +
- amarok (2:1.4.5-0ubuntu5) feisty; urgency=low
- * Added patches:
- diff -u amarok-1.4.5/debian/control amarok-1.4.5/debian/control
- --- amarok-1.4.5/debian/control
- +++ amarok-1.4.5/debian/control
- @@ -1,7 +1,8 @@
- Source: amarok
- Section: kde
- Priority: optional
- -Maintainer: Adeodato Simó <[email protected]>
- +Maintainer: Ubuntu Core Developers <[email protected]>
- +XSBC-Original-Maintainer: Adeodato Simó <[email protected]>
- Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>=5), quilt, bzip2, libtool,
- kdelibs4-dev, kdemultimedia-dev, kdebase-dev,
- libhal-dev, libxine-dev,
- diff -u amarok-1.4.5/debian/install-mp3 amarok-1.4.5/debian/install-mp3
- --- amarok-1.4.5/debian/install-mp3
- +++ amarok-1.4.5/debian/install-mp3
- @@ -10,49 +10,49 @@
- exit 0
- else
- if [ -x /usr/bin/kdialog ]; then
- - kdialog --msgbox "There was an error installing MP3 support. You need to install the package \"libxine-extracodecs\" manually."
- + kdialog --msgbox "There was an error installing MP3 support. You need to install the package \"libxine1-ffmpeg\" manually."
- elif [ -x /usr/bin/zenity ]; then
- - zenity --info --text "There was an error installing MP3 support. You need to install the package \"libxine-extracodecs\" manually."
- + 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 \"libxine-extracodecs\" manually." 10 60
- + Xdialog --msgbox "There was an error installing MP3 support.\nYou need to install the package \"libxine1-ffmpeg\" manually." 10 60
- fi
- exit 1
- fi
- }
- -AVAILABLE=`apt-cache show libxine-extracodecs | grep Package`
- -INSTALLED=`dpkg --get-selections libxine-extracodecs | grep install`
- +AVAILABLE=`apt-cache show libxine1-ffmpeg | grep Package`
- +INSTALLED=`dpkg --get-selections libxine1-ffmpeg | grep install`
- RELEASE=`lsb_release -sc`
- #is available, not installed
- if [ -n "$AVAILABLE" ] && [ -z "$INSTALLED" ]; then
- if [ -x /usr/bin/kdesu ] && [ -x /usr/bin/adept_batch ]; then
- - kdesu -d "bash -c \"kdialog --msgbox 'Fetching package list, please wait...' & apt-get update && killall kdialog; adept_batch install libxine-extracodecs\""
- + kdesu -d "bash -c \"kdialog --msgbox 'Fetching package list, please wait...' & apt-get update && killall kdialog; adept_batch install libxine1-ffmpeg\""
- elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
- - gksudo "bash -c 'apt-get update && echo libxine-extracodecs i | synaptic --set-selections --non-interactive'"
- + gksudo "bash -c 'apt-get update && echo libxine1-ffmpeg i | synaptic --set-selections --non-interactive'"
- else
- - xterm -e 'sudo apt-get update && sudo apt-get install libxine-extracodecs'
- + xterm -e 'sudo apt-get update && sudo apt-get install libxine1-ffmpeg'
- fi
- check_mp3
- #not available, not installed
- elif [ -z "$AVAILABLE" ] && [ -z "$INSTALLED" ]; then
- if [ -x /usr/bin/kdialog ]; then
- - kdialog --yesno "Do you want to enable restricted software from multiverse?"
- + kdialog --yesno "Do you want to enable unsupported software from universe?"
- elif [ -x /usr/bin/zenity ]; then
- - zenity --question --text "Do you want to enable restricted software from multiverse?"
- + zenity --question --text "Do you want to enable unsupported software from universe?"
- else
- - Xdialog --yesno "Do you want to enable restricted software from multiverse?" 7 60
- + Xdialog --yesno "Do you want to enable unsupported software from universe?" 7 60
- fi
- if [ $? -eq 0 ]; then
- if [ -x /usr/bin/kdesu ] && [ -x /usr/bin/adept_batch ]; then
- - kdesu "bash -c \"kdialog --msgbox 'Fetching package list, please wait...' & echo deb http://archive.ubuntu.com/ubuntu/ $RELEASE universe multiverse >> /etc/apt/sources.list && apt-get update && killall kdialog; adept_batch install libxine-extracodecs\""
- + kdesu "bash -c \"kdialog --msgbox 'Fetching package list, please wait...' & echo deb http://archive.ubuntu.com/ubuntu/ $RELEASE universe >> /etc/apt/sources.list && apt-get update && killall kdialog; adept_batch install libxine1-ffmpeg\""
- elif [ -x /usr/bin/gksudo ] && [ -x /usr/sbin/synaptic ]; then
- - gksudo "bash -c 'echo deb http://archive.ubuntu.com/ubuntu/ $RELEASE universe multiverse >> /etc/apt/sources.list && apt-get update && echo libxine-extracodecs i | synaptic --set-selections --non-interactive'"
- + gksudo "bash -c 'echo deb http://archive.ubuntu.com/ubuntu/ $RELEASE universe >> /etc/apt/sources.list && apt-get update && echo libxine1-ffmpeg i | synaptic --set-selections --non-interactive'"
- else
- - echo -e '#! /bin/sh\necho "deb http://archive.ubuntu.com/ubuntu/ $RELEASE universe multiverse" >> /etc/apt/sources.list' > /tmp/sources_list.sh
- + echo -e '#! /bin/sh\necho "deb http://archive.ubuntu.com/ubuntu/ $RELEASE universe" >> /etc/apt/sources.list' > /tmp/sources_list.sh
- chmod +x /tmp/sources_list.sh
- - xterm -e 'sudo /tmp/sources_list.sh && sudo apt-get update && sudo apt-get install libxine-extracodecs'
- + xterm -e 'sudo /tmp/sources_list.sh && sudo apt-get update && sudo apt-get install libxine1-ffmpeg'
- rm -f /tmp/sources_list.sh
- fi
- else
advertising
Update the Post
Either update this post and resubmit it with changes, or make a new post.
You may also comment on this post.
Please note that information posted here will not expire by default. If you do not want it to expire, please set the expiry time above. If it is set to expire, web search engines will not be allowed to index it prior to it expiring. Items that are not marked to expire will be indexable by search engines. Be careful with your passwords. All illegal activities will be reported and any information will be handed over to the authorities, so be good.