diff -Nru exaile-0.2.11.1/debian/changelog exaile-0.2.11.1+debian/debian/changelog --- exaile-0.2.11.1/debian/changelog 2008-05-10 15:41:17.000000000 -0400 +++ exaile-0.2.11.1+debian/debian/changelog 2008-05-10 15:41:18.000000000 -0400 @@ -1,3 +1,43 @@ +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): + - New desktop file (Closes: #444438), + - Cover art can now be disabled (Closes: #444227). + * Drop "432164" patch, fixed upstream. + * Drop 01_fix_makefile_for_pysupport patch, new workaround added. + * Bump Standards-Version to 3.7.3. + * Move homepage to new dpkg standard field. + * Update debian/menu to new policy. + * Drop dpatch bdep, not used anymore. + + -- 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, @@ -222,3 +262,4 @@ * Initial release (Closes: #392828). -- François Févotte Sun, 15 Oct 2006 20:48:34 +0200 + diff -Nru exaile-0.2.11.1/debian/control exaile-0.2.11.1+debian/debian/control --- exaile-0.2.11.1/debian/control 2008-05-10 15:41:17.000000000 -0400 +++ exaile-0.2.11.1+debian/debian/control 2008-05-10 15:41:18.000000000 -0400 @@ -5,8 +5,7 @@ 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 +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 diff -Nru exaile-0.2.11.1/debian/menu exaile-0.2.11.1+debian/debian/menu --- exaile-0.2.11.1/debian/menu 2008-05-10 15:41:17.000000000 -0400 +++ exaile-0.2.11.1+debian/debian/menu 2008-05-10 15:41:18.000000000 -0400 @@ -1,3 +1,3 @@ -?package(exaile):needs="X11" section="Apps/Sound"\ +?package(exaile):needs="X11" section="Applications/Sound" \ title="Exaile" command="/usr/bin/exaile" \ icon="/usr/share/pixmaps/exaile.xpm" diff -Nru exaile-0.2.11.1/debian/patches/00list exaile-0.2.11.1+debian/debian/patches/00list --- exaile-0.2.11.1/debian/patches/00list 2008-05-10 15:41:17.000000000 -0400 +++ exaile-0.2.11.1+debian/debian/patches/00list 2008-05-10 15:41:18.000000000 -0400 @@ -1,3 +1,2 @@ -01_fix_makefile_for_pysupport 02_files-on-share-dir 03_fix_mmkeys diff -Nru exaile-0.2.11.1/debian/patches/01_fix_makefile_for_pysupport.dpatch exaile-0.2.11.1+debian/debian/patches/01_fix_makefile_for_pysupport.dpatch --- exaile-0.2.11.1/debian/patches/01_fix_makefile_for_pysupport.dpatch 2008-05-10 15:41:17.000000000 -0400 +++ exaile-0.2.11.1+debian/debian/patches/01_fix_makefile_for_pysupport.dpatch 1969-12-31 19:00:00.000000000 -0500 @@ -1,61 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_fix_makefile_for_pysupport by Andrea Veri -## Patch updated after the new upstream release. Original patch has been done by -## Adam Cécile (Le_Vert) -## All lines beginning with `## DP:' are a description of the patch. -## DP: Make mmkeys.so python bindings separate from the build to allow -## DP: it to be built for each supported python version. -## DP: Handle PYTHON_INC variable. - -@DPATCH@ -diff -urNad exaile-0.2.11~/Makefile exaile-0.2.11/Makefile ---- exaile-0.2.11~/Makefile 2007-10-02 18:25:55.000000000 +0200 -+++ exaile-0.2.11/Makefile 2007-11-07 17:47:54.000000000 +0100 -@@ -1,6 +1,9 @@ - PREFIX ?= /usr/local - LIBDIR ?= /lib - FIREFOX ?= /usr/lib/firefox -+MAKE=$(shell which make) -+PYTHON_INC=$(shell python -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY')") -+PYTHON_VER=$(shell echo $(PYTHON_INC) | sed 's!^.*\([0-9]\.[0-9]\)$$!\1!') - - all: compile mmkeys.so translations - @echo "Done" -@@ -11,7 +14,12 @@ - python -O -m compileall xl lib - - mmkeys.so: -- cd mmkeys && make mmkeys.so && cd .. && cp mmkeys/mmkeys.so . -+ $(MAKE) -C mmkeys PYTHON_DIR=$(PYTHON_INC) -+ cp mmkeys/mmkeys.so . -+ -+make-install-mmkeys.so: mmkeys.so -+ mkdir -p $(DESTDIR)$(PREFIX)/lib/exaile/python$(PYTHON_VER) -+ install -m 644 mmkeys.so $(DESTDIR)$(PREFIX)/lib/exaile/python$(PYTHON_VER) - - translations: - python po/createpot.py compile -@@ -39,13 +47,12 @@ - mkdir -p $(DESTDIR)$(PREFIX)/share/locale - mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 - --install: make-install-dirs -+install: make-install-dirs make-install-mmkeys.so - install -m 644 exaile.1 $(DESTDIR)$(PREFIX)/share/man/man1 - install -m 644 exaile.py $(DESTDIR)$(PREFIX)$(LIBDIR)/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 -- -install -m 644 mmkeys.so $(DESTDIR)$(PREFIX)$(LIBDIR)/exaile - install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/exaile/images - install -m 644 images/default_theme/*.png \ - $(DESTDIR)$(PREFIX)/share/exaile/images/default_theme -@@ -81,7 +88,7 @@ - - clean: - rm -f mmkeys.so -- cd mmkeys && make clean && cd .. -+ $(MAKE) clean -C mmkeys - find . -name "*.py[co]" -exec rm -f {} \; - find po -maxdepth 1 -regextype posix-basic -regex "po/[^.]*" -type d -exec rm -rf {} \; - rm -f exaile.glade.h messages.pot plugins/plugins.glade.h diff -Nru exaile-0.2.11.1/debian/patches/02_files-on-share-dir.dpatch exaile-0.2.11.1+debian/debian/patches/02_files-on-share-dir.dpatch --- exaile-0.2.11.1/debian/patches/02_files-on-share-dir.dpatch 2008-05-10 15:41:17.000000000 -0400 +++ exaile-0.2.11.1+debian/debian/patches/02_files-on-share-dir.dpatch 2008-05-10 15:41:18.000000000 -0400 @@ -9,7 +9,7 @@ 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 -@@ -26,14 +26,11 @@ +@@ -18,14 +18,11 @@ make-install-dirs: mkdir -p $(DESTDIR)$(PREFIX)/bin @@ -29,15 +29,16 @@ mkdir -p $(DESTDIR)$(PREFIX)/share/ mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps mkdir -p $(DESTDIR)$(PREFIX)/share/applications -@@ -49,25 +46,25 @@ +@@ -41,7 +38,7 @@ - install: make-install-dirs make-install-mmkeys.so + 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 diff -Nru exaile-0.2.11.1/debian/README.Debian exaile-0.2.11.1+debian/debian/README.Debian --- exaile-0.2.11.1/debian/README.Debian 2007-11-07 11:11:36.000000000 -0500 +++ exaile-0.2.11.1+debian/debian/README.Debian 1969-12-31 19:00:00.000000000 -0500 @@ -1,6 +0,0 @@ -exaile for Debian ------------------ - - - - -- Adam Olsen , Tue, 23 May 2006 14:07:33 -0600 diff -Nru exaile-0.2.11.1/debian/rules exaile-0.2.11.1+debian/debian/rules --- exaile-0.2.11.1/debian/rules 2008-05-10 15:41:17.000000000 -0400 +++ exaile-0.2.11.1+debian/debian/rules 2008-05-10 15:41:18.000000000 -0400 @@ -23,7 +23,7 @@ clean: unpatch dh_testdir dh_testroot - rm -f build-install-lib-stamp* + rm -f build-install-lib-stamp* po/messages.pot $(MAKE) clean # This should be in upstream Makefile rm -f exaile.glade.h messages.pot plugins/plugins.glade.h @@ -48,7 +48,9 @@ build-install-lib-stamp%: build $(MAKE) clean - $(MAKE) make-install-mmkeys.so DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) PYTHON_INC=/usr/include/python$* + $(MAKE) -C mmkeys mmkeyspy.c + cd mmkeys; python$* setup.py build + cd mmkeys; python$* setup.py install --root=$(DESTDIR) touch $@ binary-indep: build install @@ -61,8 +63,8 @@ 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 + #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