r19906 - in /packages/unstable/epiphany-extensions-more: debian/changelog debian/control debian/control.in misc/video-downloader.py

[joss at users.alioth.debian.org]

Author: joss
Date: Wed May  6 15:07:08 2009
New Revision: 19906

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19906
Log:
* Get the video downloader extension to work with clive 2.
* Update dependency accordingly.
* Bump version to 2.26, no source changes required.

Modified:
    packages/unstable/epiphany-extensions-more/debian/changelog
    packages/unstable/epiphany-extensions-more/debian/control
    packages/unstable/epiphany-extensions-more/debian/control.in
    packages/unstable/epiphany-extensions-more/misc/video-downloader.py

Modified: packages/unstable/epiphany-extensions-more/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/debian/changelog?rev=19906&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions-more/debian/changelog (original)
+++ packages/unstable/epiphany-extensions-more/debian/changelog Wed May  6 15:07:08 2009
@@ -1,9 +1,11 @@
-epiphany-extensions-more (2.24.2) UNRELEASED; urgency=low
+epiphany-extensions-more (2.26.0) unstable; urgency=low
 
-  * Relax dependency on clive. Closes: #521858.
   * Standards version is 3.8.1.
+  * Get the video downloader extension to work with clive 2.
+  * Update dependency accordingly.
+  * Bump version to 2.26, no source changes required.
 
- -- Josselin Mouette <joss at debian.org>  Mon, 30 Mar 2009 16:49:30 +0200
+ -- Josselin Mouette <joss at debian.org>  Wed, 06 May 2009 17:06:36 +0200
 
 epiphany-extensions-more (2.24.1) unstable; urgency=low
 

Modified: packages/unstable/epiphany-extensions-more/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/debian/control?rev=19906&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions-more/debian/control (original)
+++ packages/unstable/epiphany-extensions-more/debian/control Wed May  6 15:07:08 2009
@@ -20,7 +20,7 @@
          python-gobject,
          python-gnome2,
          python-notify,
-         clive
+         clive (>= 2)
 Description: Collection of third-party extensions for the Epiphany web browser
  This package contains various user-contributed extensions for 
  Epiphany, an intuitive web browser for the GNOME desktop.

Modified: packages/unstable/epiphany-extensions-more/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/debian/control.in?rev=19906&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions-more/debian/control.in (original)
+++ packages/unstable/epiphany-extensions-more/debian/control.in Wed May  6 15:07:08 2009
@@ -20,7 +20,7 @@
          python-gobject,
          python-gnome2,
          python-notify,
-         clive
+         clive (>= 2)
 Description: Collection of third-party extensions for the Epiphany web browser
  This package contains various user-contributed extensions for 
  Epiphany, an intuitive web browser for the GNOME desktop.

Modified: packages/unstable/epiphany-extensions-more/misc/video-downloader.py
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/misc/video-downloader.py?rev=19906&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions-more/misc/video-downloader.py (original)
+++ packages/unstable/epiphany-extensions-more/misc/video-downloader.py Wed May  6 15:07:08 2009
@@ -25,10 +25,11 @@
 videos then can be via clive.
 """
 
-CLIVE_VERSION = 1
+CLIVE_VERSION = 2
 
 import re
 import gconf
+import os
 from subprocess import Popen, PIPE
 from os import path
 
@@ -188,7 +189,7 @@
 
 def download_videos(window, embed, video_urls, open_inside):
     clive_cmd_base = [ 'clive', '--quiet', '--emit-csv' ]
-    clive_env = {}
+    clive_env = { "HOME": os.getenv("HOME") }
     if proxy != None:
         clive_env["http_proxy"]=proxy
 
@@ -278,7 +279,7 @@
     else:
         title_text = _('Video Downloader extension: Extracting video information via clive failed:')
         error_text = ''.join(['Exited with status %s.\n' % condition] +
-                               clive_stderr.readlines() + '==========\n' +
+                               clive_stderr.readlines() + ['==========\n'] +
                                clive_stdout.readlines())
         message = gtk.MessageDialog(type=gtk.MESSAGE_ERROR, 
                 buttons=gtk.BUTTONS_CLOSE, message_format=title_text)