--- unity-scope-video-remote-0.3.5.orig/MANIFEST.in +++ unity-scope-video-remote-0.3.5/MANIFEST.in @@ -0,0 +1,8 @@ +include unity-scope-video-remote.service +include video-remote.scope +include src/unity-scope-video-remote +include COPYING +include unity-scope-video-remote.service +include video-remote.scope +include src/unity-scope-video-remote +include COPYING --- unity-scope-video-remote-0.3.5.orig/debian/copyright +++ unity-scope-video-remote-0.3.5/debian/copyright @@ -0,0 +1,20 @@ +Format: http://dep.debian.net/deps/dep5 +Source: https://launchpad.net/unity-lens-videos +Upstream-Name: unity-scope-video-remote +Upstream-Contact: David Calle + +Files: * +Copyright: 2011 David Calle +License: GPL-3.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". --- unity-scope-video-remote-0.3.5.orig/debian/changelog +++ unity-scope-video-remote-0.3.5/debian/changelog @@ -0,0 +1,85 @@ +unity-scope-video-remote (0.3.5-0ubuntu2.2) precise; urgency=low + + * Cherry-pick a fix from upstream: + - Use https connection when talking to the server (LP: #1071079) + * Update maintainer to be Ubuntu Developers + + -- Timo Jyrinki Mon, 25 Feb 2013 11:44:03 +0200 + +unity-scope-video-remote (0.3.5-0ubuntu2.1) precise-proposed; urgency=low + + * Exit on DBus hickup at startup, Unity will restart the scope (LP: #950862) + * Depends on gvfs-bin (LP: #972304) + + -- David Callé Wed, 27 Jun 2012 20:33:46 +0200 + +unity-scope-video-remote (0.3.5-0ubuntu2) precise; urgency=low + + * src/unity-scope-video-remote + - Updated server URL to the DNS name for what will be the production + server, currently resolving to the same experimental server + + -- Ken VanDine Fri, 06 Apr 2012 16:56:01 -0400 + +unity-scope-video-remote (0.3.5-0ubuntu1) precise; urgency=low + + [ David Callé ] + * Bug fixes + - Packaging fixes + + -- David Callé Tue, 05 Apr 2012 10:08:12 +0200 + +unity-scope-video-remote (0.3.4-0ubuntu1) precise; urgency=low + + [ David Callé ] + * Bug fixes + - Catch a type error (LP: #951131) + + -- David Callé Tue, 20 Mar 2012 09:43:10 +0200 + +unity-scope-video-remote (0.3.3-0ubuntu1) precise; urgency=low + + [ David Callé ] + * Bug fixes + - Handle video recommendations from the server (LP: #938672) + - Refresh sources periodically (LP: #938673) + - Fix encoding issue on server strings (LP: #939477) + - Fix minor encoding issue (LP: #939502) + - Update results when the lens is opened (LP: #939601) + - Don't assume Zeitgeist is ready to receive events (LP: #939745) + - Fix missing dependency on soup (LP: #940038) + - Prepare for upcoming server changes (LP: #942293) + - Make searches asynchronous (LP: #942129) + - Fix a crash on empty JSON from the server (LP: #940354) + * debian/control + - added missing depends for gir1.2-soup-2.4, gir1.2-glib-2.0, and + python-zeitgeist + + [ Ken VanDine ] + * debian/watch + - fixed watch file matching + + -- Ken VanDine Fri, 02 Mar 2012 15:23:59 -0500 + +unity-scope-video-remote (0.3-0ubuntu1) precise; urgency=low + + [ David Callé ] + * New upstream release + - Switched from urllib2 to libsoup to ease proxy work (LP: #938670) + + -- Ken VanDine Thu, 23 Feb 2012 03:42:24 -0500 + +unity-scope-video-remote (0.2-0ubuntu1) precise; urgency=low + + [ David Callé ] + * Bug fixes + - Add Online videos to Recently Watched (LP: #937278) + + -- David Callé Tue, 22 Feb 2012 12:05:00 +0200 + +unity-scope-video-remote (0.1.1-0ubuntu1) precise; urgency=low + + [ David Callé ] + * First release of the remote video scope + + -- David Callé Tue, 31 Jan 2012 15:55:00 +0200 --- unity-scope-video-remote-0.3.5.orig/debian/rules +++ unity-scope-video-remote-0.3.5/debian/rules @@ -0,0 +1,6 @@ +#!/usr/bin/make -f +# -*- makefile -*- + + +%: + dh $@ --with python2 --- unity-scope-video-remote-0.3.5.orig/debian/control +++ unity-scope-video-remote-0.3.5/debian/control @@ -0,0 +1,24 @@ +Source: unity-scope-video-remote +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: David Calle +Build-Depends: debhelper (>= 8), python, python-distutils-extra +Standards-Version: 3.9.2 +Homepage: https://launchpad.net/unity-lens-videos + +Package: unity-scope-video-remote +Architecture: all +Depends: ${misc:Depends}, + ${python:Depends}, + gir1.2-unity-5.0, + gir1.2-dee-1.0, + gir1.2-soup-2.4, + gir1.2-glib-2.0, + python-zeitgeist, + gvfs-bin, + unity-lens-video +Enhances: unity-lens-video +Description: Remote videos engine + This scope adds a remote videos search engine to the Video lens. + --- unity-scope-video-remote-0.3.5.orig/debian/compat +++ unity-scope-video-remote-0.3.5/debian/compat @@ -0,0 +1 @@ +8 --- unity-scope-video-remote-0.3.5.orig/debian/watch +++ unity-scope-video-remote-0.3.5/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/unity-lens-videos/+download .*/unity-scope-video-remote-([0-9.]+)\.tar\.gz --- unity-scope-video-remote-0.3.5.orig/src/unity-scope-video-remote +++ unity-scope-video-remote-0.3.5/src/unity-scope-video-remote @@ -43,7 +43,7 @@ #pylint: enable=E0611 BUS_NAME = "net.launchpad.scope.RemoteVideos" -SERVER = "http://video.u1.to/v0" +SERVER = "https://videosearch.ubuntu.com/v0" REFRESH_INTERVAL = 3600 # fetch sources & recommendations once an hour RETRY_INTERVAL = 60 # retry sources/recommendations after a minute @@ -76,6 +76,8 @@ self.scope.connect ("activate-uri", self.on_activate_uri) self.session = Soup.SessionAsync() self.session.props.user_agent = "Unity Video Lens Remote Scope v0.4" + self.session.props.ssl_use_system_ca_file = True + self.session.props.ssl_strict = True self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME) self.query_list_of_sources() self.update_recommendations() @@ -287,20 +289,23 @@ def main(): """Connect to the session bus, exit if there is a running instance.""" - session_bus_connection = Gio.bus_get_sync(Gio.BusType.SESSION, None) - session_bus = Gio.DBusProxy.new_sync(session_bus_connection, 0, None, - 'org.freedesktop.DBus', - '/org/freedesktop/DBus', - 'org.freedesktop.DBus', None) - result = session_bus.call_sync('RequestName', - GLib.Variant("(su)", (BUS_NAME, 0x4)), - 0, -1, None) - - # Unpack variant response with signature "(u)". 1 means we got it. - result = result.unpack()[0] - - if result != 1: - print >> sys.stderr, "Failed to own name %s. Bailing out." % BUS_NAME + try: + session_bus_connection = Gio.bus_get_sync(Gio.BusType.SESSION, None) + session_bus = Gio.DBusProxy.new_sync(session_bus_connection, 0, None, + 'org.freedesktop.DBus', + '/org/freedesktop/DBus', + 'org.freedesktop.DBus', None) + result = session_bus.call_sync('RequestName', + GLib.Variant("(su)", (BUS_NAME, 0x4)), + 0, -1, None) + + # Unpack variant response with signature "(u)". 1 means we got it. + result = result.unpack()[0] + + if result != 1: + print >> sys.stderr, "Failed to own name %s. Bailing out." % BUS_NAME + raise SystemExit(1) + except: raise SystemExit(1) Daemon()