diff -Nru unity-china-photo-scope-1.2/data/sogou.scope.in unity-china-photo-scope-1.3/data/sogou.scope.in --- unity-china-photo-scope-1.2/data/sogou.scope.in 2014-02-21 08:27:38.000000000 +0000 +++ unity-china-photo-scope-1.3/data/sogou.scope.in 2016-03-23 07:44:54.000000000 +0000 @@ -1,6 +1,6 @@ [Scope] -DBusName=com.canonical.Unity.Scope.Photos.Sogou -DBusPath=/com/canonical/unity/scope/photos/sogou +DBusName=com.ubuntukylin.Unity.Scope.Photos.Sogou +DBusPath=/com/ubuntukylin/unity/scope/photos/sogou Icon=/usr/share/icons/unity-icon-theme/places/svg/service-sogou.svg _Keywords=sogou; RequiredMetadata= diff -Nru unity-china-photo-scope-1.2/data/unity-scope-sogou.service unity-china-photo-scope-1.3/data/unity-scope-sogou.service --- unity-china-photo-scope-1.2/data/unity-scope-sogou.service 2014-02-21 08:27:38.000000000 +0000 +++ unity-china-photo-scope-1.3/data/unity-scope-sogou.service 2016-03-23 07:44:21.000000000 +0000 @@ -1,3 +1,3 @@ [D-BUS Service] -Name=com.canonical.Unity.Scope.Photos.Sogou +Name=com.ubuntukylin.Unity.Scope.Photos.Sogou Exec=/usr/share/unity-scopes/sogou/unity_sogou_daemon.py diff -Nru unity-china-photo-scope-1.2/debian/changelog unity-china-photo-scope-1.3/debian/changelog --- unity-china-photo-scope-1.2/debian/changelog 2014-02-21 16:30:28.000000000 +0000 +++ unity-china-photo-scope-1.3/debian/changelog 2016-03-29 06:28:47.000000000 +0000 @@ -1,3 +1,10 @@ +unity-china-photo-scope (1.3-0ubuntu1) xenial; urgency=low + + * Fix preview. (LP: #1538893) + * update copyright file. + + -- shijing Fri, 11 Mar 2016 15:05:36 +0000 + unity-china-photo-scope (1.2-0ubuntu1) trusty; urgency=low * New upstream release (LP: #1282931) diff -Nru unity-china-photo-scope-1.2/debian/control unity-china-photo-scope-1.3/debian/control --- unity-china-photo-scope-1.2/debian/control 2014-02-21 16:30:03.000000000 +0000 +++ unity-china-photo-scope-1.3/debian/control 2016-03-23 07:54:45.000000000 +0000 @@ -7,7 +7,7 @@ python3-distutils-extra, python-distutils-extra, dh-translations -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: https://launchpad.net/unity-china-photo-scope Vcs-Bzr: https://code.launchpad.net/~unity-china-photo-scope/trunk diff -Nru unity-china-photo-scope-1.2/debian/copyright unity-china-photo-scope-1.3/debian/copyright --- unity-china-photo-scope-1.2/debian/copyright 2013-07-31 08:12:36.000000000 +0000 +++ unity-china-photo-scope-1.3/debian/copyright 2016-03-23 07:54:45.000000000 +0000 @@ -1,7 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: unity-china-photo-scope Upstream-Contact: shijing - Jonas Zhang Source: http://launchpad.net/unity-china-photo-scope Files: * @@ -19,9 +18,9 @@ On Debian/Ubuntu systems, the full text of the GPL v3 can be found in `/usr/share/common-licenses/GPL-3' -Files: debian/* -Copyright: (C) 2013 National University of Defense Technology(NUDT) & Kylin Ltd -License: GPL-3 +Files: */src/unity_sogou_daemon.py +Copyright: (C) 2012 David Calle 2013 National University of Defense Technology(NUDT) & Kylin Ltd +License: GPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 as published by the Free Software Foundation. @@ -34,9 +33,9 @@ On Debian/Ubuntu systems, the full text of the GPL v3 can be found in `/usr/share/common-licenses/GPL-3' -Files: src/unity_sogou_daemon.py -Copyright: (C) 2012 David Calle 2013 National University of Defense Technology(NUDT) & Kylin Ltd -License: GPL-3 +Files: debian/* +Copyright: (C) 2013 National University of Defense Technology(NUDT) & Kylin Ltd +License: GPL-2+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 as published by the Free Software Foundation. @@ -48,3 +47,5 @@ . On Debian/Ubuntu systems, the full text of the GPL v3 can be found in `/usr/share/common-licenses/GPL-3' + + diff -Nru unity-china-photo-scope-1.2/src/unity_sogou_daemon.py unity-china-photo-scope-1.3/src/unity_sogou_daemon.py --- unity-china-photo-scope-1.2/src/unity_sogou_daemon.py 2014-02-21 08:27:38.000000000 +0000 +++ unity-china-photo-scope-1.3/src/unity_sogou_daemon.py 2016-03-23 07:46:00.000000000 +0000 @@ -65,7 +65,7 @@ # Translatable strings SOURCE = _("Sogou") NO_RESULTS_HINT = _("Sorry, there are no photos that match your search.") -BUS_NAME = "com.canonical.Unity.Scope.Photos.Sogou" +BUS_NAME = "com.ubuntukylin.Unity.Scope.Photos.Sogou" #CAT_MINE = _("My Photos") #CAT_FRIENDS = _("Friends Photos") #CAT_ONLINE = _("Online Photos") @@ -100,7 +100,7 @@ def __init__(self): """Set some initial values for the scope and connect to Unity""" - self._scope = Scope (dbus_path="/com/canonical/unity/scope/photos/sogou", id="sogou") + self._scope = Scope (dbus_path="/com/ubuntukylin/unity/scope/photos/sogou", id="sogou") self._sources_options = [] self.url = '' self.items = [] @@ -235,7 +235,7 @@ search.emit('finished') return if not self.is_in_China () : - print("Error can not search video from Sogou !") + print("Error can not search photo from Sogou !") return self._queued_search = (scope, search, search_type, cancellable) @@ -279,16 +279,16 @@ for index, k in enumerate(self.items): self.new_dic['title'] = k['title'] self.new_dic['page_url'] = k['page_url'] - self.new_dic['thumbUrl'] = k['thumbUrl'] + self.new_dic['pic_url'] = k['pic_url'] title = k['title'] page_url = k['page_url'] - thumbUrl = k['thumbUrl'] + pic_url = k['pic_url'] size = k['size'] title1 = k['title1'] width = k['width'] height = k['height'] - model.append(uri=self.new_dic['page_url'],icon_hint=self.new_dic['thumbUrl'],category=0,mimetype="text/html",title=self.new_dic['title'],comment='',dnd_uri=self.new_dic['page_url'],result_type=Unity.ResultType.PERSONAL) - self.result_list.append({'page_url':page_url, 'thumbUrl':thumbUrl,'title':title,'size':size,'title1':title1,'height':height,'width':width}) + model.append(uri=self.new_dic['page_url'],icon_hint=self.new_dic['pic_url'],category=0,mimetype="text/html",title=self.new_dic['title'],comment='',dnd_uri=self.new_dic['page_url'],result_type=Unity.ResultType.PERSONAL) + self.result_list.append({'page_url':page_url, 'pic_url':pic_url,'title':title,'size':size,'title1':title1,'height':height,'width':width}) @@ -385,7 +385,7 @@ tag_list = [] for i in self.result_list: if url == i['page_url']: - image = i['thumbUrl'] + image = i['pic_url'] name = i['title'] size = i['size'] subtitle = i['title1'] diff -Nru unity-china-photo-scope-1.2/tests/manual/sogou-photos.txt unity-china-photo-scope-1.3/tests/manual/sogou-photos.txt --- unity-china-photo-scope-1.2/tests/manual/sogou-photos.txt 2014-02-21 08:27:38.000000000 +0000 +++ unity-china-photo-scope-1.3/tests/manual/sogou-photos.txt 2016-03-23 07:45:33.000000000 +0000 @@ -17,7 +17,7 @@ Actions: Disable the online search in gnome-control-center or directly in gsettings -(com.canonical.Unity.Lenses "remote-content-search" to none) +(com.ubuntukylin.Unity.Lenses "remote-content-search" to none) Perfom a search in the home dash and within the photo lens. Expected Results: