Merge lp:~davidc3/unity-scope-songkick/fix-default-result-icon into lp:unity-scope-songkick

[David Callé]

Use an existing result icon

Use an existing result icon

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:13
http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-i386-ci/1/console

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

review: Needs Fixing (continuous-integration)

[lp:~davidc3/unity-scope-songkick/fix-default-result-icon]

14. By David Callé on 2013-08-16

Add python3-gi build dep

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:14
http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-i386-ci/2/console

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

review: Needs Fixing (continuous-integration)

[lp:~davidc3/unity-scope-songkick/fix-default-result-icon]

15. By David Callé on 2013-08-16

Odd control file typo

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-i386-ci/3

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

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

+1

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-03-14 15:15:41 +0000
+++ debian/control	2013-08-16 13:01:13 +0000
@@ -7,10 +7,11 @@
                python3-distutils-extra,
                pkg-config,
                python3-nose,
+               python3-gi,
                gir1.2-unity-5.0 (>= 6.8),
                gir1.2-dee-1.0,
                gir1.2-glib-2.0,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-scopes
 
 Package: unity-scope-songkick
@@ -19,8 +20,8 @@
          ${python3:Depends},
          python3,
          gir1.2-unity-5.0 (>= 6.8),
-         gir1.2-dee-1.0,
+         gir1.2-dee-1.0,
          unity-scopes-runner,
-         gir1.2-glib-2.0
+         gir1.2-glib-2.0,
 Description: songkick scope for Unity
  A Dash search plugin for songkick.

=== modified file 'src/unity_songkick_daemon.py'
--- src/unity_songkick_daemon.py	2013-03-14 12:29:06 +0000
+++ src/unity_songkick_daemon.py	2013-08-16 13:01:13 +0000
@@ -39,7 +39,7 @@
 PROVIDER_CREDITS = _('Powered by Songkick')
 SVG_DIR = '/usr/share/icons/unity-icon-theme/places/svg/'
 PROVIDER_ICON = SVG_DIR + 'service-songkick.svg'
-DEFAULT_RESULT_ICON = SVG_DIR + 'result-help.svg'
+DEFAULT_RESULT_ICON = SVG_DIR + 'service-songkick.svg'
 DEFAULT_RESULT_MIMETYPE = 'text/html'
 DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
 SEARCH_URI = 'http://api.songkick.com/api/3.0/events.json'