diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/debian/changelog /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/changelog --- /tmp/oJVANP1HJZ/exaile-0.2.11/debian/changelog 2007-11-16 14:19:10.000000000 -0600 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/changelog 2007-11-16 14:19:10.000000000 -0600 @@ -1,3 +1,9 @@ +exaile (0.2.11.1-0ubuntu1) hardy; urgency=low + + * New upstream release + + -- Kenneth Drake Fri, 16 Nov 2007 13:43:45 -0600 + exaile (0.2.11-0ubuntu1) hardy; urgency=low * New upstream release. diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/debian/control /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/control --- /tmp/oJVANP1HJZ/exaile-0.2.11/debian/control 2007-11-16 14:19:10.000000000 -0600 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/control 2007-11-07 10:11:37.000000000 -0600 @@ -1,33 +1,22 @@ Source: exaile -Section: sound +Section: universe/devel Priority: optional -Maintainer: Ubuntu MOTU Developers -XSBC-Original-Maintainer: François Févotte -Uploaders: Adam Cécile (Le_Vert) -Homepage: http://www.exaile.org/ -Build-Depends: debhelper (>= 5), python-support (>= 0.5), dpatch (>= 2), - libgtk2.0-dev, python-all-dev, python-gtk2-dev, intltool, intltool-debian +Maintainer: Aren Olson +Build-Depends: debhelper (>= 5), python-dev, python-gtk2-dev Standards-Version: 3.7.2 Package: exaile Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends}, python-pysqlite2, - libgstreamer0.10-0, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, - python-gst0.10, gstreamer0.10-alsa | gstreamer0.10-esd, +Depends: gstreamer0.10-plugins-good, python-gst0.10, python, python-gtk2, python-glade2, python-dbus, python-pyvorbis, - python-mutagen, python-elementtree -Recommends: gstreamer0.10-plugins-ugly, python-gnome2-extras, python-cddb, - streamripper, python-gpod, python-gamin, python-notify, python-gtkhtml2 -Description: flexible audio player, similar to Amarok, but written in GTK+ - Exaile is a media player aiming to be similar to KDE's Amarok, but for - GTK+. It incorporates many of the cool things from Amarok (and other + python-mutagen, python-pysqlite2 | python (>= 2.5), + python-elementtree | python (>= 2.5), gstreamer0.10-plugins-base +Recommends: python-gnome2-extras, python-cddb, sexy-python | python-sexy, + gstreamer0.10-gnomevfs +Suggests: gstreamer0.10-plugins-bad, gstreamer0.10-plugins-ugly +Description: An AmaroK-like media player + Exaile is a media player aiming to be similar to KDE's AmaroK, but for + GTK+. It incorporates many of the cool things from AmaroK (and other media players) like automatic fetching of album art, handling of large - libraries, lyrics fetching, artist/album information via the wikipedia, - last.fm support, optional iPod support (assuming you have python-gpod - installed). - . - In addition, Exaile also includes a built-in shoutcast directory - browser, tabbed playlists (so you can have more than one playlist open - at a time), blacklisting of tracks (so they don't get scanned into your - library), downloading of guitar tablature from fretplay.com, and - submitting played tracks on your iPod to last.fm. + libraries, lyrics fetching, artist/album information from Wikipedia, + last.fm support, an OSD, a powerful set of plugins and much more. diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/debian/copyright /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/copyright --- /tmp/oJVANP1HJZ/exaile-0.2.11/debian/copyright 2007-11-16 14:19:10.000000000 -0600 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/copyright 2007-11-07 10:11:37.000000000 -0600 @@ -1,13 +1,14 @@ This package was debianized by François Févotte -on Sun, 15 Oct 2006 20:48:34 +0200. +and Adam Olsen on Sun, 15 Oct 2006 20:48:34 +0200. It was downloaded from: http://www.exaile.org/files/ Upstream Author: Adam Olsen -Copyright (C) 2005 Adam Olsen +Copyright (C) 2005 Adam Olsen License: + This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -22,23 +23,8 @@ along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -On Debian systems, the complete text of the GNU General Public License can -be found in `/usr/share/common-licenses/GPL'. - -All files except those listed below are distributed under the terms of the -GPL with the copyright above. - - "mmkeys/mmkeys.c", "mmkeys/mmkeys.h" and "mmkeys/README" are released under - the terms of the GPL and are copyright (C) 2004 Lee Willis - - "mmkeys/mmkeys.override", "mmkeys/mmkeys.defs", "mmkeys/mmkeysmodule.c" and - "mmkeys/Makefile" are released under the terms of the GPL and are copyright - (C) 2004 Joe Wreschnig - -The Debian packaging is: - (C) 2006, François Févotte - (C) 2006, Adam Cécile (Le_Vert) -and is licensed under the GPL, see above. +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. -The upstream sources of this package have been repacked to remove the -existing debian directory +The Debian packaging is (C) 2006, François Févotte +and Adam Olsen and is licensed under the GPL, see above. diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/debian/docs /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/docs --- /tmp/oJVANP1HJZ/exaile-0.2.11/debian/docs 2007-11-16 14:19:10.000000000 -0600 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/docs 2007-11-07 10:11:38.000000000 -0600 @@ -1,2 +1 @@ TODO -debian/README.Debian-source diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/debian/menu /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/menu --- /tmp/oJVANP1HJZ/exaile-0.2.11/debian/menu 2007-11-16 14:19:10.000000000 -0600 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/menu 2007-11-07 10:11:38.000000000 -0600 @@ -1,3 +1,3 @@ ?package(exaile):needs="X11" section="Apps/Sound"\ title="Exaile" command="/usr/bin/exaile" \ - icon="/usr/share/pixmaps/exaile.xpm" + icon="/usr/share/pixmaps/exaile.png" diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/debian/README.Debian /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/README.Debian --- /tmp/oJVANP1HJZ/exaile-0.2.11/debian/README.Debian 1969-12-31 18:00:00.000000000 -0600 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/README.Debian 2007-11-07 10:11:36.000000000 -0600 @@ -0,0 +1,6 @@ +exaile for Debian +----------------- + + + + -- Adam Olsen , Tue, 23 May 2006 14:07:33 -0600 diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/debian/README.Debian-source /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/README.Debian-source --- /tmp/oJVANP1HJZ/exaile-0.2.11/debian/README.Debian-source 2007-11-16 14:19:10.000000000 -0600 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/README.Debian-source 1969-12-31 18:00:00.000000000 -0600 @@ -1,6 +0,0 @@ -Exaile ------- - - The original tarball has been repackaged to remove the debian/ directory. - - -- François Févotte Fri, 5 Jan 2007 19:24:27 +0100 diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/debian/rules /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/rules --- /tmp/oJVANP1HJZ/exaile-0.2.11/debian/rules 2007-11-16 14:19:10.000000000 -0600 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/rules 2007-11-07 10:11:38.000000000 -0600 @@ -1,75 +1,93 @@ #!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 + -# Dpatch targets -include /usr/share/dpatch/dpatch.make -# Get supported python version and destdir -PYVERS = $(shell pyversions -rv) -DESTDIR = $(CURDIR)/debian/exaile -PREFIX = /usr CFLAGS = -Wall -g + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif -build: patch-stamp +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #docbook-to-man debian/exaile.sgml > exaile.1 + + touch $@ -clean: unpatch +clean: dh_testdir dh_testroot - rm -f build-install-lib-stamp* - $(MAKE) clean - # This should be in upstream Makefile - rm -f exaile.glade.h messages.pot plugins/plugins.glade.h - dh_clean + rm -f build-stamp configure-stamp -install: install-prereqs $(PYVERS:%=build-install-lib-stamp%) - $(MAKE) translations - $(MAKE) install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) - # Move png to /usr/share/icons - mv $(DESTDIR)/usr/share/pixmaps $(DESTDIR)/usr/share/icons - # XPM icon - install -D -m 644 images/icon.xpm \ - $(DESTDIR)/usr/share/pixmaps/exaile.xpm - chmod +x $(DESTDIR)/usr/share/exaile/xl/burn.py - chmod +x $(DESTDIR)/usr/share/exaile/xl/cd_import.py + # Add here commands to clean up after the build process. + -$(MAKE) clean -install-prereqs: + dh_clean + +install: build dh_testdir dh_testroot dh_clean -k dh_installdirs -build-install-lib-stamp%: build - $(MAKE) clean - $(MAKE) make-install-mmkeys.so DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) PYTHON_INC=/usr/include/python$* - touch $@ + # Add here commands to install the package into debian/exaile. + $(MAKE) install DESTDIR=$(CURDIR)/debian/exaile PREFIX=/usr + +# Build architecture-independent files here. binary-indep: build install +# We have nothing to do by default. +# Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs changelog dh_installdocs - dh_installmenu - dh_installman - # Add mmkeys private python module path - sed -i "s!\(^[^#]*import mmkey.*\)! sys.path.append(\"/usr/lib/exaile/\"+\"python\"+sys.version[:3])\n\1!" \ - $(DESTDIR)/usr/share/exaile/exaile.py - # Strip useless shebang lines - perl debian/strip_shebang $(DESTDIR)/usr/share/exaile/xl/plugins/*.py $(DESTDIR)/usr/share/exaile/exaile.py - dh_link $(PREFIX)/share/exaile/exaile.py $(PREFIX)/lib/exaile/exaile.py + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_python +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman exaile.1 + dh_link dh_strip dh_compress dh_fixperms - dh_pysupport +# dh_perl +# dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol @@ -77,4 +95,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install configure diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/debian/watch /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/watch --- /tmp/oJVANP1HJZ/exaile-0.2.11/debian/watch 2007-11-16 14:19:10.000000000 -0600 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/debian/watch 2007-11-07 10:11:39.000000000 -0600 @@ -2,6 +2,4 @@ version=3 # Examine a Webserver directory -# mangle the Debian version number to remove the +debian suffix -opts=dversionmangle=s/\+debian$// \ - http://www.exaile.org/files/exaile_([0-9.]+)\.tar\.gz +http://www.exaile.org/files/exaile_(.*)\.tar\.gz diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/exaile_irssi.pl /tmp/n0lmKkdLUI/exaile-0.2.11.1/exaile_irssi.pl --- /tmp/oJVANP1HJZ/exaile-0.2.11/exaile_irssi.pl 2007-10-09 10:29:44.000000000 -0500 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/exaile_irssi.pl 1969-12-31 18:00:00.000000000 -0600 @@ -1,90 +0,0 @@ -#!/usr/bin/perl - -use Net::DBus; -use strict; -use Irssi; -use vars qw($VERSION %IRSSI); - -my $star_full = '✮'; -my $star_empty = '✩'; - -$VERSION = "1.0"; -%IRSSI = ( - authors => "Adam Olsen", - contact => "arolsen\@gmail.com", - name => "Exaile interface script", - description => "Prints what you're playing to an irssi channel", - license => "Public domain" -); - -sub test_dbus -{ - my $service = shift; - - my $bus = Net::DBus->session; - my $obj = $bus->get_service("org.freedesktop.DBus"); - my $iface = $obj->get_object("/org/freedesktop/DBus", - "org.freedesktop.DBus"); - - foreach my $item( @{$iface->ListNames()} ) - { - if( $item eq $service ) - { - return 1; - } - } - - return 0; -} - -sub print_info -{ - my($data, $server, $witem) = @_; - - my $bus = Net::DBus->session; - - if(!&test_dbus("org.exaile.DBusInterface")) - { - print "Could not see Exaile in dbus."; - return; - } - - my $obj = $bus->get_service("org.exaile.DBusInterface"); - my $iface = $obj->get_object("/DBusInterfaceObject", - "org.exaile.DBusInterface"); - - my $pos = $iface->current_position; - if(!$pos) - { - print "Not playing anything"; - return; - } - $pos = int($pos); - - my $song = $iface->get_title; - my $artist = $iface->get_artist; - my $length = $iface->get_length; - my $rating = $iface->get_rating; - my $star_string = ''; - my $count = 0; - while($count < 8) - { - if($rating > $count) - { - $star_string .= $star_full; - } - else { - $star_string .= $star_empty; - } - $count++; - } - - if($witem && $witem->{type} eq 'CHANNEL') - { - $witem->command("ACTION " . $witem->{name} . - " is playing $song by $artist [$length $pos\%] ($star_string)"); - } -} - -Irssi::command_bind("exaile", 'print_info'); -print "Exaile script loaded."; diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/gutsy_information_crash.patch /tmp/n0lmKkdLUI/exaile-0.2.11.1/gutsy_information_crash.patch --- /tmp/oJVANP1HJZ/exaile-0.2.11/gutsy_information_crash.patch 2007-10-02 10:31:19.000000000 -0500 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/gutsy_information_crash.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,10 +0,0 @@ -=== modified file 'exaile' ---- exaile 2007-07-08 20:50:15 +0000 -+++ exaile 2007-10-02 15:31:02 +0000 -@@ -11,4 +11,5 @@ - - cd ${PROGRAM_DIR} - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/firefox -+export MOZILLA_FIVE_HOME=/usr/lib/firefox - exec python -O exaile.py "$@" - diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/po/messages.pot /tmp/n0lmKkdLUI/exaile-0.2.11.1/po/messages.pot --- /tmp/oJVANP1HJZ/exaile-0.2.11/po/messages.pot 2007-10-16 16:38:09.000000000 -0500 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/po/messages.pot 2007-11-07 10:15:23.000000000 -0600 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-16 15:38-0600\n" +"POT-Creation-Date: 2007-11-07 09:15-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru /tmp/oJVANP1HJZ/exaile-0.2.11/xl/library.py /tmp/n0lmKkdLUI/exaile-0.2.11.1/xl/library.py --- /tmp/oJVANP1HJZ/exaile-0.2.11/xl/library.py 2007-10-08 18:46:39.000000000 -0500 +++ /tmp/n0lmKkdLUI/exaile-0.2.11.1/xl/library.py 2007-11-07 10:12:47.000000000 -0600 @@ -579,7 +579,7 @@ "length": tr.duration, "bitrate": tr._bitrate, "rating": tr.system_rating, - "user_rating": tr.rating, + "user_rating": tr._rating, "blacklisted": tr.blacklisted, "year": tr.year, "modified": tr.modified,