diff -u streamtuner-0.99.99/src/streamtuner/st-preselections.c streamtuner-0.99.99/src/streamtuner/st-preselections.c --- streamtuner-0.99.99/src/streamtuner/st-preselections.c +++ streamtuner-0.99.99/src/streamtuner/st-preselections.c @@ -390,7 +390,7 @@ { st_preselections_init_handler(); - st_action_register("play-stream", _("Listen to a stream"), "xmms %q"); + st_action_register("play-stream", _("Listen to a stream"), "audacious %q"); st_action_register("record-stream", _("Record a stream"), "x-terminal-emulator -e streamripper %q"); st_action_register("view-web", _("Open a web page"), "sensible-browser %q"); } diff -u streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c --- streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c +++ streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c @@ -970,7 +970,7 @@ init_handler(); - st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q"); + st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q"); st_action_register("record-stream", _("Record a stream"), "x-terminal-emulator -e streamripper %q"); st_action_register("view-web", _("Open a web page"), "sensible-browser %q"); diff -u streamtuner-0.99.99/src/plugins/live365/live365.c streamtuner-0.99.99/src/plugins/live365/live365.c --- streamtuner-0.99.99/src/plugins/live365/live365.c +++ streamtuner-0.99.99/src/plugins/live365/live365.c @@ -1430,8 +1430,8 @@ init_handler(); st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q"); - st_action_register("view-web", _("Open a web page"), "epiphany %q"); - st_action_register("play-stream", _("Listen to a stream"), "xmms %q"); + st_action_register("view-web", _("Open a web page"), "sensible-browser %q"); + st_action_register("play-stream", _("Listen to a stream"), "audacious %q"); return TRUE; } diff -u streamtuner-0.99.99/debian/control streamtuner-0.99.99/debian/control --- streamtuner-0.99.99/debian/control +++ streamtuner-0.99.99/debian/control @@ -1,14 +1,15 @@ Source: streamtuner Section: net Priority: extra -Maintainer: Ari Pollak +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Ari Pollak Build-Depends: debhelper (>> 4.0.0), autotools-dev, libgtk2.0-dev (>= 2.4.0), libcurl4-openssl-dev, scrollkeeper, python-dev, python-gtk2-dev (>= 2.6.0), python-support (>= 0.4), libtagc0-dev, libxml2-dev Standards-Version: 3.6.1 Package: streamtuner Architecture: any Depends: python-gtk2 (>= 2.6.0), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} -Suggests: streamripper, yelp +Recommends: yelp, audacious, streamripper Description: A GUI audio stream directory browser Streamtuner is a stream directory browser. It offers an intuitive and unified interface to various streaming diff -u streamtuner-0.99.99/debian/changelog streamtuner-0.99.99/debian/changelog --- streamtuner-0.99.99/debian/changelog +++ streamtuner-0.99.99/debian/changelog @@ -1,3 +1,13 @@ +streamtuner (0.99.99-15ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #297661) + - Apply patch to set Audacious as default music player and + sensible-browser as default web browser + - Remove xmms from Recommends, add Audacious + - Move streamripper from Suggests to Recommends + + -- Bhavani Shankar Thu, 13 Nov 2008 19:18:31 +0530 + streamtuner (0.99.99-15) unstable; urgency=low * Somehow the last version didn't include the fix. @@ -5,6 +15,17 @@ -- Ari Pollak Fri, 26 Sep 2008 16:45:20 -0400 +streamtuner (0.99.99-14ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #271442, 274184): + - Apply patch to set Audacious as default music player and + sensible-browser as default web browser + - Remove xmms from Recommends, add Audacious + - Move streamripper from Suggests to Recommends + - Update Maintainer field to match Debian-Maintainer-Spec. + + -- David Futcher Wed, 24 Sep 2008 23:38:10 +0100 + streamtuner (0.99.99-14) unstable; urgency=low * Fix Shoutcast tab by changing the URL to http://classic.shoutcast.com. @@ -12,12 +33,41 @@ -- Ari Pollak Thu, 18 Sep 2008 14:12:44 -0400 +streamtuner (0.99.99-13ubuntu2) intrepid; urgency=low + + * Apply patch to set Audacious as default music player and + sensible-browser as default web browser (LP: #80786) + * Remove xmms from Recommends, add Audacious + * Move streamripper from Suggests to Recommends (LP: #110646) + + -- David Futcher Thu, 05 Jun 2008 14:27:14 -0500 + +streamtuner (0.99.99-13ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #237726): + - Move yelp from Suggests to Recommends and add xmms to the + former (LP: #104296). + - Update Maintainer field to match Debian-Maintainer-Spec. + + -- Nathan Handler Thu, 05 Jun 2008 14:27:14 -0500 + streamtuner (0.99.99-13) unstable; urgency=low * Remove bashism in debian/rules (Closes: #484446) -- Ari Pollak Wed, 04 Jun 2008 22:15:01 -0400 +streamtuner (0.99.99-12ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. (LP: #197425) Remaining Ubuntu changes: + - Move yelp from Suggests to Recommends and add xmms to the + former (LP: #104296). + - Update Maintainer field to match Debian-Maintainer-Spec. + * debian/rules: Uncomment the deletion of the .la and .a files, + otherwhise it wouldn't build. + + -- Stefan Ebner Thu, 20 Mar 2008 11:34:19 +0100 + streamtuner (0.99.99-12) unstable; urgency=low * Apply gently modified patch from "lache pas la patate" to fix @@ -40,6 +90,37 @@ -- Ari Pollak Fri, 30 Nov 2007 23:32:25 -0500 +streamtuner (0.99.99-9ubuntu4) gutsy; urgency=low + + * Rebuild for the libcurl transition mess. + + -- Steve Kowalik Thu, 5 Jul 2007 00:15:05 +1000 + +streamtuner (0.99.99-9ubuntu3) gutsy; urgency=low + + [ Arthur Loiret ] + * Move yelp and xmms from Suggests to Recommends (LP: #104296) + * Update Maintainer field to match Debian-Maintainer-Spec + + [ Michael Bienia ] + * debian/control: Change libcurl3-openssl-dev to libcurl4-openssl-dev in + Build-Depends. + + -- Michael Bienia Sun, 01 Jul 2007 01:35:02 +0200 + +streamtuner (0.99.99-9ubuntu2) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Fri, 12 Jan 2007 13:25:42 +0000 + +streamtuner (0.99.99-9ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + * Kept Ubuntu changes + + -- Sarah Hobbs Thu, 7 Sep 2006 21:43:14 -0500 + streamtuner (0.99.99-9) unstable; urgency=low * Patch configure to enable build with python support with Debian's @@ -50,6 +131,12 @@ -- Ari Pollak Sun, 3 Sep 2006 16:41:36 -0400 +streamtuner (0.99.99-8ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Sarah Hobbs Sat, 5 Aug 2006 12:27:53 +1000 + streamtuner (0.99.99-8) unstable; urgency=low * The patch to fix the python plugin seems to have disappeared, so add @@ -57,6 +144,12 @@ -- Ari Pollak Wed, 2 Aug 2006 12:06:23 -0400 +streamtuner (0.99.99-7ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Sarah Hobbs Mon, 24 Jul 2006 15:11:02 +1000 + streamtuner (0.99.99-7) unstable; urgency=low * Update German translation (Closes: #313840) @@ -71,6 +164,44 @@ -- Ari Pollak Sat, 26 Nov 2005 23:44:07 +0000 +streamtuner (0.99.99-5ubuntu6) dapper; urgency=low + + * debian/control + + Added xmms to suggests. (Closes: Malone #46124) + + -- Chuck Short Tue, 23 May 2006 18:52:00 -0400 + +streamtuner (0.99.99-5ubuntu5) dapper; urgency=low + + * src/plugins/python/pst-main.c: + + Apply official patch to fix PyGTK 2.5/2.6 crashes. + + -- Zak B. Elep Sun, 30 Apr 2006 11:05:54 -0400 + +streamtuner (0.99.99-5ubuntu4) breezy; urgency=low + + * Rebuild again to get rid of the libglitz dependency on powerpc. + + -- Adam Conrad Tue, 30 Aug 2005 05:25:55 +1000 + +streamtuner (0.99.99-5ubuntu3) breezy; urgency=low + + * Rebuild with the new cairo version + + -- Sebastien Bacher Thu, 18 Aug 2005 17:23:06 +0000 + +streamtuner (0.99.99-5ubuntu2) breezy; urgency=low + + * Rebuild with new libtagc0-dev. + + -- Matthias Klose Wed, 3 Aug 2005 22:47:58 +0200 + +streamtuner (0.99.99-5ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. (Ubuntu: #10655, Malone: #460). + + -- Daniel Holbach Mon, 11 Jul 2005 10:19:55 +0200 + streamtuner (0.99.99-5) unstable; urgency=low * Apply patch from upstream author to fix live365 stream listings @@ -84,6 +215,13 @@ -- Ari Pollak Sat, 12 Mar 2005 11:22:17 -0500 +streamtuner (0.99.99-3ubuntu0) hoary; urgency=low + + * bumped the version number to trigger a rebuild + (fixes segfaulting on startup) + + -- Oliver Grawert (ogra) Fri, 11 Feb 2005 22:02:38 +0100 + streamtuner (0.99.99-3) unstable; urgency=low * Add libtagc0-dev and libxml2-dev to build-depends only in patch2: unchanged: --- streamtuner-0.99.99.orig/src/plugins/xiph/xiph.c +++ streamtuner-0.99.99/src/plugins/xiph/xiph.c @@ -957,7 +957,7 @@ init_handler(); st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q"); - st_action_register("play-stream", _("Listen to a stream"), "xmms %q"); + st_action_register("play-stream", _("Listen to a stream"), "audacious %q"); return TRUE; } only in patch2: unchanged: --- streamtuner-0.99.99.orig/src/plugins/local/local.c +++ streamtuner-0.99.99/src/plugins/local/local.c @@ -1057,8 +1057,8 @@ init_handler(); - st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q"); - st_action_register("view-web", _("Open a web page"), "epiphany %q"); + st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q"); + st_action_register("view-web", _("Open a web page"), "sensible-browser %q"); return TRUE; }