diff -u exaile-0.2.11.1+debian/debian/control exaile-0.2.11.1+debian/debian/control --- exaile-0.2.11.1+debian/debian/control +++ exaile-0.2.11.1+debian/debian/control @@ -1,22 +1,25 @@ Source: exaile Section: sound Priority: optional -Maintainer: François Févotte +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: François Févotte Uploaders: Adam Cécile (Le_Vert) -Build-Depends: debhelper (>= 5), python-support (>= 0.5), - libgtk2.0-dev, python-all-dev, python-gtk2-dev, intltool, intltool-debian -Standards-Version: 3.7.3 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 +Standards-Version: 3.7.3 +XS-Python-Version: current, >= 2.4 Package: exaile Architecture: any +XB-Python-Version: ${python:Versions} 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, 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 + streamripper, python-gpod, python-gamin, python-notify, python-gtkhtml2, + gstreamer0.10-plugins-bad 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 reverted: --- exaile-0.2.11.1+debian/debian/README.Debian-source +++ exaile-0.2.11.1+debian.orig/debian/README.Debian-source @@ -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 reverted: --- exaile-0.2.11.1+debian/debian/pyversions +++ exaile-0.2.11.1+debian.orig/debian/pyversions @@ -1 +0,0 @@ -2.4- diff -u exaile-0.2.11.1+debian/debian/changelog exaile-0.2.11.1+debian/debian/changelog --- exaile-0.2.11.1+debian/debian/changelog +++ exaile-0.2.11.1+debian/debian/changelog @@ -1,3 +1,29 @@ +exaile (0.2.11.1+debian-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control + + Build-Dep on dpatch needed for patches + + Added a Recommends on gstreamer0.10-plugins-bad, + needed by exaile's equaliser to work. + + Added XS/XB-Python-Version + - debian/patches: + + 02_files-on-share-dir, added to adjust the Makefile to point + to the right policy installation dir on /usr/share/pkg. + + 03_fix_mmkeys.dpatch, added to get Multimedia Keys working + - debian/rules: + + Added a link between /usr/lib/exaile/exaile.py and + /usr/share/exaile/exaile.py preventing an error while starting + exaile up. + + Make burn.py and cd_import.py executables + - Removed: + + debian/README.Debian-source (orig tarball not repackaged) + + debian/pyversions + - debian/docs: Removed README.Debian-source + * debian/patches/02_files-on-share-dir + - Tweaked inorder to apply cleanly. + + -- Andrew Starr-Bochicchio Thu, 01 May 2008 03:23:03 +0100 + exaile (0.2.11.1+debian-1) unstable; urgency=low * New upstream release (Closes: #451549): @@ -12,6 +38,81 @@ -- Adam Cécile (Le_Vert) Mon, 25 Feb 2008 22:52:14 +0100 +exaile (0.2.11.1-0ubuntu3) hardy; urgency=low + + * debian/patches/03_fix_mmkeys.dpatch, + debian/patches/00list: + - Added to get Multimedia Keys working (LP: #188702) + + -- Pedro Fragoso Tue, 08 Apr 2008 03:21:07 +0100 + +exaile (0.2.11.1-0ubuntu2) hardy; urgency=low + + * debian/control: + - Added a Recommends on gstreamer0.10-plugins-bad, + needed by exaile's equaliser to work. + - Bumped Standards-Version to 3.7.3 + + -- Andrea Veri Mon, 24 Dec 2007 15:16:23 +0100 + +exaile (0.2.11.1-0ubuntu1) hardy; urgency=low + + [ Cody A.W. Somerville ] + * New upstream release. + * Removed: + - debian/README.Debian-source (orig tarball not repackaged) + - debian/pyversions + - debian/README.Debian + * debian/control: Added XS/XB-Python-Version + * debian/docs: Removed README.Debian-source + + [ Sarah Hobbs ] + * Fixed changelog, and various parts of debian dir + + -- Sarah Hobbs Fri, 23 Nov 2007 17:45:36 +1100 + +exaile (0.2.11-0ubuntu1) hardy; urgency=low + + * New upstream release. + * debian/patches: + - 03_gtkembedmoz_crash_fix patch removed, bug has been fixed + upstream. + - 432164.dpatch removed, bug has been fixed upstream as well. + - 02_files-on-share-dir, added to adjust the Makefile to point + to the right policy installation dir on /usr/share/pkg. + - fix_makefile_for_pysupport, updated and cleaned up a bit to have + a working patch-apply again. + * debian/rules: + - Added a link between /usr/lib/exaile/exaile.py and + /usr/share/exaile/exaile.py preventing an error while starting + exaile up. + - Updated strip_shebang target directory to /usr/share/exaile/xl/plugins. + It seems that upstream now ships plugins inside /xl dir. + - Making burn.py and cd_import.py executables making lintian + happy again. + * debian/control: + - Moving upstream's homepage url from package description to the new + Debian field Homepage at the top of debian/control. + + -- Andrea Veri Wed, 07 Nov 2007 17:31:29 +0100 + +exaile (0.2.10+debian-1.1ubuntu2) gutsy; urgency=low + + * 03_gtkembedmoz_crash_fix: added to fix a crash related to lib gtkembedmoz + when trying to display any sub-tab like Artist/lyrics using the + latest exaile release. Steps to reproduce it can be found on the bug report. + Thanks to Fabien Tassin for reporting and fixing this issue. (LP: #123409) + + -- Andrea Veri Sun, 14 Oct 2007 21:15:49 +0200 + +exaile (0.2.10+debian-1.1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Recommends python-gtkhtml2 + - Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Andrea Veri Tue, 10 Jul 2007 12:33:19 +0200 + exaile (0.2.10+debian-1.1) unstable; urgency=low * Non-maintainer upload. @@ -20,6 +121,14 @@ -- Eric Evans Mon, 09 Jul 2007 16:14:07 -0500 +exaile (0.2.10+debian-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Recommends python-gtkhtml2 + - Updated Maintainer field in debian/control. + + -- Luca Falavigna Fri, 29 Jun 2007 16:44:18 +0200 + exaile (0.2.10+debian-1) unstable; urgency=low * New upstream release @@ -33,12 +142,35 @@ -- François Févotte Mon, 25 Jun 2007 19:46:08 +0200 +exaile (0.2.9+debian-4ubuntu2) gutsy; urgency=low + + * 03_amazon_ecs40.dpatch: Use Amazon ECS version 4.0 (LP: #119643) + + -- Luca Falavigna Fri, 22 Jun 2007 11:47:46 +0200 + +exaile (0.2.9+debian-4ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Recommends python-gtkhtml2 (LP: #84463) + - Updated maintainer fields. + + -- Kjell Braden Tue, 15 May 2007 17:40:22 +0200 + exaile (0.2.9+debian-4) unstable; urgency=low * Build-depends on python-all-dev to avoid FTFBS due to python2.5 headers missing (Closes: #423552). -- Adam Cécile (Le_Vert) Sun, 13 May 2007 10:17:49 +0200 +exaile (0.2.9+debian-3ubuntu1) gutsy; urgency=low + + * Merge with Debian Unstable, Ubuntu changes: (LP: #106301) + - Build-Depend on python-all-dev instead of python-dev to fix FTBS + - Recommends python-gtkhtml2 (LP: #84463) + - Updated maintainer fields. + + -- Lionel Le Folgoc Sun, 29 Apr 2007 20:36:48 +0200 + exaile (0.2.9+debian-3) unstable; urgency=low * patches/02_fix_non-UTF-8_locales.dpatch: (Closes: #418559) @@ -69,6 +201,21 @@ -- François Févotte Sat, 3 Mar 2007 22:34:38 +0100 +exaile (0.2.8+debian-1ubuntu2) feisty; urgency=low + + * debian/control: + - Recommends python-gtkhtml2 (LP: #84463) + - Updated maintainer fields + + -- Jonh Wendell Fri, 30 Mar 2007 15:21:32 -0300 + +exaile (0.2.8+debian-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Build-Depend on python-all-dev instead of python-dev to fix FTBS + + -- Cody A.W. Somerville Mon, 29 Jan 2007 16:23:43 -0400 + exaile (0.2.8+debian-1) unstable; urgency=low * New upstream release @@ -83,6 +230,13 @@ -- François Févotte Wed, 17 Jan 2007 22:46:52 +0100 +exaile (0.2.7+debian-1ubuntu1) feisty; urgency=low + + * debian/control: + - Build-Depend on python-all-dev instead of python-dev to fix FTBS + + -- Matti Lindell Tue, 9 Jan 2007 19:06:21 +0200 + exaile (0.2.7+debian-1) unstable; urgency=low * New upstream release @@ -110,0 +265 @@ + diff -u exaile-0.2.11.1+debian/debian/rules exaile-0.2.11.1+debian/debian/rules --- exaile-0.2.11.1+debian/debian/rules +++ exaile-0.2.11.1+debian/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #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 @@ -15,9 +18,9 @@ CFLAGS += -O2 endif -build: +build: patch-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-install-lib-stamp* po/messages.pot @@ -34,6 +37,8 @@ # 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 install-prereqs: dh_testdir @@ -61,8 +66,8 @@ #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/lib/exaile/xl/plugins/*.py $(DESTDIR)/usr/lib/exaile/xl/*.py $(DESTDIR)/usr/lib/exaile/exaile.py - dh_link + 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_strip dh_compress dh_fixperms diff -u exaile-0.2.11.1+debian/debian/docs exaile-0.2.11.1+debian/debian/docs --- exaile-0.2.11.1+debian/debian/docs +++ exaile-0.2.11.1+debian/debian/docs @@ -2 +1,0 @@ -debian/README.Debian-source only in patch2: unchanged: --- exaile-0.2.11.1+debian.orig/debian/patches/02_files-on-share-dir.dpatch +++ exaile-0.2.11.1+debian/debian/patches/02_files-on-share-dir.dpatch @@ -0,0 +1,70 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_files-on-share-dir.dpatch by Andrea Veri +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: adjusting makefile to point to the right policy dir (/usr/share/exaile +## DP: instead of /usr/lib/exaile) + +@DPATCH@ +diff -urNad exaile-0.2.11~/Makefile exaile-0.2.11/Makefile +--- exaile-0.2.11~/Makefile 2007-11-07 19:02:36.000000000 +0100 ++++ exaile-0.2.11/Makefile 2007-11-07 19:04:25.000000000 +0100 +@@ -18,14 +18,11 @@ + + make-install-dirs: + mkdir -p $(DESTDIR)$(PREFIX)/bin +- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR) +- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile +- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib +- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl +- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui +- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media +- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels +- mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/plugins ++ mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/lib ++ mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/xl/gui ++ mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/xl/media ++ mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/xl/panels ++ mkdir -p $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins + mkdir -p $(DESTDIR)$(PREFIX)/share/ + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps + mkdir -p $(DESTDIR)$(PREFIX)/share/applications +@@ -41,7 +38,7 @@ + + install: make-install-dirs + install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/share/man/man1 +- install -m 644 exaile.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile ++ install -m 644 exaile.py $(DESTDIR)$(PREFIX)/share/exaile + install -m 644 exaile.glade $(DESTDIR)$(PREFIX)/share/exaile + install -m 644 equalizer.ini $(DESTDIR)$(PREFIX)/share/exaile + install -m 644 sql/*.sql $(DESTDIR)$(PREFIX)/share/exaile/sql +@@ -49,18 +46,18 @@ + install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/exaile/images + install -m 644 images/default_theme/*.png \ + $(DESTDIR)$(PREFIX)/share/exaile/images/default_theme +- install -m 644 xl/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl +- -install -m 644 xl/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl +- install -m 644 xl/media/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media +- -install -m 644 xl/media/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/media +- install -m 644 xl/panels/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels +- -install -m 644 xl/panels/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/panels +- install -m 644 xl/gui/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui +- -install -m 644 xl/gui/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/gui +- install -m 644 lib/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib +- -install -m 644 lib/*.py[co] $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/lib ++ install -m 644 xl/*.py $(DESTDIR)$(PREFIX)/share/exaile/xl ++ -install -m 644 xl/*.py[co] $(DESTDIR)$(PREFIX)/share/exaile/xl ++ install -m 644 xl/media/*.py $(DESTDIR)$(PREFIX)/share/exaile/xl/media ++ -install -m 644 xl/media/*.py[co] $(DESTDIR)$(PREFIX)/share//exaile/xl/media ++ install -m 644 xl/panels/*.py $(DESTDIR)$(PREFIX)/share/exaile/xl/panels ++ -install -m 644 xl/panels/*.py[co] $(DESTDIR)$(PREFIX))/share/exaile/xl/panels ++ install -m 644 xl/gui/*.py $(DESTDIR)$(PREFIX)/share/exaile/xl/gui ++ -install -m 644 xl/gui/*.py[co] $(DESTDIR)$(PREFIX)/share/exaile/xl/gui ++ install -m 644 lib/*.py $(DESTDIR)$(PREFIX)/share/exaile/lib ++ -install -m 644 lib/*.py[co] $(DESTDIR)$(PREFIX)/share/exaile/lib + install -m 644 data/*.ini $(DESTDIR)$(PREFIX)/share/exaile/data +- install -m 644 xl/plugins/*.py $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile/xl/plugins ++ install -m 644 xl/plugins/*.py $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins + install -m 644 xl/plugins/*.glade $(DESTDIR)$(PREFIX)/share/exaile/xl/plugins + install -m 644 images/largeicon.png \ + $(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png only in patch2: unchanged: --- exaile-0.2.11.1+debian.orig/debian/patches/03_fix_mmkeys.dpatch +++ exaile-0.2.11.1+debian/debian/patches/03_fix_mmkeys.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_fix_mmkeys.dpatch by Pedro Fragoso +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to fix missing Multimedia Keys + +@DPATCH@ +diff -urNad exaile-0.2.11.1~/xl/xlmisc.py exaile-0.2.11.1/xl/xlmisc.py +--- exaile-0.2.11.1~/xl/xlmisc.py 2007-11-07 16:12:50.000000000 +0000 ++++ exaile-0.2.11.1/xl/xlmisc.py 2008-04-08 03:22:37.000000000 +0100 +@@ -168,9 +168,9 @@ + import dbus + bus = dbus.SessionBus() + obj = bus.get_object('org.gnome.SettingsDaemon', +- '/org/gnome/SettingsDaemon') ++ '/org/gnome/SettingsDaemon/MediaKeys') + self.__gnome = gnome = dbus.Interface(obj, +- 'org.gnome.SettingsDaemon') ++ 'org.gnome.SettingsDaemon.MediaKeys') + gnome.GrabMediaPlayerKeys(self.application, 0) + gnome.connect_to_signal('MediaPlayerKeyPressed', on_gnome_mmkey) + except: only in patch2: unchanged: --- exaile-0.2.11.1+debian.orig/debian/patches/00list +++ exaile-0.2.11.1+debian/debian/patches/00list @@ -0,0 +1,2 @@ +02_files-on-share-dir +03_fix_mmkeys