Merge lp:~davidc3/unity-scope-gallica/books-master into lp:unity-scope-gallica

[David Callé]

Move to Books master and don't install __init__.py

Move to Books master and don't install __init__.py

[lp:~davidc3/unity-scope-gallica/books-master]

26. By David Callé on 2013-04-24

Complete master transition

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:26
http://jenkins.qa.ubuntu.com/job/unity-scope-gallica-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-gallica-raring-amd64-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-gallica-ci/1/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Works fine. +1

review: Approve

=== modified file 'data/gallica.scope.in'
--- data/gallica.scope.in	2013-03-15 17:28:50 +0000
+++ data/gallica.scope.in	2013-04-24 22:18:26 +0000
@@ -1,13 +1,13 @@
 [Scope]
-DBusName=com.canonical.Unity.Scope.Reference.Gallica
-DBusPath=/com/canonical/unity/scope/reference/gallica
+DBusName=com.canonical.Unity.Scope.Books.Gallica
+DBusPath=/com/canonical/unity/scope/books/gallica
 Icon=
 _Keywords=gallica;book;library;books;art;history;bnf;
 RequiredMetadata=
 OptionalMetadata=
 Loader=/usr/share/unity-scopes/gallica/unity_gallica_daemon.py
 RemoteContent=true
-Type=reference
+Type=books
 _Name=Gallica
 _Description=Find Art and Historical documents
 _SearchHint=Search Gallica

=== modified file 'data/unity-scope-gallica.service'
--- data/unity-scope-gallica.service	2013-03-14 12:28:06 +0000
+++ data/unity-scope-gallica.service	2013-04-24 22:18:26 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=com.canonical.Unity.Scope.Reference.Gallica
+Name=com.canonical.Unity.Scope.Books.Gallica
 Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py /usr/share/unity-scopes/gallica/unity_gallica_daemon.py

=== modified file 'setup.cfg'
--- setup.cfg	2013-03-13 19:41:46 +0000
+++ setup.cfg	2013-04-24 22:18:26 +0000
@@ -3,4 +3,4 @@
 
 [build_i18n]
 domain=unity-scope-gallica
-desktop_files=[('share/unity/scopes/reference', ('data/gallica.scope.in',))]
+desktop_files=[('share/unity/scopes/books', ('data/gallica.scope.in',))]

=== modified file 'setup.py'
--- setup.py	2013-03-20 20:24:11 +0000
+++ setup.py	2013-04-24 22:18:26 +0000
@@ -12,6 +12,5 @@
       data_files=[
     ('share/dbus-1/services', ['data/unity-scope-gallica.service']),
     ('share/unity-scopes/gallica', ['src/unity_gallica_daemon.py']),
-    ('share/unity-scopes/gallica', ['src/__init__.py']),
     ], cmdclass={'build':  build_extra.build_extra,
                  'build_i18n': build_i18n.build_i18n,})

=== modified file 'src/unity_gallica_daemon.py'
--- src/unity_gallica_daemon.py	2013-03-22 10:42:04 +0000
+++ src/unity_gallica_daemon.py	2013-04-24 22:18:26 +0000
@@ -27,8 +27,8 @@
 gettext.textdomain(APP_NAME)
 _ = gettext.gettext
 
-GROUP_NAME = 'com.canonical.Unity.Scope.Reference.Gallica'
-UNIQUE_PATH = '/com/canonical/unity/scope/reference/gallica'
+GROUP_NAME = 'com.canonical.Unity.Scope.Books.Gallica'
+UNIQUE_PATH = '/com/canonical/unity/scope/books/gallica'
 SEARCH_URI = 'http://gallica.bnf.fr/'
 SEARCH_HINT = _('Search Gallica')
 NO_RESULTS_HINT = _('Sorry, there are no Gallica results that match your search.')
@@ -39,9 +39,9 @@
 DEFAULT_RESULT_MIMETYPE = 'text/html'
 DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
 
-c1 = {'id'      :'sources',
-      'name'    :_('Art and historical documents'),
-      'icon'    :SVG_DIR + 'group-reference.svg',
+c1 = {'id'      :'top',
+      'name'    :_('Books and historical documents'),
+      'icon'    :SVG_DIR + 'group-books.svg',
       'renderer':Unity.CategoryRenderer.VERTICAL_TILE}
 CATEGORIES = [c1]
 FILTERS = []