diff -Naur miro-2.0rc3.orig/debian/changelog miro-2.0rc3/debian/changelog
--- miro-2.0rc3.orig/debian/changelog 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/changelog 2009-02-10 02:27:29.000000000 +0100
@@ -0,0 +1,445 @@
+miro (2.0rc3-1) unstable; urgency=low
+
+ * New upstream release.
+ + Fixed: Java browser plugin problems upon upgrade (Closes: #461990).
+ + Now deactivates (GNOME) screensaver during playback (Closes: #441411).
+ + Youtube downloads work fine again (Closes: #506723).
+ + The Miro icon cache is a lot smaller now (Closes: #493943).
+ * debian/patches:
+ + 10_movies_dir.patch: Updated.
+ + 20_no_autoupdate.patch: Updated.
+ + 30_disable_xine_hack.patch: Updated.
+ + 50_xine_extractor_path.patch: Drop, merged upstream.
+ + 70_rdfa_silence_lintian.patch: Drop, no longer needed.
+ + 80_gcc-4.3_headers.patch: Drop, merged upstream.
+ + 90_disable_iheartmiro_nag.patch: Drop, obsolete.
+ * Closing unreproducible bugs. Please reopen if you can reproduce the
+ problem with the latest version.
+ + Crash on startup (Closes: #502337).
+ + sqlitedb appears to have been corrupted (Closes: #497504).
+ * debian/control:
+ + Don't use duplicate package descriptions (lintian).
+ + Add ${misc:Depends} to all binary packages (lintian).
+ + Drop no longer needed dependencies on imagemagick and chrpath.
+ + Make 'python-psyco' a Recommends instead of Suggests as it allows
+ for potential application speed-ups.
+ + Suggests: python-notify (optional).
+ + Add Conflicts with miro-data (<< 1.2.1) (see Ubuntu LP #296175), as
+ the miro.desktop file moved from miro-data to the miro package there.
+ + Turn all gstreamer-related dependencies into Suggests for now, in order
+ to make a smaller Miro install possible (e.g. on netbooks, where disk
+ space is often a scarce resource). Xine is still the default renderer
+ as of Miro 2.0 so the xine libs are a requirement. If you want to use
+ gstreamer instead, you have to install the Suggests packages...
+ * debian/rules:
+ + Invoke dh_desktop as we install a *.dektop file (lintian).
+ + Clear DEB_PYTHON_CLEAN_ARGS, as Miro's setup.py doesn't know about
+ the default argument '-a', which cdbs tries to use upon 'clean'.
+ + Update list of files to remove in the 'clean' target.
+
+ -- Uwe Hermann <uwe@debian.org> Tue, 10 Feb 2009 02:06:40 +0100
+
+miro (1.2.8-2) unstable; urgency=low
+
+ * Add build dependencies on a base set of gstreamer plugins, so that
+ users who want to use gstreamer instead of xine can safely do so:
+ gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-x,
+ gstreamer0.10-ffmpeg.
+ * Disable the "xine hack" in Miro. This has been identified to fix a
+ reproducible segfault after a video ends (Closes: #512719).
+ Please report if disabling the "xine hack" causes any problems.
+ An alternative fix seems to be to switch to gstreamer as backend in
+ Miro's options dialog (and restart Miro).
+ * Closing unreproducible bugs. Please reopen if you can reproduce the
+ problem with the latest version.
+ + miro: freezes after startup (Closes: #498682).
+
+ -- Uwe Hermann <uwe@debian.org> Wed, 04 Feb 2009 02:38:52 +0100
+
+miro (1.2.8-1) unstable; urgency=low
+
+ * New upstream release (Closes: #496874).
+ + Youtube video downloads should work again, see upstream bug
+ http://bugzilla.pculture.org/show_bug.cgi?id=10656.
+ + Closing unreproducible (with the latest release) bugs:
+ + MIRO NOT WORKING (Closes: #502194).
+ Both the feed mentioned and video search is working fine.
+ + NBC News podcast corrupted if download is resumed (Closes: #496233).
+ Works fine with both, Miro 1.2.8, and mplayer. Must have been some
+ oddness with the feed itself.
+ + miro (version 1.2.3-2) segmentation fault (Closes: #489891).
+ No longer occuring according to the BTS, never reproducible by me.
+ + miro: If the XVideo extension is missing, video has wrong colors and
+ extremly low framerate (Closes: #459069, #473310).
+ This problem goes away if you use 'miro --xine-driver=xhsm' and will
+ not be relevant soon anymore, as Miro switches to gstreamer
+ upstream with the next major release. Added a note to README.Debian.
+ + [miro] Crash on startup (Closes: #500061).
+ Unreproducible by me, reporter says the problem was not Miro-related.
+ * debian/miro.lintian-overrides: Added file. Silence lintian warning about
+ an embedded version of 'feedparser'. We cannot use the Debian package
+ of 'feedparser' as Miro uses a highly modified version of it.
+ * debian/rules: Remove more files in the 'clean' target.
+
+ -- Uwe Hermann <uwe@debian.org> Fri, 31 Oct 2008 13:02:38 +0100
+
+miro (1.2.3-2) unstable; urgency=low
+
+ * Acknowledge NMU, thanks Mike Hommey (Closes: #480808).
+ * Standards-Version: 3.8.0 (no changes required).
+ * Depend on python-gtkmozembed instead of python-gnome2-extras as we only
+ use the gtkmozembed module (Closes: #485295).
+ * Close bugs which are no longer relevant:
+ + Miro does not really depends on libxine 1.1.12 (Closes: #480867).
+ + Miro doesn't work since recent upgrade of python (Closes: #481574).
+ This has been likely fixed in Python >= 2.5.2-6, so bump dependencies.
+ * Add explicit build-dependency on pkg-config.
+
+ -- Uwe Hermann <uwe@debian.org> Mon, 30 Jun 2008 12:02:56 +0200
+
+miro (1.2.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control:
+ + Build-depend on xulrunner-dev instead of libxul-dev, and newer releases
+ of python-gnome2-extras-dev that use xulrunner-1.9.
+ + Depend on xulrunner-1.9 instead of xulrunner, and newer releases of
+ python-gnome2-extras. (Closes: #480808)
+
+ -- Mike Hommey <glandium@debian.org> Mon, 09 Jun 2008 19:32:57 +0200
+
+miro (1.2.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/rules:
+ + Simplify the file a bit, drop obsolete stuff.
+ + Update 'clean' rule to drop useless stuff (to make the debdiff smaller).
+ * debian/README.Debian:
+ + Add note about the iHeartMiro Firefox plugin.
+ + Document how to use 'esddsp' with Miro.
+ * debian/copyright: Update.
+ + Drop platform/gtk-x11/coverage.py section, file has been removed.
+ * debian/control:
+ + Drop 'Recommends: libxine1-ffmpeg', we depend on it via libxine1-plugins.
+ + Move from 'optional' to 'extra' as we depend on libxine1-plugins
+ which is also 'extra'.
+ + Make python-dbus a dependency, no build-dependency.
+ + Force xulrunner to be >= 1.8.1.14 to get the latest security fixes.
+ * Not reproducible in the current release, thus closing:
+ + "esddsp democracyplayer" causes "Bus error" (Closes: #413681).
+ I verified that this works fine now, addeds docs to README.Debian.
+ + Crash playing an audio podcast (Closes: #462016).
+
+ -- Uwe Hermann <uwe@debian.org> Sat, 26 Apr 2008 21:14:56 +0200
+
+miro (1.2.1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #473139).
+ + There's a default autodownload setting option now (Closes: #439076).
+ + Torrents have a download speed limit options now (Closes: #387716).
+ + debian/patches/10_movies_dir.patch: Update.
+ + debian/patches/20_no_autoupdate.patch: Update.
+ + debian/patches/30_de_po_typo.patch: Drop, merged upstream.
+ + debian/patches/50_xine_extractor_path.patch: Update.
+ * Switch to building for Python 2.5, as Python 2.4 has been removed
+ from the archive (Closes: #476159, #476486, #445249).
+ * Build-depend on libffi-dev which is an extra package now (Closes: #472158).
+ * debian/patches/80_gcc-4.3_headers.patch: Add file, which fixes
+ compile errors with gcc 4.3 (Closes: #466757). Thanks
+ Arthur Loiret <arthur.loiret@gmail.com> for the patch!
+ * debian/menu: Add xpm icon for displaying in the Debian menu.
+ * Closing a bunch of bugs which I cannot reproduce in the latest release:
+ + miro: DbusException when starting (Closes: #466011).
+ + miro: Segfault when switching to Library during video
+ playback (Closes: #472327). Please reopen if you can reproduce this
+ multiple times in a row with the latest version.
+ + Insufficient version dependency for python-gtk2 (Closes: #443101).
+ + miro: UI freezes on keyboard input (Closes: #459039).
+ * Add python-gst0.10 dependency as Miro now supports switching the
+ renderer from xine to gstreamer via the Options menu (Closes: #466337).
+ * debian/patches/90_disable_iheartmiro_nag.patch: Added. This disables
+ the annoying nag screen to download and install the iHeartMiro Firefox
+ plugin. For a manual installation see http://www.iheartmiro.org/.
+ * Force xine to be >= 1.1.12 to get all the latest security fixes.
+ * Force xulrunner to be >= 1.8.1.13 to get all the latest security fixes.
+ * Add dependency on libxine1-plugins (thus also on libxine1-ffmpeg), as
+ we really want to be able to play all formats.
+ * Install xine_extractor into /usr/lib/miro, not /usr/libexec.
+
+ -- Uwe Hermann <uwe@debian.org> Fri, 18 Apr 2008 16:56:11 +0200
+
+miro (1.1.2-3) unstable; urgency=low
+
+ * Provide "real" transitional packages for democracyplayer -> miro upgrades.
+ * Enforce dependency on xulrunner >= 1.8.1.12-2 so we get all the recent
+ security fixes in xulrunner, plus GNU/Hurd and GNU/kFreeBSD support.
+ * Closing some more bugs I cannot reproduce in this version, in order to
+ allow miro to transition to testing. If you still see the same problems
+ in the latest release, please reopen as non-RC bugs. Having a version in
+ testing which works for most people is better than no version at all.
+ + miro crashes when done playing a video (Closes: #464862).
+ + miro crashes on playing a video or audio podcast (Closes: #462706).
+ * Finish transition of debian/copyright to machine-readable format.
+ * debian/patches/70_rdfa_silence_lintian.patch: Silence lintian.
+
+ -- Uwe Hermann <uwe@debian.org> Fri, 07 Mar 2008 23:45:20 +0100
+
+miro (1.1.2-2) unstable; urgency=low
+
+ * Add missing build-dependencies on ssl-dev, libboost-filesystem-dev,
+ libboost-thread-dev, libboost-serialization-dev, and
+ libboost-date-time-dev (Closes: #465670).
+ * Add missing dependency: imagemagick.
+ * Closing some more bugs I cannot reproduce in this version.
+ Please reopen if the problem persists.
+ + Doesn't start anymore, unless some KDE app is running (Closes: #399097).
+ + Solarization effect when playing videos the second time. This looks
+ like a driver or xine bug, not a Miro bug (Closes: #375911).
+ + Eats up all CPU time (Closes: #453647).
+ * debian/copyright:
+ + Start to convert the file to the machine-readable format described
+ at http://wiki.debian.org/Proposals/CopyrightFormat (not yet finished).
+ Based on the work done in the Ubuntu package (thanks!).
+ + Further updates, add missing items.
+
+ -- Uwe Hermann <uwe@debian.org> Fri, 15 Feb 2008 02:39:06 +0100
+
+miro (1.1.2-1) unstable; urgency=low
+
+ * New upstream release (Closes: #460442).
+ * debian/copyright: Update various entries.
+ + Miro now has a special exception which allows linking against OpenSSL.
+ + portable/BitTorrent/ is gone, portable/libtorrent/ is here.
+ * Close some bugs which I cannot reproduce in the latest Miro release.
+ Please reopen if the problem persists.
+ + Democracyplayer does not run at all (Closes: #441894).
+ + Crashes on start gecko/bug-buddy pthread_join() (Closes: #447090).
+ + Can't close: gives various error messages (Closes: #439398).
+ * Recommend 'ttf-dejavu' instead of 'ttf-bitstream-vera' which is going
+ to be removed (Closes: #461253, 461287).
+ * Channel guide links are no longer opened in a browser (Closes: #442078).
+
+ -- Uwe Hermann <uwe@debian.org> Tue, 12 Feb 2008 01:15:49 +0100
+
+miro (1.0-2) unstable; urgency=low
+
+ * Fix problem with multiple "crash report" windows popping up without
+ a real crash happening (Closes: #451980, #452708, #454603, #452486).
+ * Honor --xine-driver option (Closes: #453406).
+ * debian/control: Add Homepage field.
+ * Standards-Version: 3.7.3 (no changes required).
+ * xine-lib transition: Add explicit dependency on libxine1-x.
+ * Small fixes to reduce the diff to the Ubuntu package:
+ + Use $(DEB_PYTHON_COMPILE_VERSION) instead or hard-coding the
+ version number (but still use 2.4 in Debian for now).
+ + debian/control: Split long lines for better readability.
+ + Add watch file.
+
+ -- Uwe Hermann <uwe@debian.org> Thu, 20 Dec 2007 13:15:20 +0100
+
+miro (1.0-1) unstable; urgency=low
+
+ * New upstream release (Closes: #449131, #451207).
+ + Fixed malformed miro.xml file (Closes: #445871, #443510).
+ + Drop several patches which were applied upstream.
+ * Add missing libxv-dev build-dependency (Closes: #442832, #443006, #443045).
+ * Miro shipped with a menu file since the beginning (Closes: #443211).
+ It's currently in the 'Applications/Network/Web News' category.
+ * Fix small typo in German translation (Closes: #451333).
+ * Cannot reproduce the following bugs with this release. Please
+ reopen if you still experience problems:
+ + Miro crashes on play (Closes: #443266).
+ + Used to work; now segfaults on startup (Closes: #444484).
+ Please try removing the ~/.miro directory if the problem persists.
+ + Segfault on startup (quicktime related?) (Closes: #444051).
+ + Cannot install Miro (Closes: #443045). Unlikely to be a real bug,
+ probably stems from mixing packages from stable/unstable.
+ * New 'Recommends: libxine1-ffmpeg'.
+
+ -- Uwe Hermann <uwe@debian.org> Fri, 16 Nov 2007 02:11:55 +0100
+
+miro (0.9.9.1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #433752).
+ + Democracy Player was renamed to Miro upstream, so we now
+ use Provides/Conflicts/Replaces to transition existing installs.
+ + Update the package description (and improve it a bit).
+ + Now supports proxy settings (Closes: #426992). Miro uses the
+ default GNOME proxy, which you can set/enable using gconf-editor.
+ * Update debian/copyright.
+ * Several improvements inspired by the Ubuntu version of the package:
+ + Remove unneeded RPATH from MozillaBrowser.so (using chrpath).
+ + debian/menu: Move package into 'Applications/Network/Web News'.
+ + Drop shebang from feedparser.py, not needed (and silences lintian).
+ + Only suggest python-psyco on [i386 hurd-i386 netbsd-i386 kfreebsd-i386].
+ * miro.desktop improvements:
+ + Drop 'Encoding=UTF-8', no longer necessary (lintian).
+ + Change categories to 'AudioVideo;FileTransfer;News;P2P;TV;Player;'.
+ * Cannot reproduce the following bugs using this release of Miro.
+ Please feel free to reopen if it's still a problem.
+ + "Crashes on stop playback" (Closes: #399098).
+ According to http://bugzilla.pculture.org/show_bug.cgi?id=5197
+ this is indeed fixed in Miro 0.9.9.1.
+ + "Still crashes". Cannot reproduce with Miro (Closes: #438946).
+ + "Crashes on end of video podcast" (Closes: 419207).
+ Doesn't seem to happen with latest Miro anymore (I did see it before).
+ + Installation error. Can't reproduce, no further infos from submitter,
+ so I'm closing this. (Closes: #387248).
+ + "Crash after pressing play". Cannot reproduce (Closes: #402264).
+ + "Position slider doesn't respond to mouse click-and-drag sometimes".
+ Cannot reproduce with latest Miro (Closes: #405248).
+ + "Freezes On Start". Cannot reproduce with last Miro (Closes: #408032).
+ Also, running two instances seems to work fine for me, but it's
+ not really useful or recommended.
+ + Problem with xine plugin. Doesn't look like a Democracy Player / Miro
+ issue, but please reopen if it still happens (Closes: #420144).
+
+ -- Uwe Hermann <uwe@debian.org> Tue, 11 Sep 2007 21:14:06 +0200
+
+democracyplayer (0.9.6-2) unstable; urgency=low
+
+ * The "Night of the Living Dead" release.
+ * Fix critical python/dbus errors (Closes: #429881, #418722).
+ Thanks Krzysztof Sobiecki <sobkas@gmail.com> for the patch!
+ * Build-depend on libboost-python-dev (>= 1.34.1-2), as that version is
+ now built with Python 2.4 again, which is currently needed to make
+ Democracy Player work at all (Closes: #430659, #429407).
+ Note that we _have_ to build democracyplayer with Python 2.4 at this
+ point in time, as several of its dependencies are not yet available
+ as Python 2.5 versions in Debian.
+ * Build-depend on libxine-dev (>= 1.1.6-2), as starting with that version
+ xine plays sound/music in *.flv flash files (Closes: #396898, #387726).
+ * Drop 30_libboost_python.patch, no longer needed.
+ * Add new required dependency: python-pysqlite2.
+
+ -- Uwe Hermann <uwe@debian.org> Fri, 17 Aug 2007 15:53:17 +0200
+
+democracyplayer (0.9.6-1) unstable; urgency=low
+
+ * New upstream release.
+ + This fixes a critical dbus-python related bug (Closes: #422899).
+ * Link against libboost-python1.34.0 now, as the old
+ libboost-python1.33.1 is lo longer in the archive (Closes: #428124).
+ * Fix a libboost-related FTBFS (Closes: #427912).
+ * Fix FTBFS: /bin/sh: python2.5: command not found (Closes: #423754).
+
+ -- Uwe Hermann <uwe@debian.org> Tue, 05 Jun 2007 12:57:36 +0200
+
+democracyplayer (0.9.5.3-1) unstable; urgency=low
+
+ * New upstream release.
+ + Bigger channel descriptions if you click on a channel (Closes: #381454).
+ + Cannot reproduce search error in this release (Closes: #400555).
+ + Preferences are saved correctly now (Closes: #404188).
+ * Acknowledge NMU, thanks Margarita Manterola <marga@debian.org>
+ (Closes: #401569). Upstream integrated the translation updates and fixes
+ AFAIK, but if not please re-open (but please submit further fixes
+ upstream: https://launchpad.net/democracy/trunk/+pots/democracyplayer).
+ * Re-introduce the changelog entry from 0.9.1-1 which somehow got lost
+ (don't ask me how _that_ happened!). See #402262.
+ Thanks Margarita Manterola <marga@debian.org>.
+ * Build-Depends: python-support (>= 0.6), as we use 'Python-Depends' now.
+ * Build-Depends: python-dbus (instead of python2.4-dbus).
+ * Suggests: python-psyco (improves speed a bit).
+ * Simplified packaging a bit.
+
+ -- Uwe Hermann <uwe@debian.org> Sun, 15 Apr 2007 16:58:06 +0200
+
+democracyplayer (0.9.2.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload with the agreement of the Maintainer.
+ * Really fix incorrect plurar form for Romanian (Closes: #401569)
+
+ -- Margarita Manterola <marga@debian.org> Wed, 3 Jan 2007 13:29:17 -0300
+
+democracyplayer (0.9.2.1-2) unstable; urgency=low
+
+ * Fix incorrect versioned dependency on democracyplayer-data by
+ depending on >= 0.9.2.1-1 instead of >= 0.9.1-1 (Closes: #402263).
+ Thanks Fabio Pugliese Ornellas <fabio.ornellas@gmail.com> and
+ Margarita Manterola <margamanterola@gmail.com>.
+ * Fix incorrect plural form for Romanian (Closes: #401569).
+ Thanks Eddy Petrior <eddy.petrisor@gmail.com>.
+ * Correct typos and also update both, the Brazilian Portuguese
+ and the Spanish translations (Closes: #402262).
+ Thanks Margarita Manterola <margamanterola@gmail.com>.
+
+ -- Uwe Hermann <uwe@debian.org> Sat, 9 Dec 2006 23:55:19 +0100
+
+democracyplayer (0.9.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * According to upstream this release should now consume a lot less
+ memory (Closes: 396869).
+
+ -- Uwe Hermann <uwe@debian.org> Tue, 28 Nov 2006 12:31:11 +0100
+
+democracyplayer (0.9.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated debian/copyright to reflect recent upstream changes.
+
+ -- Uwe Hermann <uwe@debian.org> Thu, 19 Oct 2006 20:46:30 +0200
+
+democracyplayer (0.9.0.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Uwe Hermann <uwe@debian.org> Fri, 22 Sep 2006 19:36:29 +0200
+
+democracyplayer (0.9.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added dependency on python2.4-dbus to prevent trouble when someone
+ tries to start multiple instances of democracyplayer.
+ * Changed python2.4-pyrex build-dependency to python-pyrex.
+
+ -- Uwe Hermann <uwe@debian.org> Mon, 11 Sep 2006 19:45:23 +0200
+
+democracyplayer (0.8.5-3) unstable; urgency=low
+
+ * Fix broken XML file (Closes: #383854, #383294).
+ * Added missing build-dependency on python-support (>= 0.3).
+
+ -- Uwe Hermann <uwe@debian.org> Fri, 25 Aug 2006 05:53:34 +0200
+
+democracyplayer (0.8.5-2) unstable; urgency=low
+
+ * Switch to debhelper v5 (+ cdbs).
+ * Python transition (Closes: #380769).
+ + Changed lots of depends from python2.4-* to python-* (see #376979).
+ + Versioned build-deps: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2)
+ + Use pysupport.
+ * Add proper license to manpage (+ cosmetic fixes).
+
+ -- Uwe Hermann <uwe@debian.org> Wed, 2 Aug 2006 00:41:42 +0200
+
+democracyplayer (0.8.5-1) unstable; urgency=low
+
+ * New upstream release.
+ + Fixes GTK+/mozembed breakage (Closes: #376979).
+ + Move package to xulrunner: Replace mozilla-dev build dependency
+ with xulrunner-dev, and replace mozilla-browser and mozilla-psm
+ dependencies with xulrunner (Closes: #376360).
+ * Suggest: ttf-bitstream-vera (for nicer looking fonts).
+ * Do not install /usr/share/democracy/resources/testdata and
+ /usr/share/democracy/resources/templates/unittest. They're not needed
+ in the installed package, so we can save some space here.
+ * Updated debian/copyright (cosmetic changes).
+
+ -- Uwe Hermann <uwe@debian.org> Fri, 21 Jul 2006 12:50:51 +0200
+
+democracyplayer (0.8.4.1-1) unstable; urgency=low
+
+ * New upstream release.
+ + Remove patch which applies 'gzip -9' to the manpage, it's now
+ included upstream.
+
+ -- Uwe Hermann <uwe@debian.org> Tue, 27 Jun 2006 11:50:10 +0200
+
+democracyplayer (0.8.3+0.8.4rc0-1) unstable; urgency=low
+
+ * Initial release (Closes: #338808, #365303).
+
+ -- Uwe Hermann <uwe@debian.org> Mon, 12 Jun 2006 17:53:30 +0200
+
diff -Naur miro-2.0rc3.orig/debian/compat miro-2.0rc3/debian/compat
--- miro-2.0rc3.orig/debian/compat 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/compat 2009-02-08 18:34:41.000000000 +0100
@@ -0,0 +1 @@
+5
diff -Naur miro-2.0rc3.orig/debian/control miro-2.0rc3/debian/control
--- miro-2.0rc3.orig/debian/control 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/control 2009-02-10 00:53:48.000000000 +0100
@@ -0,0 +1,90 @@
+Source: miro
+Section: net
+Priority: extra
+Maintainer: Uwe Hermann <uwe@debian.org>
+Build-Depends: cdbs (>= 0.4.43),
+ debhelper (>= 5.0.37.2),
+ python2.5 (>= 2.5.2-6),
+ python-support (>= 0.6),
+ python-pyrex,
+ libboost-python-dev (>= 1.34.1-2),
+ libboost-filesystem-dev,
+ libboost-date-time-dev,
+ libboost-thread-dev,
+ libboost-serialization-dev,
+ python-gtk2-dev,
+ python-gnome2-extras-dev (>= 2.19.1),
+ xulrunner-dev,
+ libxine-dev (>= 1.1.12),
+ pkg-config,
+ libxv-dev,
+ libssl-dev,
+ libffi-dev
+Standards-Version: 3.8.0
+Homepage: http://www.getmiro.com
+
+Package: miro
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${python:Depends},
+ python-dbus,
+ python-gtk2,
+ python-gnome2,
+ python-gtkmozembed (>= 2.19.1),
+ python-glade2,
+ python-pysqlite2,
+ libxine1-x (>= 1.1.12),
+ libxine1-plugins (>= 1.1.12),
+ xulrunner-1.9,
+ miro-data (>= 2.0rc3-1)
+Recommends: python-psyco [i386 hurd-i386 netbsd-i386 kfreebsd-i386],
+Suggests: ttf-dejavu,
+ python-notify,
+ python-gst0.10,
+ gstreamer0.10-plugins-base,
+ gstreamer0.10-plugins-good,
+ gstreamer0.10-x,
+ gstreamer0.10-ffmpeg
+Conflicts: miro-data (<< 1.2.1)
+Description: GTK+ based RSS video aggregator
+ 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).
+
+Package: miro-data
+Architecture: all
+Depends: ${misc:Depends}
+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 contains the data files for Miro.
+
+Package: democracyplayer
+Architecture: all
+Depends: miro, ${misc:Depends}
+Description: GTK+ based RSS video aggregator
+ 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 package. It can be safely removed.
+
+Package: democracyplayer-data
+Architecture: all
+Depends: miro-data, ${misc:Depends}
+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-data package. It can be safely removed.
+
diff -Naur miro-2.0rc3.orig/debian/copyright miro-2.0rc3/debian/copyright
--- miro-2.0rc3.orig/debian/copyright 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/copyright 2009-02-08 18:34:41.000000000 +0100
@@ -0,0 +1,397 @@
+This package was debianized by Uwe Hermann <uwe@debian.org> on
+Mon, 12 Jun 2006 13:34:47 +0200
+
+The current Debian maintainer is Uwe Hermann <uwe@debian.org>.
+
+It was downloaded from:
+
+ http://www.getmiro.com
+
+Upstream Authors:
+
+ Nick Nassar <nassar@downhillbattle.org>
+ Geoff Schmidt <gschmidt@gschmidt.org>
+ Luc Heinrich <luc@honk-honk.com>
+ Ben Dean-Kawamura <ben.dean.kawamura@gmail.com>
+ Chris Lahey <clahey@clahey.net>
+ Paul Swartz <pswartz@pculture.org>
+ Will Guaraldi <will.guaraldi@pculture.org>
+ Nick Reville <npr@pculture.org>
+ Matt Bret <mb@pculture.org>
+
+-------------------------------------------------------------------------------
+
+Files: *
+Copyright: 2005-2008 Participatory Culture Foundation
+License: GPL-2+ | other
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the OpenSSL
+ library.
+
+ You must obey the GNU General Public License in all respects for all of
+ the code used other than OpenSSL. If you modify file(s) with this
+ exception, you may extend this exception to your version of the file(s),
+ but you are not obligated to do so. If you do not wish to do so, delete
+ this exception statement from your version. If you delete this exception
+ statement from all source files in the program, then also delete it here.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+-------------------------------------------------------------------------------
+
+Files: portable/feedparser.py
+Copyright: 2002-2006 Mark Pilgrim
+License: other
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+-------------------------------------------------------------------------------
+
+Files: notes/vlc-packages.mak
+Copyright: 2003, 2004 VideoLAN
+License: GPL-2+
+
+-------------------------------------------------------------------------------
+
+Files: platform/windows-xul/tools/altgraph/*
+Copyright: 2004 Istvan Albert
+License: other
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without
+ limitation the rights to use, copy, modify, merge, publish, distribute,
+ sublicense, and/or sell copies of the Software, and to permit persons to
+ whom the Software is furnished to do so.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+Files: platform/windows-xul/tools/modulegraph/*
+Copyright: 2004 Bob Ippolito
+License: other
+ This is the MIT license. This software may also be distributed under
+ the same terms as Python (the PSF license).
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+(see http://svn.red-bean.com/bob/py2app/trunk/LICENSE.txt)
+
+-------------------------------------------------------------------------------
+
+Files: portable/rdfa.py
+Copyright: 2006 Elias Torres <elias@torrez.us>
+License: GPL-2
+
+-------------------------------------------------------------------------------
+
+Files: portable/setup_portable.py
+Copyright: Zach Tibbitts ('zachtib') <zach@collegegeek.org>
+License: GPL-2+ | other
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the OpenSSL
+ library.
+ You must obey the GNU General Public License in all respects for all of
+ the code used other than OpenSSL. If you modify file(s) with this
+ exception, you may extend this exception to your version of the file(s),
+ but you are not obligated to do so. If you do not wish to do so, delete
+ this exception statement from your version. If you delete this exception
+ statement from all source files in the program, then also delete it here.
+
+-------------------------------------------------------------------------------
+
+Files: portable/libtorrent/*
+Copyright: 2003 - 2007 Arvid Norberg
+License: BSD-3
+
+-------------------------------------------------------------------------------
+
+Files: portable/libtorrent/bindings/python/src/*
+Copyright: 2006 - 2007 Daniel Wallin
+License: other
+ Boost Software License - Version 1.0 - August 17th, 2003
+
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+Files: */python/src/extensions.cpp,
+ */python/src/session.cpp
+Copyright: 2006 - 2007 Daniel Wallin,
+ 2006 - 2007 Arvid Norberg
+License: other
+ Boost Software License - Version 1.0 - August 17th, 2003
+
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+Files: */include/libtorrent/alert.hpp,
+ */include/libtorrent/random_sample.hpp,
+ */include/libtorrent/variant_stream.hpp,
+ */include/libtorrent/invariant_check.hpp,
+ */include/libtorrent/kademlia/refresh.hpp,
+ */include/libtorrent/kademlia/find_data.hpp,
+ */include/libtorrent/kademlia/closest_nodes.hpp,
+ */include/libtorrent/kademlia/traversal_algorithm.hpp,
+ */include/libtorrent/kademlia/logging.hpp,
+ */libtorrent/src/alert.cpp,
+ */libtorrent/src/storage.cpp,
+ */libtorrent/src/kademlia/refresh.cpp,
+ */libtorrent/src/kademlia/find_data.hpp,
+ */libtorrent/src/kademlia/closest_nodes.hpp,
+ */libtorrent/src/kademlia/traversal_algorithm.hpp
+Copyright: 2003 - 2007 Daniel Wallin,
+ 2003 - 2007 Arvid Norberg
+License: BSD-3
+
+-------------------------------------------------------------------------------
+
+Files: */include/libtorrent/allocate_resources.hpp,
+ */include/libtorrent/aux_/allocate_resources_impl.hpp
+Copyright: 2003 Magnus Jonsson
+License: BSD-3
+
+-------------------------------------------------------------------------------
+
+Files: */include/libtorrent/resource_request.hpp,
+ */include/libtorrent/bt_peer_connection.hpp,
+ */libtorrent/src/allocate_resources.cpp,
+ */libtorrent/src/file_win.cpp,
+ */libtorrent/src/session.cpp,
+ */libtorrent/src/session_impl.cpp
+Copyright: 2003 - 2007 Magnus Jonsson,
+ 2003 - 2007 Arvid Norberg
+License: BSD-3
+
+-------------------------------------------------------------------------------
+
+Files: */include/libtorrent/extensions/ut_pex.hpp
+Copyright: 2006 MassaRoddel
+License: BSD-3
+
+-------------------------------------------------------------------------------
+
+Files: */libtorrent/src/ut_pex.hpp
+Copyright: 2006 MassaRoddel,
+ 2006 Arvid Norberg
+License: BSD-3
+
+-------------------------------------------------------------------------------
+
+Files: */include/libtorrent/pe_crypto.hpp,
+ */libtorrent/src/pe_crypto.cpp
+Copyright: 2007 Un Shayam
+License: BSD-3
+
+-------------------------------------------------------------------------------
+
+Files: */libtorrent/src/bt_peer_connection.cpp
+Copyright: 2007 Un Shayam,
+ 2003 - 2007 Avrid Norberg
+License: BSD-3
+
+-------------------------------------------------------------------------------
+
+Files: */include/libtorrent/utf8.hpp
+Copyright: 2004 - 2005 Cory Nelson
+License: other
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+-------------------------------------------------------------------------------
+
+Files: */libtorrent/asio/*,
+ */libtorrent/asio/ssl/context_base.hpp,
+ */libtorrent/asio/ssl/detail/openssl_types.hpp,
+ */libtorrent/asoi/ssl/stream_base.hpp
+Copyright: 2003 - 2007 Christopher M. Kohlhoff <chris@kohlhoff.com>
+License: other
+ Boost Software License - Version 1.0 - August 17th, 2003
+
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+Files: */libtorrent/asio/ssl/*
+Copyright: 2003 - 2007 Christopher M. Kohlhoff <chris@kohlhoff.com>,
+ 2005 Voipster <Indrek.Juhani@voipster.com>
+License: other
+ Boost Software License - Version 1.0 - August 17th, 2003
+
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+Files: */libtorrent/asio/detail/kqueue_reactor.hpp,
+ */libtorrent/asio/detail/kqueue_reactor_fwd.hpp
+Copyright: 2003 - 2007 Christopher M. Kohlhoff <chris@kohlhoff.com>,
+ 2005 Stefan Arentz <stefan@soze.com>
+License: other
+ Boost Software License - Version 1.0 - August 17th, 2003
+
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+Files: debian/*
+Copyright: 2006 - 2008 Uwe Hermann <uwe@debian.org>
+License: PD
+ The packaging done by Uwe Hermann <uwe@debian.org> is hereby
+ released as public domain.
+
diff -Naur miro-2.0rc3.orig/debian/menu miro-2.0rc3/debian/menu
--- miro-2.0rc3.orig/debian/menu 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/menu 2009-02-08 18:34:41.000000000 +0100
@@ -0,0 +1,3 @@
+?package(miro):needs="X11" section="Applications/Network/Web News" \
+ title="Miro" command="/usr/bin/miro" \
+ icon="/usr/share/pixmaps/miro.xpm"
diff -Naur miro-2.0rc3.orig/debian/miro-data.install miro-2.0rc3/debian/miro-data.install
--- miro-2.0rc3.orig/debian/miro-data.install 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/miro-data.install 2009-02-08 18:34:41.000000000 +0100
@@ -0,0 +1,2 @@
+usr/share/miro/
+usr/share/locale/
diff -Naur miro-2.0rc3.orig/debian/miro.docs miro-2.0rc3/debian/miro.docs
--- miro-2.0rc3.orig/debian/miro.docs 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/miro.docs 2009-02-08 18:34:41.000000000 +0100
@@ -0,0 +1,2 @@
+README
+CREDITS
diff -Naur miro-2.0rc3.orig/debian/miro.install miro-2.0rc3/debian/miro.install
--- miro-2.0rc3.orig/debian/miro.install 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/miro.install 2009-02-08 20:24:19.000000000 +0100
@@ -0,0 +1,6 @@
+usr/bin/
+usr/lib/
+usr/share/applications/
+usr/share/man/
+usr/share/mime/
+usr/share/pixmaps/
diff -Naur miro-2.0rc3.orig/debian/miro.lintian-overrides miro-2.0rc3/debian/miro.lintian-overrides
--- miro-2.0rc3.orig/debian/miro.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/miro.lintian-overrides 2009-02-08 18:34:41.000000000 +0100
@@ -0,0 +1 @@
+miro: embedded-feedparser-library usr/share/python-support/miro/miro/feedparser.py
diff -Naur miro-2.0rc3.orig/debian/miro.xpm miro-2.0rc3/debian/miro.xpm
--- miro-2.0rc3.orig/debian/miro.xpm 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/miro.xpm 2009-02-08 18:34:41.000000000 +0100
@@ -0,0 +1,406 @@
+/* XPM */
+static char * miro_xpm[] = {
+"32 32 371 2",
+" c None",
+". c #DD5F34",
+"+ c #E5774A",
+"@ c #E98355",
+"# c #EA8658",
+"$ c #E98356",
+"% c #E4764A",
+"& c #DD5E32",
+"* c #EC8554",
+"= c #F7A772",
+"- c #F8B380",
+"; c #F8B27F",
+"> c #F8B27E",
+", c #F8B17E",
+"' c #F8B07D",
+") c #F4AB7B",
+"! c #E58662",
+"~ c #D35639",
+"{ c #D64A30",
+"] c #EA7D59",
+"^ c #F19C77",
+"/ c #F19D79",
+"( c #F49373",
+"_ c #F68F71",
+": c #F68E70",
+"< c #F58D6F",
+"[ c #F0A275",
+"} c #F0A174",
+"| c #ED9971",
+"1 c #E3846B",
+"2 c #E28269",
+"3 c #D75A46",
+"4 c #EC7D4A",
+"5 c #F0946E",
+"6 c #EA8571",
+"7 c #EA8470",
+"8 c #EA846F",
+"9 c #F16E64",
+"0 c #F36660",
+"a c #F3655F",
+"b c #F3645E",
+"c c #E9926C",
+"d c #E8916B",
+"e c #E8906A",
+"f c #E58566",
+"g c #D9645A",
+"h c #D86359",
+"i c #D86258",
+"j c #D74540",
+"k c #D9562C",
+"l c #F3925A",
+"m c #F6A16B",
+"n c #EF8E69",
+"o c #E87B68",
+"p c #E87A67",
+"q c #E87967",
+"r c #F0625B",
+"s c #F25A56",
+"t c #F25956",
+"u c #F25855",
+"v c #E78963",
+"w c #E78962",
+"x c #E68862",
+"y c #E27C5D",
+"z c #D65850",
+"A c #D55750",
+"B c #D5564F",
+"C c #DB534D",
+"D c #DA3434",
+"E c #D95833",
+"F c #EA875C",
+"G c #EA8C62",
+"H c #EA8B61",
+"I c #E7735A",
+"J c #E35A52",
+"K c #E35951",
+"L c #E35851",
+"M c #F07A58",
+"N c #F4845A",
+"O c #F48459",
+"P c #F48358",
+"Q c #D6473E",
+"R c #D6463D",
+"S c #D6453D",
+"T c #D7443E",
+"U c #DC4344",
+"V c #DC4243",
+"W c #DC4143",
+"X c #E04F49",
+"Y c #E35A4E",
+"Z c #BD2721",
+"` c #E56938",
+" . c #ED8858",
+".. c #E58059",
+"+. c #E47F59",
+"@. c #E47E58",
+"#. c #E2634E",
+"$. c #E04744",
+"%. c #E04643",
+"&. c #E04542",
+"*. c #EF7D51",
+"=. c #F48F56",
+"-. c #F48E55",
+";. c #F48E54",
+">. c #CF262A",
+",. c #CF252A",
+"'. c #CE2429",
+"). c #D2272D",
+"!. c #DD333A",
+"~. c #DD3239",
+"{. c #DD3138",
+"]. c #E04642",
+"^. c #E35A4C",
+"/. c #BD2F27",
+"(. c #DF6034",
+"_. c #EF8752",
+":. c #E97651",
+"<. c #E26550",
+"[. c #E2644F",
+"}. c #DA4D44",
+"|. c #D2373A",
+"1. c #D23639",
+"2. c #D23538",
+"3. c #E76847",
+"4. c #EF784C",
+"5. c #EF784B",
+"6. c #EE774B",
+"7. c #C41C25",
+"8. c #C41B24",
+"9. c #C31923",
+"0. c #C81B24",
+"a. c #D5222B",
+"b. c #D5212A",
+"c. c #D52029",
+"d. c #D43133",
+"e. c #D3433E",
+"f. c #B42723",
+"g. c #D14C2E",
+"h. c #E16F49",
+"i. c #E17049",
+"j. c #DA7973",
+"k. c #C6E1F5",
+"l. c #C3DCF2",
+"m. c #B8BBD2",
+"n. c #AF6578",
+"o. c #AF1625",
+"p. c #C20C15",
+"q. c #B61220",
+"r. c #A9192A",
+"s. c #970C17",
+"t. c #D04927",
+"u. c #DF6842",
+"v. c #E06943",
+"w. c #E06942",
+"x. c #E77B70",
+"y. c #FFFFFF",
+"z. c #FCFDFE",
+"A. c #DDEDF9",
+"B. c #B44A5C",
+"C. c #900C15",
+"D. c #E64C37",
+"E. c #D53A38",
+"F. c #E26D6C",
+"G. c #F5B3B1",
+"H. c #EB6F71",
+"I. c #FBDADA",
+"J. c #DA969E",
+"K. c #D28088",
+"L. c #F9F3F3",
+"M. c #FEFEFF",
+"N. c #FCFEFF",
+"O. c #C498A5",
+"P. c #A61422",
+"Q. c #AD1421",
+"R. c #B41321",
+"S. c #E4272B",
+"T. c #E22632",
+"U. c #CB0C2E",
+"V. c #DD6067",
+"W. c #E9574C",
+"X. c #E70C0D",
+"Y. c #F38687",
+"Z. c #FEFFFF",
+"`. c #FDFEFF",
+" + c #A91A2B",
+".+ c #DEBBBD",
+"++ c #F6FBFE",
+"@+ c #F4FBFE",
+"#+ c #CEBBC6",
+"$+ c #891C2F",
+"%+ c #DA1F22",
+"&+ c #E92F33",
+"*+ c #E9564B",
+"=+ c #F18586",
+"-+ c #FAFDFF",
+";+ c #F8FCFE",
+">+ c #D8B5BA",
+",+ c #EEF8FE",
+"'+ c #ECF8FE",
+")+ c #CFBEC9",
+"!+ c #C10B13",
+"~+ c #BD1214",
+"{+ c #DE292D",
+"]+ c #DE2A2E",
+"^+ c #DE2F32",
+"/+ c #DB3E3D",
+"(+ c #E1676B",
+"_+ c #FBFDFF",
+":+ c #FAFDFE",
+"<+ c #BC4658",
+"[+ c #991831",
+"}+ c #C68998",
+"|+ c #F2FAFE",
+"1+ c #F0F9FE",
+"2+ c #C2292D",
+"3+ c #D2B3B9",
+"4+ c #E6F5FD",
+"5+ c #E4F4FD",
+"6+ c #D3BAC3",
+"7+ c #AB1016",
+"8+ c #A1141F",
+"9+ c #981320",
+"0+ c #D01C1F",
+"a+ c #DB292D",
+"b+ c #DC3232",
+"c+ c #E04E42",
+"d+ c #E0696C",
+"e+ c #F5FBFE",
+"f+ c #F3FAFE",
+"g+ c #AC405C",
+"h+ c #7F1C3D",
+"i+ c #B58A9D",
+"j+ c #EAF6FD",
+"k+ c #E8F6FD",
+"l+ c #CB2E2E",
+"m+ c #CDB1B9",
+"n+ c #DEF2FC",
+"o+ c #DCF1FC",
+"p+ c #D1B8C0",
+"q+ c #B60C0D",
+"r+ c #A0141E",
+"s+ c #821320",
+"t+ c #AF0104",
+"u+ c #CF2225",
+"v+ c #D72A2D",
+"w+ c #D43031",
+"x+ c #CA423D",
+"y+ c #D16369",
+"z+ c #EDF8FE",
+"A+ c #EBF7FD",
+"B+ c #E9F6FD",
+"C+ c #B1425A",
+"D+ c #911E39",
+"E+ c #BA899B",
+"F+ c #E2F4FD",
+"G+ c #E0F3FD",
+"H+ c #B82A32",
+"I+ c #C8AEB9",
+"J+ c #D6EFFC",
+"K+ c #D4EEFC",
+"L+ c #C8B6C3",
+"M+ c #A81019",
+"N+ c #A01421",
+"O+ c #C0060F",
+"P+ c #C92628",
+"Q+ c #BA2A2E",
+"R+ c #A95161",
+"S+ c #E5F5FD",
+"T+ c #E3F4FD",
+"U+ c #E1F3FD",
+"V+ c #C34853",
+"W+ c #C6262E",
+"X+ c #D08B95",
+"Y+ c #DAF0FC",
+"Z+ c #D8F0FC",
+"`+ c #C3AABA",
+" @ c #CEECFB",
+".@ c #CDEBFB",
+"+@ c #B8B7CC",
+"@@ c #9C1227",
+"#@ c #A30005",
+"$@ c #C0050E",
+"%@ c #C92528",
+"&@ c #A75061",
+"*@ c #DDF2FC",
+"=@ c #DBF1FC",
+"-@ c #D9F0FC",
+";@ c #C14753",
+">@ c #CC8A95",
+",@ c #D2EDFB",
+"'@ c #D0ECFB",
+")@ c #C0A9BA",
+"!@ c #CBEBFB",
+"~@ c #7F1025",
+"{@ c #A10504",
+"]@ c #AE1E21",
+"^@ c #AA252E",
+"/@ c #A6222E",
+"(@ c #9A1A2C",
+"_@ c #9D2739",
+":@ c #A65061",
+"<@ c #A55061",
+"[@ c #A44F61",
+"}@ c #A0273B",
+"|@ c #A22136",
+"1@ c #A43A4F",
+"2@ c #A45269",
+"3@ c #A64F64",
+"4@ c #A74E63",
+"5@ c #941A34",
+"6@ c #9F3F50",
+"7@ c #A24F61",
+"8@ c #97425C",
+"9@ c #78194C",
+"0@ c #7A1748",
+"a@ c #7B0913",
+"b@ c #861428",
+"c@ c #921B2E",
+"d@ c #AC1729",
+"e@ c #841C36",
+"f@ c #9E1A2F",
+"g@ c #831A3A",
+"h@ c #71165C",
+"i@ c #720B3C",
+"j@ c #700710",
+"k@ c #871225",
+"l@ c #911A2C",
+"m@ c #731050",
+"n@ c #94071B",
+"o@ c #7D134D",
+"p@ c #80164F",
+"q@ c #811944",
+"r@ c #821C3A",
+"s@ c #901B34",
+"t@ c #8F1B36",
+"u@ c #8A1B38",
+"v@ c #771851",
+"w@ c #78184E",
+"x@ c #7A1741",
+"y@ c #68061E",
+"z@ c #6B0734",
+"A@ c #6E0E54",
+"B@ c #70155B",
+"C@ c #721350",
+"D@ c #77091A",
+"E@ c #70083C",
+"F@ c #7D113D",
+"G@ c #7E1B3C",
+"H@ c #8D1A3A",
+"I@ c #9B1836",
+"J@ c #831A41",
+"K@ c #7C1A45",
+"L@ c #741854",
+"M@ c #741653",
+"N@ c #720F4B",
+"O@ c #660527",
+"P@ c #750B23",
+"Q@ c #7E1231",
+"R@ c #7C1839",
+"S@ c #77174B",
+"T@ c #6F135A",
+"U@ c #7D1435",
+"V@ c #770C24",
+"W@ c #5E0613",
+"X@ c #69082C",
+"Y@ c #6C093F",
+"Z@ c #710B47",
+"`@ c #730C49",
+" # c #700B45",
+".# c #6A083C",
+"+# c #5F062B",
+" ",
+" ",
+" . + @ # $ % ",
+" & * = - - ; > , ' ) ! ~ ",
+" { ] ^ / ( _ : < [ [ } | 1 2 3 ",
+" 4 5 6 7 8 9 0 a b c d e f g h i j ",
+" k l m n o p q r s t u v w x y z A B C D ",
+" E F G H I J K L M N O P Q R S T U V W X Y Z ",
+" ` ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.",
+" (._.:.<.[.#.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.",
+" g.h.i.j.k.k.k.k.k.k.k.k.k.k.k.l.m.n.o.p.p.p.q.r.s.",
+" t.u.v.w.x.y.y.y.y.y.y.y.y.y.y.y.y.z.A.B.p.p.p.q.r.C.",
+" D.E.E.E.F.y.y.y.G.H.I.y.y.y.J.K.L.M.N.O.P.P.P.Q.R. ",
+" S.T.U.U.U.V.y.y.y.W.X.Y.y.Z.`. +r..+++@+#+$+$+$+P.p. ",
+" %+&+T.U.U.U.V.y.y.y.*+X.=+-+;+++r.r.>+,+'+)+$+$+$+P.!+ ",
+" ~+{+]+^+/+/+/+(+`._+:+<+[+}+|+1+,+2+2+3+4+5+6+7+7+7+8+9+ ",
+" 0+a+a+b+c+c+c+d+e+f+|+g+h+i+j+k+4+l+l+m+n+o+p+q+q+q+r+s+ ",
+" t+u+v+v+w+x+x+x+y+z+A+B+C+D+E+F+G+n+H+H+I+J+K+L+M+M+M+N+ ",
+" O+P+l+l+Q+$+$+$+R+S+T+U+V+W+X+Y+Z+J+h+h+`+ @.@+@h+h+h+@@ ",
+" #@$@%@l+l+Q+$+$+$+&@*@=@-@;@W+>@,@'@ @h+h+)@!@!@+@h+h+h+~@ ",
+" {@]@^@^@/@(@(@(@_@:@<@[@}@|@1@2@3@4@5@5@6@7@7@8@9@9@0@ ",
+" a@b@$+c@d@d@d@(@$+$+$+e@h+h+h+f@r.r.r.$+$+$+g@h@h@i@ ",
+" j@k@l@d@d@d@(@$+$+$+e@h+h+h+f@r.r.r.$+$+$+g@h@m@ ",
+" n@o@p@p@q@r@r@r@s@f@f@f@t@u@u@u@v@v@v@w@x@y@ ",
+" z@A@B@9@h+h+h+5@r.r.r.u@h+h+h+h@h@h@C@D@ ",
+" E@F@G@h+h+H@I@I@I@J@K@K@K@L@M@N@O@ ",
+" P@Q@R@S@h@h@h@h@h@h@T@U@V@ ",
+" W@X@Y@Z@`@`@ #.#+# ",
+" ",
+" ",
+" ",
+" "};
diff -Naur miro-2.0rc3.orig/debian/patches/10_movies_dir.patch miro-2.0rc3/debian/patches/10_movies_dir.patch
--- miro-2.0rc3.orig/debian/patches/10_movies_dir.patch 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/patches/10_movies_dir.patch 2009-02-08 20:59:07.000000000 +0100
@@ -0,0 +1,26 @@
+--- platform/gtk-x11/plat/config.py.orig 2009-02-08 20:56:02.000000000 +0100
++++ platform/gtk-x11/plat/config.py 2009-02-08 20:57:12.000000000 +0100
+@@ -112,10 +112,10 @@
+ value = descriptor.default
+
+ if descriptor == prefs.MOVIES_DIRECTORY:
+- value = os.path.expanduser('~/Movies/Miro')
++ value = os.path.expanduser('~/.miro/Movies')
+
+ elif descriptor == prefs.NON_VIDEO_DIRECTORY:
+- value = os.path.expanduser('~/Desktop')
++ value = os.path.expanduser('~/.miro/Nonvideo')
+
+ elif descriptor == prefs.GETTEXT_PATHNAME:
+ value = resources.path("../../locale")
+--- platform/gtk-x11/plat/upgrade.py.orig 2009-02-08 20:57:48.000000000 +0100
++++ platform/gtk-x11/plat/upgrade.py 2009-02-08 20:58:32.000000000 +0100
+@@ -78,7 +78,7 @@
+ _copy_gconf("/apps/democracy/player", "/apps/miro")
+ client.recursive_unset("/apps/democracy", 1)
+ if client.get("/apps/miro/MoviesDirectory") is None:
+- value = os.path.expanduser('~/Movies/Democracy')
++ value = os.path.expanduser('~/.miro/Movies')
+ client.set_string("/apps/miro/MoviesDirectory", value)
+
+ if not os.path.exists(value):
diff -Naur miro-2.0rc3.orig/debian/patches/20_no_autoupdate.patch miro-2.0rc3/debian/patches/20_no_autoupdate.patch
--- miro-2.0rc3.orig/debian/patches/20_no_autoupdate.patch 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/patches/20_no_autoupdate.patch 2009-02-08 21:03:33.000000000 +0100
@@ -0,0 +1,11 @@
+--- portable/startup.py.orig 2009-02-08 21:03:01.000000000 +0100
++++ portable/startup.py 2009-02-08 21:03:13.000000000 +0100
+@@ -250,7 +250,7 @@
+ yield None
+ parse_command_line_args()
+ yield None
+- autoupdate.check_for_updates()
++ # autoupdate.check_for_updates()
+ yield None
+ # Wait a bit before starting the downloader daemon. It can cause a bunch
+ # of disk/CPU load, so try to avoid it slowing other stuff down.
diff -Naur miro-2.0rc3.orig/debian/patches/30_disable_xine_hack.patch miro-2.0rc3/debian/patches/30_disable_xine_hack.patch
--- miro-2.0rc3.orig/debian/patches/30_disable_xine_hack.patch 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/patches/30_disable_xine_hack.patch 2009-02-08 21:23:00.000000000 +0100
@@ -0,0 +1,15 @@
+# This seems to cause segfaults with newer libxine (?) releases, so disable it.
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512719
+# http://bugzilla.pculture.org/show_bug.cgi?id=11263
+
+--- platform/gtk-x11/plat/options.py.orig 2009-02-08 21:21:46.000000000 +0100
++++ platform/gtk-x11/plat/options.py 2009-02-08 21:22:00.000000000 +0100
+@@ -51,7 +51,7 @@
+ help="Which visualization plugin to use for audio files. (goom or none)" )
+
+ USE_XINE_XV_HACK = Pref(key="UseXineXVHack",
+- default=True,
++ default=False,
+ platformSpecific=False,
+ alias="xine-xvhack",
+ help="Whether or not to use the Xine xv hack. (true, false)" )
diff -Naur miro-2.0rc3.orig/debian/patches/40_feedparser.patch miro-2.0rc3/debian/patches/40_feedparser.patch
--- miro-2.0rc3.orig/debian/patches/40_feedparser.patch 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/patches/40_feedparser.patch 2009-02-08 21:25:24.000000000 +0100
@@ -0,0 +1,7 @@
+--- portable/feedparser.py.orig 2007-11-15 22:05:36.000000000 +0100
++++ portable/feedparser.py 2007-11-15 22:05:43.000000000 +0100
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """Universal feed parser
+
+ Handles RSS 0.9x, RSS 1.0, RSS 2.0, CDF, Atom 0.3, and Atom 1.0 feeds
diff -Naur miro-2.0rc3.orig/debian/patches/50_miro_debug_fix.patch miro-2.0rc3/debian/patches/50_miro_debug_fix.patch
--- miro-2.0rc3.orig/debian/patches/50_miro_debug_fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/patches/50_miro_debug_fix.patch 2009-02-10 02:38:22.000000000 +0100
@@ -0,0 +1,11 @@
+--- platform/gtk-x11/setup.py.orig 2009-02-10 02:27:57.000000000 +0100
++++ platform/gtk-x11/setup.py 2009-02-10 02:37:37.000000000 +0100
+@@ -330,7 +330,7 @@
+ exit;
+ fi
+
+- %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON ./miro.real --sync "$@"
++ %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON /usr/bin/miro.real --sync "$@"
+ else
+ %(runtimelib)smiro.real "$@"
+ fi
diff -Naur miro-2.0rc3.orig/debian/patches/60_xine_driver.patch miro-2.0rc3/debian/patches/60_xine_driver.patch
--- miro-2.0rc3.orig/debian/patches/60_xine_driver.patch 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/patches/60_xine_driver.patch 2009-02-08 21:26:38.000000000 +0100
@@ -0,0 +1,26 @@
+# Honour the --xine-driver miro commandline option.
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=453406
+
+diff -Nur -x '*.orig' -x '*~' miro-1.0/platform/gtk-x11/xine/xine_impl.c miro-1.0.new/platform/gtk-x11/xine/xine_impl.c
+--- miro-1.0/platform/gtk-x11/xine/xine_impl.c 2007-11-13 12:22:57.000000000 +1100
++++ miro-1.0.new/platform/gtk-x11/xine/xine_impl.c 2007-12-10 22:17:21.000000000 +1100
+@@ -263,14 +264,18 @@
+ vis.user_data = xine;
+
+ /* opening xine output ports */
++ /* Try to use char *driver for video, default to "auto" if NULL */
++ if (!driver)
++ driver = "auto";
++
+ #ifdef INCLUDE_XINE_DRIVER_HACK
+ miro_using_xv_driver_hack = 0; /* by default, don't use the hack */
+- xine->videoPort = xine_open_video_driver(xine->xine, "xv",
++ xine->videoPort = xine_open_video_driver(xine->xine, driver,
+ XINE_VISUAL_TYPE_X11, (void *)&vis);
+ if (!xine->videoPort) {
+ #endif
+
+- xine->videoPort = xine_open_video_driver(xine->xine, "auto",
++ xine->videoPort = xine_open_video_driver(xine->xine, driver,
+ XINE_VISUAL_TYPE_X11, (void *)&vis);
+
diff -Naur miro-2.0rc3.orig/debian/pycompat miro-2.0rc3/debian/pycompat
--- miro-2.0rc3.orig/debian/pycompat 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/pycompat 2009-02-08 18:34:41.000000000 +0100
@@ -0,0 +1 @@
+2
diff -Naur miro-2.0rc3.orig/debian/pyversions miro-2.0rc3/debian/pyversions
--- miro-2.0rc3.orig/debian/pyversions 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/pyversions 2009-02-08 18:34:41.000000000 +0100
@@ -0,0 +1 @@
+2.5
diff -Naur miro-2.0rc3.orig/debian/README.Debian miro-2.0rc3/debian/README.Debian
--- miro-2.0rc3.orig/debian/README.Debian 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/README.Debian 2009-02-10 00:43:37.000000000 +0100
@@ -0,0 +1,38 @@
+Miro for Debian
+---------------
+
+ * The default Miro movies directory in Debian is ~/.miro/Movies
+ instead of ~/Movies/Miro.
+
+ * Also, the non-video directory in Debian is ~/.miro/Nonvideo
+ instead of ~/Desktop.
+
+ * The autoupdate feature, which checks for new versions of Miro,
+ has been disabled in the Debian package.
+
+ * You can install 'python-psyco' which will likely speed up Miro a bit.
+
+ * If you want to redirect the sound output (but not video) to another
+ host via 'esddsp' here's what you have to do:
+
+ - Edit ~/.xine/config to say 'audio.driver:esd' on your localhost.
+
+ - Start an esd server on another (remote) host, e.g.
+ using 'esd -public -tcp'. Make sure you allow connections to your
+ esd server (check firewall settings for port 16001 and your
+ /etc/hosts.allow and /etc/hosts.deny).
+
+ - Now run 'esddsp -s xxx.xxx.xxx.xxx:16001 miro' on localhost, where
+ xxx.xxx.xxx.xxx is the IP address of the host where esd runs.
+ The video will now be displayed on localhost, audio will be redirected
+ to the remote host's esd.
+
+ * If you experience segfaults or incorrect colors with Miro and certain
+ X.org drivers, please try 'miro --set xine-driver=xhsm' as a work-around,
+ or, alternatively, use the gstreamer renderer (set it in the "Options"
+ dialog or run 'miro --set renderer=gstreamer'). See
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=459069
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473310
+ for more information on this issue.
+
+ -- Uwe Hermann <uwe@debian.org>, Mon, 09 Feb 2009 02:02:21 +0100
diff -Naur miro-2.0rc3.orig/debian/rules miro-2.0rc3/debian/rules
--- miro-2.0rc3.orig/debian/rules 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/rules 2009-02-10 02:06:25.000000000 +0100
@@ -0,0 +1,54 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM = pysupport
+DEB_PYTHON_COMPILE_VERSION = $(shell pyversions -vd 2>/dev/null)
+
+# Must be included before python-distutils.mk to use dh_python/dh_pysupport.
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+# Use Python distutils to install the package.
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+# Must come after python-distutils.mk.
+DEB_PYTHON_SETUP_CMD := platform/gtk-x11/setup.py
+
+# The default argument is '-a', which Miro's setup.py doesn't seem to support.
+DEB_PYTHON_CLEAN_ARGS :=
+
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+# Install everything into debian/tmp, as we have a multi-binary package.
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+
+binary-post-install/miro::
+ @# Remove unneeded files from the deb.
+ rm -rf debian/miro/usr/share/python-support/miro/miro/test
+ @# Copy xpm file (for the Debian menu icon).
+ cp debian/miro.xpm debian/miro/usr/share/pixmaps
+ @# Invoke dh_desktop as we install a *.dektop file.
+ dh_desktop -pmiro
+
+binary-post-install/miro-data::
+ @# Remove unneeded files from the miro-data deb.
+ rm -rf debian/miro-data/usr/share/miro/resources/testdata
+
+clean::
+ @# TODO: This should probably be done in the upstream source.
+ rm -f portable/database.c
+ rm -f portable/sorts.c
+ rm -f portable/frontends/widgets/gtk/pygtkhacks.c
+ rm -f platform/gtk-x11/plat/frontends/widgets/mozprompt.[ch]
+ rm -f platform/gtk-x11/plat/frontends/widgets/httpobserver.c
+ rm -f platform/gtk-x11/plat/frontends/widgets/windowcreator.cpp
+ rm -f platform/gtk-x11/plat/frontends/widgets/pluginsdir.cpp
+ rm -f platform/gtk-x11/miro.1.gz
+ rm -f platform/gtk-x11/miro.real.1.gz
+ rm -f platform/gtk-x11/xine/xine_extractor
+ rm -f platform/gtk-x11/plat/xlibhelper.c
+ rm -f platform/gtk-x11/xine/xine.c
+ rm -f platform/gtk-x11/miro
+
+# For /usr/share/cdbs/1/rules/utils.mk sanity check.
+common-binary-post-install-arch:: list-missing
+
diff -Naur miro-2.0rc3.orig/debian/watch miro-2.0rc3/debian/watch
--- miro-2.0rc3.orig/debian/watch 1970-01-01 01:00:00.000000000 +0100
+++ miro-2.0rc3/debian/watch 2009-02-08 18:34:41.000000000 +0100
@@ -0,0 +1,2 @@
+version=3
+http://ftp.osuosl.org/pub/pculture.org/miro/src/Miro-(.*)\.tar\.gz