Merge lp:~unity-team/unity-lens-video/unity-scope-video-remote-precise into lp:ubuntu/precise/unity-scope-video-remote

[Timo Jyrinki]

* Cherry-pick a fix from upstream:
  - Use https connection when talking to the server (LP: #1071079)

* Cherry-pick a fix from upstream:
  - Use https connection when talking to the server (LP: #1071079)

[Timo Jyrinki (timo-jyrinki)]

Tested manually with a built package (from ppa:unity-team/sru) with tcpdump.

[Sebastien Bacher (seb128)]

thanks, I've uploaded that to the precise SRU queue

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-01-31 15:55:00 +0000
+++ MANIFEST.in	2013-04-15 08:48:32 +0000
@@ -2,3 +2,7 @@
 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
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-04-06 20:56:42 +0000
+++ debian/changelog	2013-04-15 08:48:32 +0000
@@ -1,3 +1,18 @@
+unity-scope-video-remote (0.3.5-0ubuntu2.2) UNRELEASED; 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 <[e-mail]>  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é <[e-mail]>  Wed, 27 Jun 2012 20:33:46 +0200
+
 unity-scope-video-remote (0.3.5-0ubuntu2) precise; urgency=low
 
   * src/unity-scope-video-remote
 
=== modified file 'debian/control'
--- debian/control	2012-03-02 20:24:25 +0000
+++ debian/control	2013-04-15 08:48:32 +0000
@@ -1,7 +1,8 @@
 Source: unity-scope-video-remote
 Section: gnome
 Priority: optional
-Maintainer: David Calle <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: David Calle <[e-mail]>
 Build-Depends: debhelper (>= 8), python, python-distutils-extra
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/unity-lens-videos
@@ -15,6 +16,7 @@
          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
 
=== modified file 'debian/rules' (properties changed: +x to -x)
=== modified file 'src/unity-scope-video-remote'
--- src/unity-scope-video-remote	2012-04-06 20:56:42 +0000
+++ src/unity-scope-video-remote	2013-04-15 08:48:32 +0000
@@ -43,7 +43,7 @@
 #pylint: enable=E0611
 
 BUS_NAME = "net.launchpad.scope.RemoteVideos"
-SERVER = "http://videosearch.ubuntu.com/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()