AppMenu GTK+

Merge lp:~mterry/appmenu-gtk/gwyddion into lp:appmenu-gtk/13.04

  1. gwyddion
  2. Merge into trunk.13.04
Proposed by Michael Terry
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 167
Merged at revision: 167
Proposed branch: lp:~mterry/appmenu-gtk/gwyddion
Merge into: lp:appmenu-gtk/13.04
Diff against target: 11 lines (+1/-0)
1 file modified
src/bridge.c (+1/-0)
To merge this branch: bzr merge lp:~mterry/appmenu-gtk/gwyddion
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+150424@code.launchpad.net

Commit message

Blacklist gwyddion

Description of the change

Blacklist gwyddion in appmenu-gtk, rather than inside gwyddion's packaging, so we can sync gwyddion from Debian again.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/./build=pbuilder,distribution=raring,flavor=armhf/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/./build=pbuilder,distribution=raring,flavor=i386/13/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/13//artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/./build=pbuilder,distribution=raring,flavor=armhf/13//artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/./build=pbuilder,distribution=raring,flavor=i386/13//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/appmenu-gtk-ci/13//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/bridge.c'
2--- src/bridge.c 2012-11-16 16:03:17 +0000
3+++ src/bridge.c 2013-02-25 20:13:24 +0000
4@@ -976,6 +976,7 @@
5 || (g_strcmp0 (prg, "emacs23-lucid") == 0)
6 || (g_strcmp0 (prg, "glade") == 0)
7 || (g_strcmp0 (prg, "gnome-panel") == 0)
8+ || (g_strcmp0 (prg, "gwyddion") == 0)
9 || (g_strcmp0 (prg, "wicd-client.py") == 0)
10 || (g_strcmp0 (prg, "IBM Notes") == 0)
11 || (g_strcmp0 (prg, "Lotus Notes") == 0))

Subscribers

People subscribed via source and target branches