diff -u listen-0.5/debian/control listen-0.5/debian/control --- listen-0.5/debian/control +++ listen-0.5/debian/control @@ -1,10 +1,11 @@ Source: listen Section: sound Priority: optional -Maintainer: Julien Valroff +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Julien Valroff Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python-central (>= 0.5), docbook2x, pkg-config, python-gtk2-dev, python-all-dev (>= 2.3.5-11), imagemagick, python-mutagen (>= 1.8), - intltool, python-gnome2-dev, python-gnome2-extras-dev, iceweasel, python-gst0.10, sgml-data, + intltool, python-gnome2-dev, python-gnome2-extras-dev, firefox-dev, python-gst0.10, sgml-data, libgail-dev, at-spi Standards-Version: 3.7.2 XS-Python-Version: current @@ -14,7 +15,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, gstreamer0.10-alsa, python-gtk2, python-pyogg (>= 1.3-1.1), python-pymad, python-dbus, python-gnome2, python-gnome2-extras, gstreamer0.10-plugins-good, python-gst0.10 (>= 0.10.4-4), gstreamer0.10-plugins-base, - python-pysqlite2, python-pyvorbis (>= 1.3), python-mutagen (>= 1.8), python-elementtree, + python-pysqlite2, python-pyvorbis (>= 1.3), python-mutagen (>= 1.8), firefox, python-glade2, notification-daemon Recommends: gstreamer0.10-x, gstreamer0.10-esd, serpentine, python-musicbrainz2, python-tunepimp (>= 0.5) diff -u listen-0.5/debian/changelog listen-0.5/debian/changelog --- listen-0.5/debian/changelog +++ listen-0.5/debian/changelog @@ -1,3 +1,16 @@ +listen (0.5-4ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/patches: + + Added 07_makefile_works, so we have a good LD_LIBRARY_PATH (#87959) + - debian/control: + + Build-depend on firefox-dev instead of iceweasel + + Depend on firefox + + Do not depend on python-elementtree, since it's included in python2.5 + + Updated Maintainer field to match Debian-Maintainer-Spec + + -- Arthur Loiret Tue, 5 Jun 2007 12:07:23 +0200 + listen (0.5-4) unstable; urgency=low * Added python-tunepimp as recommend @@ -8,6 +21,19 @@ -- Julien Valroff Wed, 30 May 2007 18:39:41 +0200 +listen (0.5-3ubuntu1) gutsy; urgency=low + + * Merge with Debian (LP: #118030), remaining Ubuntu changes: + - debian/patches: + + Added 07_makefile_works, so we have a good LD_LIBRARY_PATH (LP: #87959) + - debian/control: + + Build-depend on firefox-dev instead of iceweasel + + Depend on firefox + + Do not depend on python-elementtree, since it's included in python2.5 + + Updated Maintainer field to match Debian-Maintainer-Spec + + -- Emilio Pozuelo Monfort Wed, 30 May 2007 17:56:49 +0200 + listen (0.5-3) unstable; urgency=low * Added notification-daemon as runtime dependency (Closes: #425877) @@ -68,6 +94,73 @@ -- Julien Valroff Sat, 17 Mar 2007 11:58:46 +0100 +listen (0.5-0ubuntu4) gutsy; urgency=low + + * debian/patches: + - Added 06_from_svn_mmkeys.patch (LP: #105001) + - Added 04_makefile_works.patch (LP: #87959) + + Removed 04_gtkmozembed.patch and 05_listen_bin.patch (not needed + anymore, due to 04_makefile_works.patch) + - Added 07_listen.py.patch (fixes lintian errors) + * debian/control: + - Added missing dependency on python-glade2 and firefox + - Build-depend on firefox-dev instead of firefox + * debian/rules: + - Don't modify listen.py's hashbang (it's not there anymore because of + 07_listen.py.patch) + + -- Emilio Pozuelo Monfort Sat, 19 May 2007 13:31:40 +0200 + +listen (0.5-0ubuntu3) feisty; urgency=low + + * debian/patches + - added 04_gtkmozembed.patch and 05_listen_bin.patch (LP: #86744) + + -- Emilio Pozuelo Monfort Wed, 21 Feb 2007 19:04:55 +0100 + +listen (0.5-0ubuntu2) feisty; urgency=low + + * debian/control + - added python-gnome2-dev, python-gnome2-extras-dev, firefox, sgml-data + and python-gst0.10 to build-deps (fix FTBFS) + - added libgail-dev and at-spi to build-des to add accessibility support + * debian/rules + - removed dh_python call + * Thanks to geser, bddebian and slomo :) + + -- Emilio Pozuelo Monfort Tue, 20 Feb 2007 16:30:58 +0100 + +listen (0.5-0ubuntu1) feisty; urgency=low + + * New upstream release (LP: #84946; #74270) + + * debian/rules + - Fixed listen.png path (changed in upstream) + - Commented /mutagen/_sanity.sh line, as it no longer exist + + * debian/patches + - 20_notification_area_restore.patch dropped (fixed upstream) + - 15_desktop.patch dropped (useless) + - 10_fix_exception.patch dropped (fixed upstream) + - 05_remove_shebangs.patch dropped (fixed upstream) + - 00_Makefile.patch dropped (some fixed, some useless) + - 01_images_dir.patch dropped (useless) + - 01_desktop_entry.patch added + - 02_utf-8.patch added + - 03_fixed_dbus.patch added + + * debian/control + - changed maintainer and added XSBC-Original-Maintainer + - changed project url + - added python-mutagen (>= 1.8) to build-dependencies + - added intltool to both deps and build-deps + + * debian/copyright + - changed download url + - updated copyright (included 2007) + + -- Emilio Pozuelo Monfort Thu, 15 Feb 2007 17:05:35 +0100 + listen (0.4.3-2) unstable; urgency=low * Sync with Ubunutu @@ -76,6 +169,18 @@ -- Julien Valroff Tue, 20 Feb 2007 10:29:36 +0100 +listen (0.4.3-1ubuntu2) feisty; urgency=low + + * Drop (build-)dependencies on versioned python packages. + + -- Matthias Klose Mon, 15 Jan 2007 17:41:53 +0100 + +listen (0.4.3-1ubuntu1) feisty; urgency=low + + * Fix broken restore from notification area. Fixes LP#78060 + + -- Soren Hansen Mon, 8 Jan 2007 22:11:06 +0100 + listen (0.4.3-1) unstable; urgency=low * Initial upload to Debian (Closes: #356289) only in patch2: unchanged: --- listen-0.5.orig/debian/patches/07_makefile_works.patch +++ listen-0.5/debian/patches/07_makefile_works.patch @@ -0,0 +1,40 @@ +--- Makefile.orig 2007-04-14 02:22:44.000000000 +0200 ++++ Makefile 2007-04-14 02:24:28.000000000 +0200 +@@ -4,11 +4,6 @@ + + VERSION ?= 0.5.99 + +-# 1 = Add LD_LIBRARY_PATH=/path/to/firefox/mozembed/so/file when listen start +-# to prevent segmentfault on wikipedia and lyrics widget for broken python-gtkmozemebed on some distribution like ubuntu edgy/dapper +- +-USE_MOZEMBED_HACK ?= 0 +- + #0 = don't check dependencies usefull to make distribued packages + CHECK_DEPENDS ?= 0 + +@@ -22,10 +17,9 @@ + DBUSDIR = $(DATADIR)/dbus-1 + + +-GTKMOZEMBED_PATH = $(shell pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null | sed -e "s/-L//g" -e "s/[ ]/\,/" -e "s/[ ]//g" ) +-CONFIGURE_IN_MOZEMBED_HACK= sed -e 's!GTKMOZEMBED_PATH!LD_LIBRARY_PATH=$(GTKMOZEMBED_PATH)!g' ++GTKMOZEMBED_PATH = $(shell pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null | sed -e "s/-L//g" -e "s/[ ]//g" ) + +-CONFIGURE_IN = sed -e 's!GTKMOZEMBED_PATH!!g' -e 's!PYTHON!$(PYTHON)!g' -e 's!LIBDIR!$(LIBDIR)!g' -e 's!DATADIR!$(DATADIR)!g' -e 's!PREFIX!$(PREFIX)!g' -e 's!BINDIR!$(BINDIR)!g' -e 's!LOCALEDIR!$(LOCALEDIR)!g' ++CONFIGURE_IN = sed -e 's!GTKMOZEMBED_PATH!LD_LIBRARY_PATH=$(GTKMOZEMBED_PATH)!g' -e 's!PYTHON!$(PYTHON)!g' -e 's!LIBDIR!$(LIBDIR)!g' -e 's!DATADIR!$(DATADIR)!g' -e 's!PREFIX!$(PREFIX)!g' -e 's!BINDIR!$(BINDIR)!g' -e 's!LOCALEDIR!$(LOCALEDIR)!g' + + FILES_IN = misc/listen.in misc/org.gnome.Listen.service.in src/dists.py.in + +@@ -40,11 +34,7 @@ + all: check mmkeys.so po-data + docbook2x-man misc/listen.1.docbook --to-stdout | gzip > misc/listen.1.gz + for fn in $(FILES_IN) ; do \ +- if [ $(USE_MOZEMBED_HACK) -eq 1 ]; then \ +- IN=`cat $$fn | $(CONFIGURE_IN_MOZEMBED_HACK) | $(CONFIGURE_IN)`; \ +- else \ +- IN=`cat $$fn | $(CONFIGURE_IN)`; \ +- fi ;\ ++ IN=`cat $$fn | $(CONFIGURE_IN)`; \ + F_OUT=`echo $$fn | sed -e 's/\.in$$//g'`; \ + echo "$$IN" > $$F_OUT; \ + done