--- miro-3.0.1.orig/debian/menu +++ miro-3.0.1/debian/menu @@ -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" --- miro-3.0.1.orig/debian/watch +++ miro-3.0.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.osuosl.org/pub/pculture.org/miro/src/[mM]iro-(.*)\.tar\.gz --- miro-3.0.1.orig/debian/control +++ miro-3.0.1/debian/control @@ -0,0 +1,88 @@ +Source: miro +Section: net +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Uwe Hermann +Build-Depends: cdbs (>= 0.4.43), + debhelper (>= 5.0.37.2), + python2.6, + python-support (>= 0.6), + python-pyrex (>= 0.9.6.4), + python-libtorrent (>= 0.14.2), + libtorrent-rasterbar-dev (>= 0.14.2), + python-gtk2-dev, + python-gnome2-extras-dev (>= 2.19.1), + xulrunner-dev (>= 1.9.2), + pkg-config, + libxv-dev, + libssl-dev, + libffi-dev +Standards-Version: 3.8.4 +Homepage: http://www.getmiro.com + +Package: miro +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + python-dbus, + python-gtk2, + python-gconf, + python-gtkmozembed (>= 2.19.1) | python-gnome2-extras (>= 2.19.1), + python-glade2, + python-pysqlite2, + python-libtorrent (>= 0.14.2), + python-gst0.10 (>= 0.10.0), + gstreamer0.10-x (>= 0.10.0), + gstreamer0.10-ffmpeg (>= 0.10.0), + gstreamer0.10-plugins-base (>= 0.10.0), + gstreamer0.10-plugins-good (>= 0.10.0), + gstreamer0.10-plugins-bad (>= 0.10.0), + xulrunner-1.9.2, + miro-data (>= 3.0-1) +Recommends: python-psyco [i386 hurd-i386 netbsd-i386 kfreebsd-i386] +Suggests: ttf-dejavu, + python-notify, + gstreamer0.10-plugins-ugly (>= 0.10.0) +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 (transitional package) + 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 (transitional package) + 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. + --- miro-3.0.1.orig/debian/miro-data.install +++ miro-3.0.1/debian/miro-data.install @@ -0,0 +1,2 @@ +usr/share/miro/ +usr/share/locale/ --- miro-3.0.1.orig/debian/compat +++ miro-3.0.1/debian/compat @@ -0,0 +1 @@ +5 --- miro-3.0.1.orig/debian/miro.docs +++ miro-3.0.1/debian/miro.docs @@ -0,0 +1,3 @@ +README +CREDITS +ADOPTERS --- miro-3.0.1.orig/debian/rules +++ miro-3.0.1/debian/rules @@ -0,0 +1,50 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM = pysupport + +# Must be included before python-distutils.mk to use dh_python/dh_pysupport. +include /usr/share/cdbs/1/rules/debhelper.mk + +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/simple-patchsys.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 := + +# Install everything into debian/tmp, as we have a multi-binary package. +DEB_DH_INSTALL_SOURCEDIR := debian/tmp + +# Reduce the number of unneeded dependencies with --as-needed. +LDFLAGS += "-Wl,--as-needed" + +# Workaround for a cdbs issue/bug, see #525436. +common-binary-arch common-binary-indep:: miro-fixup +miro-fixup: install/miro + +binary-post-install/miro:: + @# Add a few more READMEs. + cp platform/gtk-x11/README \ + debian/miro/usr/share/doc/miro/README.gtk-x11 + cp portable/frontends/cli/README \ + debian/miro/usr/share/doc/miro/README.cli + +binary-post-install/miro:: + @# Remove unneeded files from the miro deb. + rm -rf debian/miro/usr/share/pyshared/miro/test + +binary-post-install/miro-data:: + @# Remove unneeded files from the miro-data deb. + rm -rf debian/miro-data/usr/share/miro/resources/testdata + +clean:: + cd platform/gtk-x11/ && make clean + +# For /usr/share/cdbs/1/rules/utils.mk sanity check. +common-binary-post-install-arch:: list-missing + --- miro-3.0.1.orig/debian/README.Debian +++ miro-3.0.1/debian/README.Debian @@ -0,0 +1,28 @@ +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. + + * For even further audio/video support you can also install the following: + + $ apt-get install gstreamer0.10-plugins-ugly + + * If you experience Miro crashes/segfaults, please install 'gdb' and then + run 'miro --debug' (which runs Miro in gdb) and try to reproduce the + bug. If that worked, please report the bug upstream and attach the gdb + output (type e.g. "bt" on the gdb prompt after the crash). + + If needed, please also install additional -dbg packages, e.g. + python2.6-dbg, python-gtk2-dbg, or xulrunner-1.9.2-dbg. + + -- Uwe Hermann , Sat, 20 Mar 2010 15:29:57 +0100 + --- miro-3.0.1.orig/debian/pycompat +++ miro-3.0.1/debian/pycompat @@ -0,0 +1 @@ +2 --- miro-3.0.1.orig/debian/miro.lintian-overrides +++ miro-3.0.1/debian/miro.lintian-overrides @@ -0,0 +1,2 @@ +miro: embedded-feedparser-library usr/share/pyshared/miro/feedparser.py + --- miro-3.0.1.orig/debian/copyright +++ miro-3.0.1/debian/copyright @@ -0,0 +1,155 @@ +This work was packaged for Debian by: + + Uwe Hermann on Mon, 12 Jun 2006 13:34:47 +0200 + +It was downloaded from: + + http://www.getmiro.com + +Upstream Authors: + + Nick Nassar + Geoff Schmidt + Luc Heinrich + Ben Dean-Kawamura + Chris Lahey + Paul Swartz + Will Guaraldi + Nick Reville + Matt Bret + +------------------------------------------------------------------------------- + +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 +License: GPL-2 + +------------------------------------------------------------------------------- + +Files: portable/setup_portable.py +Copyright: © Zach Tibbitts ('zachtib') +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: debian/* +Copyright: © 2006 - 2010 Uwe Hermann +License: PD + The packaging done by Uwe Hermann is hereby + released as public domain. + --- miro-3.0.1.orig/debian/changelog +++ miro-3.0.1/debian/changelog @@ -0,0 +1,725 @@ +miro (3.0.1-0ubuntu1) lucid; urgency=low + + * New upstream bugfix release. + + -- Daniel Hahler Wed, 14 Apr 2010 22:05:05 +0200 + +miro (3.0-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable (LP: #548389), remaining changes: + - 100_catch_keyerror_in_update_items.patch: Catch exception + caused by out of bounds array index. + - 101_player_undefined_elapsed_time.patch: There are some cases + where the elapsed_time returned is undefined; use a current + time of 0 in this case when fast-forwarding. + - debian/control, debian/pyversions, debian/README.Debian: + Build with python 2.6 and xulrunner 1.9.2 + * Dropped 90_miro_boost_py26.patch: does not apply anymore. + + -- Daniel Hahler Tue, 13 Apr 2010 21:21:17 +0200 + +miro (3.0-1) unstable; urgency=low + + * New upstream release (Closes: #575463). + + The xine backend was removed upstream, we use gstreamer only now. + + Drop (build-)dependency on all Boost packages, no longer used upstream. + + debian/patches/20_no_autoupdate.patch: Update. + + debian/patches/30_disable_xine_hack.patch: Drop, obsolete. + + debian/patches/40_boost_python.patch: Drop, obsolete. + + debian/patches/80_xine_default_renderer.patch: Drop, obsolete. + * Closing non-reproducible bugs with this release. Please reopen if needed. + + "No sound when playing videos" (Closes: #527261). + + "Two internal errors on startup" (Closes: #557347). + + "Miro "internal error" and odd behavior" (Closes: #574822). + + "Miro crashes after starts playing a video" (Closes: #522102). + * Standards-Version: 3.8.4 (no changes required). + * debian/miro.docs: Add ADOPTERS file. + * debian/README.Debian: Drop xine related sections. + * debian/rules: Simplified clean target. + * debian/copyright: Updates (Boost and libtorrent stuff is gone). + + -- Uwe Hermann Sun, 28 Mar 2010 01:02:12 +0200 + +miro (2.5.4-1ubuntu2) lucid; urgency=low + + * debian/control: Migrate from xulrunner-1.9.1 to xulrunner-1.9.2 + + -- Micah Gersten Sun, 21 Feb 2010 03:47:01 -0600 + +miro (2.5.4-1ubuntu1) lucid; urgency=low + + * Merge with Debian unstable, remaining changes: + - debian/patches/40_boost_python.patch: + Drop, not needed to build on karmic + - 100_catch_keyerror_in_update_items.patch: Catch exception + caused by out of bounds array index. + - 101_player_undefined_elapsed_time.patch: There are some cases + where the elapsed_time returned is undefined; use a current + time of 0 in this case when fast-forwarding. + - 90_miro_boost_py26.patch: Fix build breakage due to boost dependency + changes. + - debian/control, debian/pyversions, + Build with python 2.6 and xulrunner 1.9.1 + + -- Daniel Hahler Sat, 20 Feb 2010 02:34:26 +0100 + +miro (2.5.4-1) unstable; urgency=low + + * New upstream release. + * debian/control: Change xulrunner-1.9 to xulrunner-1.9.1 (Closes: #557726). + + -- Uwe Hermann Sun, 13 Dec 2009 17:59:01 +0100 + +miro (2.5.3-1ubuntu4) lucid; urgency=low + + * 90_miro_boost_py26.patch: Fix build breakage due to boost dependency + changes. + (LP: #508228) + + -- Bryce Harrington Tue, 19 Jan 2010 22:42:30 -0800 + +miro (2.5.3-1ubuntu3) lucid; urgency=low + + * 101_player_undefined_elapsed_time.patch: There are some cases + where the elapsed_time returned is undefined; use a current + time of 0 in this case when fast-forwarding. + (LP: #418025) + + -- Bryce Harrington Fri, 15 Jan 2010 01:43:11 -0800 + +miro (2.5.3-1ubuntu2) lucid; urgency=low + + * 100_catch_keyerror_in_update_items.patch: Catch exception + caused by out of bounds array index. + (LP: #413387) + + -- Bryce Harrington Fri, 15 Jan 2010 01:18:10 -0800 + +miro (2.5.3-1ubuntu1) karmic; urgency=low + + * Merge with Debian unstable, remaining changes: + - debian/control, debian/pyversions, + Build with python 2.6 and xulrunner 1.9.1 + - debian/patches/40_boost_python.patch: + Drop, not needed to build on karmic + + -- Iain Lane Sun, 25 Oct 2009 00:24:34 +0100 + +miro (2.5.3-1) unstable; urgency=low + + * New upstream release. + * Standards-Version: 3.8.3 (no changes required). + * Depend on python-gconf instead of python-gnome2. The latter will be + deprecated and miro only uses the gconf part anyway (Closes: #541576). + * Fix "FTBFS: ld: cannot find -lboost_python-mt" (Closes: #551220). + * Update debian/watch to also catch new upstream tarball names. + + -- Uwe Hermann Sat, 24 Oct 2009 02:30:13 +0200 + +miro (2.5.2-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #411110), remaining changes: + - debian/control: build with python 2.6 and xulrunner 1.9.1 + + -- Loïc Martin Sun, 09 Aug 2009 19:36:11 +0200 + +miro (2.5.2-1) unstable; urgency=low + + * New upstream release. + + -- Uwe Hermann Sat, 01 Aug 2009 15:23:08 +0200 + +miro (2.5.1-1) unstable; urgency=low + + * New upstream release. + + debian/patches/90_handle_charref.patch: Drop, merged upstream. + + debian/patches/95_esc.patch: Drop, merged upstream. + + debian/patches/30_disable_xine_hack.patch: Update. + + debian/patches/80_xine_default_renderer.patch: Update. + * Add usr/share/icons/ to miro.install so the new icons get installed. + + -- Uwe Hermann Fri, 24 Jul 2009 15:44:13 +0200 + +miro (2.0.5-1ubuntu2) karmic; urgency=low + + * xulrunner-1.9.1 by default transition + + see: https://blueprints.launchpad.net/ubuntu/+spec/desktop-karmic-firefox-3.5 + - bump minimal xulrunner-dev version + + -- Alexander Sack Fri, 07 Aug 2009 10:32:24 +0200 + +miro (2.0.5-1ubuntu1) karmic; urgency=low + + * Merge with Debian unstable, remaining changes: + - debian/control, debian/pyversions: Build with python 2.6 + * Fixes disk space capacity bug (wrongly informed users that disk was full) + (LP: #385197) + + -- Iain Lane Sat, 27 Jun 2009 13:27:30 +0100 + +miro (2.0.5-1) unstable; urgency=low + + * New upstream release. + + This should fix Youtube download errors in miro. + + debian/patches/40_mozsetup_fix.patch: Drop, no longer required. + + debian/patches/60_boost_mt.patch: Drop, no longer required. + + debian/patches/70_gst_extractor_fix.patch: Drop, no longer required. + + debian/patches/85_pysqlite.patch: Drop, no longer required. + * Standards-Version: 3.8.2 (no changes required). + * debian/rules: Drop dh_desktop call (lintian). + + -- Uwe Hermann Fri, 26 Jun 2009 21:29:54 +0200 + +miro (2.0.4-3) unstable; urgency=low + + * debian/patches/85_pysqlite.patch: Add (Closes: #528212). + This fixes the "Miro was unable to save its database: Disk Full" problems. + * debian/rules: Move some Makefile rule around again so all unneeded + test* files get deleted. + + -- Uwe Hermann Mon, 22 Jun 2009 18:43:54 +0200 + +miro (2.0.4-2) unstable; urgency=low + + * Add upstream patch debian/patches/40_mozsetup_fix.patch in order to fix + the "Miro Guide is not displayed" bug (Closes: #524712). + * This also fixes a crash when trying to access any item in the "Sites" + section (Closes: #523620, #533355). + * debian/miro.lintian-overrides: Adapt, feedparser.py moved location. + + -- Uwe Hermann Thu, 18 Jun 2009 21:38:04 +0200 + +miro (2.0.4-1) unstable; urgency=low + + * New upstream release. + + Fixes "English characters missed in zh_TW.UTF8 locale" (Closes: #523428). + * Add python-libtorrent (>= 0.14.2) to Build-Depends (not only Depends). + * debian/patches/70_gst_extractor_fix.patch: Add file, a backported upstream + patch (changeset 9373) to fix an issue where the gstreamer extractor was + not launched correctly to generate thumbnails. Thanks to Will Kahn-Greene + for creating and pointing out the patch. + * Build-depend on unversioned Boost packages again (Closes: #531115). + * Add a workaround for cdbs so the package builds successfully. + * debian/patches/90_handle_charref.patch: Add (Closes: #526641). + + -- Uwe Hermann Sun, 14 Jun 2009 13:45:57 +0200 + +miro (2.0.3-1ubuntu2) jaunty; urgency=low + + * debian/patches/100_gst_extractor.patch: Backport upstream patch (changeset + 9373) to fix issue where gstreamer extractor was not launched correctly to + generate thumbnails. Thanks to Will Kahn-Greene for creating and pointing + out the patch. + + -- Iain Lane Mon, 06 Apr 2009 23:20:45 +0100 + +miro (2.0.3-1ubuntu1) jaunty; urgency=low + + * Merge with Debian unstable (LP: #336029) + * debian/pyversions: Change to "2.6" to build for 2.6 + * debian/patches/70_python_version.patch: Add. Look in python 2.6 include + directory during the build. + * debian/control: Add python libtorrent bindings to build-deps to have these + available for the build. + * debian/control: Change python2.5 build-dep to python2.6 + + -- Iain Lane Tue, 17 Mar 2009 18:14:34 +0000 + +miro (2.0.3-1) unstable; urgency=low + + * New upstream release. + * Standards-Version: 3.8.1 (no changes required). + + -- Uwe Hermann Mon, 16 Mar 2009 15:29:35 +0100 + +miro (2.0.2-1) unstable; urgency=low + + * New upstream release. + * debian/patches: + + 40_feedparser.patch: Drop, merged upstream. + + 50_miro_debug_fix.patch: Update. + + 60_xine_driver.patch: Drop, fixed upstream in different form. + + 90_manpage_fixes.patch: Drop, merged upstream. + + debian/miro.xpm: Drop, merged upstream. + * Build-depend/depend on libtorrent-rasterbar-dev/python-libtorrent (the + Python bindings of libtorrent-rasterbar) instead of using the version + shipped with Miro. + * Switch to the new boost 1.37 packages as build-dependencies (needed for + the Debian package of libtorrent-rasterbar anyway). + * debian/60_boost_mt.patch: Add file, boost 1.37 only provides -mt variant. + * Use common-install-prehook-arch target to remove the unneeded + 'test' directory from the 'miro' package (Closes: #516308). + * Use LDFLAGS += "-Wl,--as-needed" to eliminate some unneeded dependencies. + + -- Uwe Hermann Mon, 09 Mar 2009 12:46:19 +0100 + +miro (2.0.1-1) unstable; urgency=low + + * New upstream release. + * debian/patches: + + 70_python_exec_fix.patch: Drop, merged upstream. + * Explicit dependency on python-pyrex (>= 0.9.6.4), as per upstream. + * Depends 'python-gtkmozembed (>= 2.19.1) | python-gnome2-extras (>= 2.19.1)' + to make migration of the package to Ubuntu easier (Closes: #514934). + * Closing random resolved bugs (Closes: #514956, #514797). + + -- Uwe Hermann Sat, 14 Feb 2009 18:01:53 +0100 + +miro (2.0-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. + + 70_python_exec_fix.patch: Add file. + + 80_xine_default_renderer.patch: Add file. Keep xine as default renderer. + + 90_manpage_fixes.patch: Add file. + + 95_esc.patch: Add file. ESC in non-fullscreen mode stops video playback. + * 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 + in the Debian package, so the xine libs are a requirement. If you want + to use gstreamer instead, you have to install the Suggests packages. + There's documentation in README.Debian for that. + + While we're at it, add gstreamer0.10-plugins-bad and also + gstreamer0.10-plugins-ugly as Suggests. + * 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. + + Install README.gtk-x11 and README.cli documentation files. + * debian/README.Debian: + + Add hints on how to use gdb with 'miro --debug' for debugging. + + Add HOWTO for installing gstreamer stuff if you want to switch the + renderer from xine to gstreamer. + + Drop obsolete items. + + -- Uwe Hermann Wed, 11 Feb 2009 01:32:44 +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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 + (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 . + * 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 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 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 and + Margarita Manterola . + * Fix incorrect plural form for Romanian (Closes: #401569). + Thanks Eddy Petrișor . + * Correct typos and also update both, the Brazilian Portuguese + and the Spanish translations (Closes: #402262). + Thanks Margarita Manterola . + + -- Uwe Hermann 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 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 Thu, 19 Oct 2006 20:46:30 +0200 + +democracyplayer (0.9.0.2-1) unstable; urgency=low + + * New upstream release. + + -- Uwe Hermann 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 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 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 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 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 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 Mon, 12 Jun 2006 17:53:30 +0200 + --- miro-3.0.1.orig/debian/miro.install +++ miro-3.0.1/debian/miro.install @@ -0,0 +1,7 @@ +usr/bin/ +usr/lib/ +usr/share/applications/ +usr/share/man/ +usr/share/mime/ +usr/share/pixmaps/ +usr/share/icons/ --- miro-3.0.1.orig/debian/pyversions +++ miro-3.0.1/debian/pyversions @@ -0,0 +1 @@ +2.6 --- miro-3.0.1.orig/debian/patches/100_catch_keyerror_in_update_items.patch +++ miro-3.0.1/debian/patches/100_catch_keyerror_in_update_items.patch @@ -0,0 +1,18 @@ +Fix for crash in update_items() when trying to delete an item that isn't +in the dict. (LP: #413387) + +diff -Nurp miro-2.5.3/portable/frontends/widgets/itemlist.py miro-2.5.3-working/portable/frontends/widgets/itemlist.py +--- miro-2.5.3/portable/frontends/widgets/itemlist.py 2009-10-14 15:18:23.000000000 -0700 ++++ miro-2.5.3-working/portable/frontends/widgets/itemlist.py 2010-01-14 22:47:55.571214252 -0800 +@@ -424,7 +424,10 @@ class ItemList(object): + # Item not already displayed + if should_show: + to_add.append(info) +- del self._hidden_items[info.id] ++ try: ++ del self._hidden_items[info.id] ++ except KeyError: ++ pass # Item already gone + else: + self._hidden_items[info.id] = info + if not already_sorted: --- miro-3.0.1.orig/debian/patches/10_movies_dir.patch +++ miro-3.0.1/debian/patches/10_movies_dir.patch @@ -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): --- miro-3.0.1.orig/debian/patches/20_no_autoupdate.patch +++ miro-3.0.1/debian/patches/20_no_autoupdate.patch @@ -0,0 +1,11 @@ +--- portable/startup.py.orig 2010-03-28 00:44:51.000000000 +0100 ++++ portable/startup.py 2010-03-28 00:45:01.000000000 +0100 +@@ -304,7 +304,7 @@ + yield None + commandline.startup() + 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. --- miro-3.0.1.orig/debian/patches/101_player_undefined_elapsed_time.patch +++ miro-3.0.1/debian/patches/101_player_undefined_elapsed_time.patch @@ -0,0 +1,12 @@ +diff -Nurp miro-2.5.3/portable/player.py miro-2.5.3-working/portable/player.py +--- miro-2.5.3/portable/player.py 2009-10-14 15:18:23.000000000 -0700 ++++ miro-2.5.3-working/portable/player.py 2010-01-15 01:38:10.046206098 -0800 +@@ -51,6 +51,8 @@ class Player(signals.SignalEmitter): + def skip_forward(self): + current = self.get_elapsed_playback_time() + duration = self.get_total_playback_time() ++ if not current: ++ current = 0 + pos = min(duration, current + 30.0) + self.seek_to(pos / duration) + --- miro-3.0.1.orig/debian/patches/50_miro_debug_fix.patch +++ miro-3.0.1/debian/patches/50_miro_debug_fix.patch @@ -0,0 +1,11 @@ +--- platform/gtk-x11/setup.py.orig 2009-02-28 17:29:13.000000000 +0100 ++++ platform/gtk-x11/setup.py 2009-02-28 17:29:26.000000000 +0100 +@@ -330,7 +330,7 @@ + exit; + fi + +- %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON ./miro.real --sync "$@" ++ %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON /usr/bin/miro.real --sync "$@" + else + %(runtimelib)smiro.real "$@" + fi