diff -u miro-1.2.8/debian/control miro-1.2.8/debian/control --- miro-1.2.8/debian/control +++ miro-1.2.8/debian/control @@ -1,7 +1,8 @@ Source: miro Section: net Priority: extra -Maintainer: Uwe Hermann +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Uwe Hermann Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python2.5 (>= 2.5.2-6), @@ -20,7 +21,7 @@ pkg-config, libxv-dev, libssl-dev, - libffi-dev, + libffi-dev Standards-Version: 3.8.0 Homepage: http://www.getmiro.com @@ -32,7 +33,7 @@ python-dbus, python-gtk2, python-gnome2, - python-gtkmozembed (>= 2.19.1), + python-gnome2-extras (>= 2.19.1), python-glade2, python-pysqlite2, python-gst0.10, @@ -42,6 +43,7 @@ xulrunner-1.9, miro-data (>= 1.2.8-1) Suggests: ttf-dejavu, python-psyco [i386 hurd-i386 netbsd-i386 kfreebsd-i386] +Conflicts: miro-data (<< 1.2.6) Description: GTK+ based RSS video aggregator Miro (previously known as Democracy Player) is a platform for Internet television and video. @@ -72,13 +73,0 @@ - -Package: democracyplayer-data -Architecture: all -Depends: miro-data -Description: GTK+ based RSS video aggregator data files - Miro (previously known as Democracy Player) is a platform for Internet - television and video. - It allows you to download and watch videos from RSS feeds (including - podcasts, video blogs, and BitTorrent feeds). - . - This package is a transitional package to ease upgrades from the old - democracyplayer packages. It can be safely removed. - diff -u miro-1.2.8/debian/changelog miro-1.2.8/debian/changelog --- miro-1.2.8/debian/changelog +++ miro-1.2.8/debian/changelog @@ -1,3 +1,16 @@ +miro (1.2.8-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #294459), remaining changes: + - Depend on python-gnome2-extras rather than python-gtkmozembed + - debian/patches/81_inhibit_gnome_screensaver + - Inhibit GNOME Screensaver when playing fullscreen video. (LP: #207794) + Patch based on patch from upstream trac: + http://bugzilla.pculture.org/show_bug.cgi?id=3067 + * debian/control + - Add Conflicts with miro-data < 1.2.6 (LP: #296175) + + -- Joseph M Smith Sat, 15 Nov 2008 21:21:59 -0800 + miro (1.2.8-1) unstable; urgency=low * New upstream release (Closes: #496874). @@ -25,6 +38,24 @@ -- Uwe Hermann Fri, 31 Oct 2008 13:02:38 +0100 +miro (1.2.6-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #258401,#213667) + * Merge from Debian first (LP: #255261) + + New Ubuntu changes: + - Depend on python-gnome2-extras rather than python-gtkmozembed + * Drop unnecessary democracyplayer-data transitional package (LP: #242968) + * debian/patches/91_fix_movie_dir_selector + + Drop; this worked around a GTK+ bug which has been fixed + * debian/patches/81_inhibit_gnome_screensaver + + Inhibit GNOME Screensaver when playing fullscreen video. (LP: #207794) + Patch based on patch from upstream trac: + http://bugzilla.pculture.org/show_bug.cgi?id=3067 + * debian/rules + + Add more detritus to the clean target + + -- Christopher James Halse Rogers Mon, 18 Aug 2008 07:53:05 +1000 + miro (1.2.3-2) unstable; urgency=low * Acknowledge NMU, thanks Mike Hommey (Closes: #480808). @@ -39,6 +70,19 @@ -- Uwe Hermann Mon, 30 Jun 2008 12:02:56 +0200 +miro (1.2.3-1.1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #236350), remaining changes: + - debian/control: + + Build-depend on xulrunner-1.9-dev; Debian's xul packages are still + named differently to ours. + * New changes: + - debian/patches/91_fix_movie_dir_selector + + Gtk.FileChooser.get_filename() gets only the final component of the + filename; this makes the "download movies to" selector break Miro. + + -- Christopher James Halse Rogers (RAOF) Sun, 22 Jun 2008 18:34:08 +1000 + miro (1.2.3-1.1) unstable; urgency=low * Non-maintainer upload. @@ -163,6 +207,26 @@ -- Uwe Hermann Tue, 12 Feb 2008 01:15:49 +0100 +miro (1.1.2-0ubuntu2) hardy; urgency=low + + * The "I don't know what you're talking about, officer" upload. + * debian/control + + Remove superfluous libgnutls-dev build-dependency + + Tighten versioned dependency on miro-data + * Notes that should have been in previous changelog: + + debian/control: + - Add new libssl-dev build-dependency for embedded libtorrent + + debian/copyright: + - Add copyright information for the new embedded libtorrent library + + -- Christopher James Halse Rogers Thu, 14 Feb 2008 19:41:03 +1100 + +miro (1.1.2-0ubuntu1) hardy; urgency=low + + * New upstream release + + -- Christopher James Halse Rogers Sat, 09 Feb 2008 13:37:10 +1100 + miro (1.0-2) unstable; urgency=low * Fix problem with multiple "crash report" windows popping up without @@ -179,6 +243,49 @@ -- Uwe Hermann Thu, 20 Dec 2007 13:15:20 +0100 +miro (1.0-1ubuntu2) hardy; urgency=low + + * Enable xulrunner-1.9 build (LP #175413): + + debian/patches/80_xul1.9: + - platform/gtk-x11/frontend_implementation/* + + Update to 1.9 API + - platform/gtk-x11/setup.py: + + test for libxul-embedding, add /usr/include/xulrunner-*/unstable to + include_dirs and append -DXPCOM_GLUE to compile_extra_flags + + -- Alexander Sack Tue, 11 Dec 2007 12:23:36 +0100 + +miro (1.0-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #162310). Remaining Ubuntu changes: + + debian/control: + - libxul-dev -> firefox-dev + - DebianMaintainerField + - Provide real transitional democracyplayer package + + debian/pyversions + - 2.4 -> 2.5 + + debian/rules + - Use pyversions rather than hardcoding 2.4 + * New upstream version fixes invalid mime file (LP: #150851, LP: #150674) + * debian/rules: + + Remove remaining hardcoded python version numbers; + use DEB_PYTHON_COMPILE_VERSION everywhere. + * debian/control: + + Break the long depends lists into one depends per line for readability + + Add libxine1-x dependency (LP: #159338) + + Bump standards version; no changes needed. + * debian/watch: + + Add a shiny new watch file. + * debian/patches/50_honour_xine_driver.patch + + Make Miro honour the --xine-driver command line option (Debian: #453406) + * debian/patches/60_xine_extractor_path.patch + * debian/miro.install + + Install xine_extractor into /usr/lib/miro rather than /usr/libexec, + and make Miro look for it there (Debian: #454603, #451980, #452708, + #452486) + + -- Christopher James Halse Rogers Fri, 16 Nov 2007 17:05:43 +1100 + miro (1.0-1) unstable; urgency=low * New upstream release (Closes: #449131, #451207). @@ -238,6 +345,60 @@ -- Uwe Hermann Tue, 11 Sep 2007 21:14:06 +0200 +miro (0.9.8.1-0ubuntu5) gutsy; urgency=low + + * Fix wrapper to pass arguments to miro.real (LP: #147496) + + -- Christopher James Halse Rogers Sat, 06 Oct 2007 14:09:59 +1000 + +miro (0.9.8.1-0ubuntu4) gutsy; urgency=low + + * Fix mime info file (LP: #146345) + + -- Christopher James Halse Rogers Tue, 18 Sep 2007 15:04:23 +1000 + +miro (0.9.8.1-0ubuntu3) gutsy; urgency=low + + * debian/control: + + Add a real transitional democracyplayer package. The previous + Provides/Conflicts/Replaces is not sufficient to ensure smooth upgrades. + + -- Christopher James Halse Rogers (RAOF) Fri, 14 Sep 2007 17:31:57 +1000 + +miro (0.9.8.1-0ubuntu2) gutsy; urgency=low + + * Rebuild with boost 1.34.1. + * debian/patches/30_libboost_python.patch: Removed. + + -- Michael Bienia Mon, 10 Sep 2007 17:12:00 +0200 + +miro (0.9.8.1-0ubuntu1) gutsy; urgency=low + + * New upstream version, new name (LP: #129043) + * debian/control: + + python2.5-dev -> python-dev, we have to build against the default python, + this silences a lintian error + + Provides/Conflicts/Replaces democracyplayer, to provide a smooth upgrade + path for existing users. + + Recommend libxine1-ffmpeg (LP: #133496) + * debian/patches/10_movies_dir + + Update for new version + * debian/rules + + Remove some more useless testing files from the binary + * debian/democracyplayer.wrapper + + Remove wrapper, now included upstream + * debian/patches/80-fix-version-number: + + Make miro report its version as 0.9.8.1 (which is the tarball's version), + not 0.9.8-svn + * debian/menu + * debian/README.Debian + + Update for name change + * debian/patches/90_remove_shebang_from_feedparser + + Remove /usr/bin/env python shebang from feedparser.py (ick!) - it's + not used as a script by miro. + + -- Christopher James Halse Rogers (RAOF) Wed, 22 Aug 2007 08:51:16 +1000 + democracyplayer (0.9.6-2) unstable; urgency=low * The "Night of the Living Dead" release. @@ -256,6 +417,21 @@ -- Uwe Hermann Fri, 17 Aug 2007 15:53:17 +0200 +democracyplayer (0.9.6-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable (Closes: #120946). Remaining Ubuntu changes: + + debian/patches/70_update_dbus_usage + - Update for new upstream version. + + python->python2.5-dev, libxul-dev->firefox-dev + + wrapper to set LD_LIBRARY_PATH + + DebainMaintainerField + * debian/patches/80_use_python2.5 + + Dropped, upstream now spawns "python" rather than "python2.4" + * debian/patches/90_fix_libbost_linkage + + Dropped, now fixed in debian's 30_libboost_python + + -- Christopher James Halse Rogers (RAOF) Wed, 20 Jun 2007 10:43:59 +1000 + democracyplayer (0.9.6-1) unstable; urgency=low * New upstream release. @@ -267,6 +443,21 @@ -- Uwe Hermann Tue, 05 Jun 2007 12:57:36 +0200 +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. @@ -287,6 +478,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. @@ -294,6 +513,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 @@ -308,6 +541,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: --- miro-1.2.8.orig/merge-buildpackage +++ miro-1.2.8/merge-buildpackage @@ -0,0 +1,2 @@ +#!/bin/sh +exec dpkg-buildpackage -S -v1.2.6-0ubuntu1 -sa "$@" only in patch2: unchanged: --- miro-1.2.8.orig/debian/patches/81_inhibit_gnome_screensaver.patch +++ miro-1.2.8/debian/patches/81_inhibit_gnome_screensaver.patch @@ -0,0 +1,55 @@ +diff -Nur -x '*.orig' -x '*~' miro-1.2.6/platform/gtk-x11/platform/frontends/html/mainwindowchanger.py miro-1.2.6.new/platform/gtk-x11/platform/frontends/html/mainwindowchanger.py +--- miro-1.2.6/platform/gtk-x11/platform/frontends/html/mainwindowchanger.py 2008-08-18 09:38:01.000000000 +1000 ++++ miro-1.2.6.new/platform/gtk-x11/platform/frontends/html/mainwindowchanger.py 2008-08-18 09:40:53.000000000 +1000 +@@ -34,6 +34,8 @@ + from miro.platform.utils import confirmMainThread + import logging + ++import dbus ++ + class MainWindowChanger(object): + """Change which widgets are visible in the main window based on its + current state. The following states are possible: +@@ -127,15 +129,18 @@ + def updateState (self): + # Handle fullscreen + confirmMainThread() ++ + try: + fullscreen = (self.isFullScreen and self.currentState == self.VIDEO) + activeRenderer = app.htmlapp.videoDisplay.activeRenderer + if fullscreen and (not self.wasFullScreen): ++ self.updateScreensaver(True) + self.widgetTree['main-window'].fullscreen() + if activeRenderer != None: + activeRenderer.goFullscreen() + self.wasFullScreen = True + elif (not fullscreen) and self.wasFullScreen: ++ self.updateScreensaver(False) + self.widgetTree['main-window'].unfullscreen() + if activeRenderer != None: + activeRenderer.exitFullscreen() +@@ -225,6 +230,23 @@ + self.updateState() + return False + ++ def updateScreensaver(self, suspend): ++ confirmMainThread() ++ ++ bus = dbus.SessionBus() ++ # If the GNOME Screensaver is running, twiddle its state. ++ if bus.name_has_owner('org.gnome.ScreenSaver') : ++ obj = bus.get_object('org.gnome.ScreenSaver', ++ '/org/gnome/ScreenSaver') ++ ++ prog = "Miro" ++ reason = "Playing a video" ++ ++ if(suspend): ++ self.cookie = obj.Inhibit(prog, reason) ++ else: ++ obj.UnInhibit(self.cookie) ++ + def changeFullScreen (self, fullscreen): + confirmMainThread() +