diff -u democracyplayer-0.9.5.3/debian/control democracyplayer-0.9.5.3/debian/control --- democracyplayer-0.9.5.3/debian/control +++ democracyplayer-0.9.5.3/debian/control @@ -1,13 +1,14 @@ Source: democracyplayer Section: net Priority: optional -Maintainer: Uwe Hermann -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python, python-support (>= 0.6), python-pyrex, libboost-python-dev, python-gtk2-dev, python-gnome2-extras-dev (>= 2.14.0-2), python-dbus, libxul-dev (>= 1.8.0.4-2), libxine-dev +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Uwe Hermann +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python2.5-dev, python-support (>= 0.6), python-pyrex, libboost-python-dev, python-gtk2-dev, python-gnome2-extras-dev (>= 2.14.0-2), python-dbus, firefox-dev, libxine-dev Standards-Version: 3.7.2 Package: democracyplayer Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, democracyplayer-data (>= 0.9.5.3-1) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, democracyplayer-data (>= 0.9.5.3-1), firefox Python-Depends: python-gtk2, python-gnome2, python-gnome2-extras (>= 2.14.0-2), python-glade2 Suggests: ttf-bitstream-vera, python-psyco Description: GTK+ based RSS video aggregator diff -u democracyplayer-0.9.5.3/debian/pyversions democracyplayer-0.9.5.3/debian/pyversions --- democracyplayer-0.9.5.3/debian/pyversions +++ democracyplayer-0.9.5.3/debian/pyversions @@ -1 +1 @@ -2.4- +2.5 diff -u democracyplayer-0.9.5.3/debian/rules democracyplayer-0.9.5.3/debian/rules --- democracyplayer-0.9.5.3/debian/rules +++ democracyplayer-0.9.5.3/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f DEB_PYTHON_SYSTEM = pysupport -DEB_PYTHON_COMPILE_VERSION = 2.4 +DEB_PYTHON_COMPILE_VERSION = 2.5 # Must be included before python-distutils.mk to use dh_python/dh_pysupport. include /usr/share/cdbs/1/rules/debhelper.mk @@ -17,6 +17,13 @@ # Install everything into debian/tmp, as we have a multi-binary package. DEB_DH_INSTALL_SOURCEDIR := debian/tmp +#install the wrapper +install/democracyplayer:: + mv $(CURDIR)/debian/tmp/usr/bin/democracyplayer \ + $(CURDIR)/debian/tmp/usr/bin/democracyplayer.real + /usr/bin/install --mode 755 debian/democracyplayer.wrapper \ + $(CURDIR)/debian/tmp/usr/bin/democracyplayer + # Remove unneeded files from the deb. binary-post-install/democracyplayer:: rm -rf debian/democracyplayer/usr/share/python-support/democracyplayer/democracy/compiled_templates/unittest diff -u democracyplayer-0.9.5.3/debian/changelog democracyplayer-0.9.5.3/debian/changelog --- democracyplayer-0.9.5.3/debian/changelog +++ democracyplayer-0.9.5.3/debian/changelog @@ -1,3 +1,18 @@ +democracyplayer (0.9.5.3-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + + Remove use of old, non-public DBUS API + + Use python2.5 everywhere + + Add a wrapper to set LD_LIBRARY_PATH + + Update maintainer field + * debian/patches/90_fix_libboost_linkage + + boost-python no longer ships libboost_python.so, instead it + ships libboost_python-st.so & -mt.so + * debian/patches/70_update_dbus_usage + + Update for new upstream version + + -- Christopher James Halse Rogers (RAOF) Sun, 20 May 2007 00:01:34 +1000 + democracyplayer (0.9.5.3-1) unstable; urgency=low * New upstream release. @@ -18,6 +33,34 @@ -- Uwe Hermann Sun, 15 Apr 2007 16:58:06 +0200 +democracyplayer (0.9.2.1-2.1ubuntu2) feisty; urgency=low + + * debian/patches/70_update_dbus_usage + + Patch from upstream Trac, to remove usage of old, non-public DBUS API + * debian/control: python-all-dev -> python2.5-dev + * debian/pyversions: change to only 2.5 + + depends on libboost-python, which is only available for python2.5 + * debian/patches/80_use_python2.5 + + spawn subprocesses with python2.5 rather than python2.4, since + libboost-python will segfault with anything else + * debian/democracyplayer.wrapper: Add a wrapper to set LD_LIBRARY_PATH, + fixes segfault on startup. + * By the combined power of above, close LP: #81798 + + -- Christopher James Halse Rogers (RAOF) Wed, 11 Apr 2007 15:12:33 +1000 + +democracyplayer (0.9.2.1-2.1ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/control: python2.4-dbus -> python-dbus, python -> + python-all-dev, libxul-dev (>= 1.8.0.4-2) -> firefox-dev, + fixes FTBFS. + - This merge, given the existing python-dbus rebuild currently + in 7.04, Closes Ubuntu: #76493, #76801, #78230, #80664 + (and likely #64882, #65943, #77201, #77741, #77756 as well). + + -- Daniel T Chen Fri, 19 Jan 2007 19:03:58 -0500 + democracyplayer (0.9.2.1-2.1) unstable; urgency=low * Non-maintainer upload with the agreement of the Maintainer. @@ -25,6 +68,20 @@ -- Margarita Manterola Wed, 3 Jan 2007 13:29:17 -0300 +democracyplayer (0.9.2.1-2ubuntu2) feisty; urgency=low + + * Fakesync to fix translations FTBFS. + + -- Daniel T Chen Mon, 1 Jan 2007 00:41:13 -0500 + +democracyplayer (0.9.2.1-2ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining change: + - debian/control: python2.4-dbus -> python-dbus, python -> + python-all-dev. + + -- Daniel T Chen Sun, 31 Dec 2006 19:53:01 -0500 + democracyplayer (0.9.2.1-2) unstable; urgency=low * Fix incorrect versioned dependency on democracyplayer-data by @@ -39,6 +96,14 @@ -- Uwe Hermann Sat, 9 Dec 2006 23:55:19 +0100 +democracyplayer (0.9.2.1-1ubuntu1) feisty; urgency=low + + * debian/control: python2.4-dbus -> python-dbus, + python -> python-all-dev. Resolves lintian errors and fixes + FTBFS. + + -- Daniel T Chen Sat, 9 Dec 2006 01:01:24 -0500 + democracyplayer (0.9.2.1-1) unstable; urgency=low * New upstream release. only in patch2: unchanged: --- democracyplayer-0.9.5.3.orig/debian/democracyplayer.wrapper +++ democracyplayer-0.9.5.3/debian/democracyplayer.wrapper @@ -0,0 +1,2 @@ +#!/bin/sh +LD_LIBRARY_PATH=/usr/lib/firefox democracyplayer.real only in patch2: unchanged: --- democracyplayer-0.9.5.3.orig/debian/patches/70_update_dbus_usage.patch +++ democracyplayer-0.9.5.3/debian/patches/70_update_dbus_usage.patch @@ -0,0 +1,51 @@ +diff -Nur democracyplayer-0.9.5.3/platform/gtk-x11/onetime.py democracyplayer-0.9.5.3.new/platform/gtk-x11/onetime.py +--- democracyplayer-0.9.5.3/platform/gtk-x11/onetime.py 2007-03-20 08:01:54.000000000 +1100 ++++ democracyplayer-0.9.5.3.new/platform/gtk-x11/onetime.py 2007-05-19 22:52:12.000000000 +1000 +@@ -50,7 +50,8 @@ + bus = dbus.Bus() + + # otherwise register the name +- retval = dbus.dbus_bindings.bus_request_name(bus.get_connection(), name, flags=flags) ++ conn = bus.get_connection() ++ retval = dbus.dbus_bindings.bus_request_name(conn, name, flags) + + # TODO: more intelligent tracking of bus name states? + if retval == dbus.dbus_bindings.REQUEST_NAME_REPLY_PRIMARY_OWNER: +@@ -73,6 +74,7 @@ + bus_name = object.__new__(cls) + bus_name._bus = bus + bus_name._name = name ++ bus_name._conn = conn + + return bus_name + +@@ -84,7 +86,7 @@ + # we can delete the low-level name here because these objects + # are guaranteed to exist only once for each bus name + def __del__(self): +- dbus_bindings.bus_release_name(self._bus.get_connection(), self._name) ++ dbus.dbus_bindings.bus_release_name(self._bus.get_connection(), self._name) + pass + + def get_bus(self): +@@ -95,6 +97,10 @@ + """Get the name of this service""" + return self._name + ++ def get_connection(self): ++ """Get the connection for this service""" ++ return self._conn ++ + def __repr__(self): + return '' % (self._name, self._bus, id(self)) + __str__ = __repr__ +@@ -103,7 +109,8 @@ + def __init__(self): + bus = dbus.SessionBus() + bus_name = BusNameFlags('org.participatoryculture.dtv.onetime', bus=bus, flags=dbus.dbus_bindings.NAME_FLAG_DO_NOT_QUEUE) +- dbus.service.Object.__init__(self, bus_name, '/org/participatoryculture/dtv/OneTime') ++ dbus.service.Object.__init__(self, bus_name=bus_name, ++ object_path='/org/participatoryculture/dtv/OneTime') + + @dbus.service.method('org.participatoryculture.dtv.OneTimeIface') + def HandleArgs (self, args): only in patch2: unchanged: --- democracyplayer-0.9.5.3.orig/debian/patches/90_fix_libboost_linkage.patch +++ democracyplayer-0.9.5.3/debian/patches/90_fix_libboost_linkage.patch @@ -0,0 +1,12 @@ +diff -Nur democracyplayer-0.9.5.3/platform/gtk-x11/setup.py democracyplayer-0.9.5.3.new/platform/gtk-x11/setup.py +--- democracyplayer-0.9.5.3/platform/gtk-x11/setup.py 2007-03-20 08:01:54.000000000 +1100 ++++ democracyplayer-0.9.5.3.new/platform/gtk-x11/setup.py 2007-05-19 17:49:43.000000000 +1000 +@@ -21,7 +21,7 @@ + ## Paths and configuration ## + ############################################################################### + +-BOOST_LIB = 'boost_python' ++BOOST_LIB = 'boost_python-mt' + + ############################################################################### + ## End of configuration. No user-servicable parts inside ## only in patch2: unchanged: --- democracyplayer-0.9.5.3.orig/debian/patches/80_use_python2.5.patch +++ democracyplayer-0.9.5.3/debian/patches/80_use_python2.5.patch @@ -0,0 +1,9 @@ +diff -Nur democracyplayer-0.9.5.3.orig/platform/gtk-x11/frontend_implementation/UIBackendDelegate.py democracyplayer-0.9.5.3.orig.new/platform/gtk-x11/frontend_implementation/UIBackendDelegate.py +--- democracyplayer-0.9.5.3.orig/platform/gtk-x11/frontend_implementation/UIBackendDelegate.py 2007-03-20 08:01:54.000000000 +1100 ++++ democracyplayer-0.9.5.3.orig.new/platform/gtk-x11/frontend_implementation/UIBackendDelegate.py 2007-04-10 22:06:23.000000000 +1000 +@@ -502,4 +502,4 @@ + # run the Democracy_Downloader script + script = os.path.join(dlDaemonPath, 'Democracy_Downloader.py') + +- os.spawnlpe(os.P_NOWAIT, "python2.4", "python2.4", script, environ) ++ os.spawnlpe(os.P_NOWAIT, "python2.5", "python2.5", script, environ)