Merge lp:~paulliu/unity-lens-applications/phablet into lp:unity-lens-applications/phablet

[Ying-Chun Liu]

* Filtering X-Ubuntu-Touch.

Please refer to
https://blueprints.launchpad.net/ubuntu/+spec/client-1303-unity-ui-dash

1. Filtering X-Ubuntu-Touch.
2. Provide X-Ubuntu-Stage info.
3. Add more categories.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-i386-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-phablet-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[Ying-Chun Liu (paulliu)]

Seems to me that the above building failure is quantal build environment problem?

[Michał Sawicz (saviq)]

Yes, missing libcolumbus - built now in ppa:phablet-team and I've restarted the job.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-i386-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-phablet-ci/2/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Order of the categories is wrong, we need it to be:

Running
Featured
Frequent
Installed
Available for Download

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-armhf-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-i386-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-armhf-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-i386-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-phablet-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:333
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-i386-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-phablet-ci/4/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Hey Paul, we have reevaluated the approach and I'll have to ask you to tweak the approach:
* revert all the changes to categories
* drop the X-Ubuntu-Stage changes

Only leave the X-Ubuntu-Touch filter, please.

review: Needs Fixing

[lp:~paulliu/unity-lens-applications/phablet]

331. By Ying-Chun Liu on 2013-03-28

Filtering X-Ubuntu-Touch. Default: false.

[Ying-Chun Liu (paulliu)]

Sorry, forget to write a comment but please re-review the commit 331 I've pushed last week.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-quantal-i386-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-phablet-raring-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-phablet-ci/5/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Please release with a version number bumped to 7.80, to prevent uptades from distro from overwriting.

review: Needs Fixing

[lp:~paulliu/unity-lens-applications/phablet]

332. By Ying-Chun Liu on 2013-04-03

Release with version 7.80: to avoid updates from distro.

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-06 13:25:55 +0000
+++ debian/changelog	2013-04-03 16:15:32 +0000
@@ -1,3 +1,9 @@
+unity-lens-applications (7.80-0ubuntu1) raring; urgency=low
+
+  * Release with version 7.80: to avoid updates from distro.
+
+ -- Ying-Chun Liu (PaulLiu) <[e-mail]>  Wed, 03 Apr 2013 23:52:59 +0800
+
 unity-lens-applications (6.10.0daily13.03.06-0ubuntu1) raring; urgency=low
 
   [ Jussi Pakkanen ]

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-02-28 09:18:42 +0000
+++ src/daemon.vala	2013-04-03 16:15:32 +0000
@@ -905,6 +905,21 @@
         AppInfo? app = appmanager.lookup (desktop_id);
         full_path = appmanager.get_path (desktop_id);
 
+        bool x_ubuntu_touch=false;
+        if (full_path != null) {
+            GLib.KeyFile key_file = new GLib.KeyFile();
+            key_file.load_from_file(full_path, GLib.KeyFileFlags.NONE);
+            try {
+                x_ubuntu_touch = key_file.get_boolean("Desktop Entry", "X-Ubuntu-Touch");
+            } catch (GLib.KeyFileError e) {
+                x_ubuntu_touch = false;
+            }
+        }
+
+        if (!x_ubuntu_touch) {
+            continue;
+        }
+
         /* De-dupe by 'application://foo.desktop' URI. Also note that we need
          * to de-dupe before we chuck out NoDisplay app infos, otherwise they'd
          * show up from alternate sources */