BAMF

Merge lp:~bregma/bamf/lp-1415052 into lp:bamf

  1. lp-1415052
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 606
Merged at revision: 615
Proposed branch: lp:~bregma/bamf/lp-1415052
Merge into: lp:bamf
Diff against target: 78 lines (+14/-2)
5 files modified
debian/control (+1/-0)
debian/gir1.2-bamf-3.install (+1/-1)
m4/gcov.m4 (+1/-1)
src/bamf-matcher.c (+10/-0)
src/bamf-matcher.h (+1/-0)
To merge this branch: bzr merge lp:~bregma/bamf/lp-1415052
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+247730@code.launchpad.net

Commit message

fixed Ubuntu packaging for multi-arch

Description of the change

Fix Ubuntu packaging for multi-arch.

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

FAILED: Continuous integration, rev:605
http://jenkins.qa.ubuntu.com/job/bamf-ci/107/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/107/rebuild

review: Needs Fixing (continuous-integration)
lp:~bregma/bamf/lp-1415052 updated
606. By Stephen M. Webb

merged lp:~larsu/bamf/lp1407711 to pick up an unrelated change for Ubuntu lcov version bump

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:606
http://jenkins.qa.ubuntu.com/job/bamf-ci/108/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-amd64-ci/4
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/108/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:606
http://jenkins.qa.ubuntu.com/job/bamf-ci/110/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-amd64-ci/6
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/bamf-vivid-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/110/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:606
http://jenkins.qa.ubuntu.com/job/bamf-ci/116/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-wily-amd64-ci/1
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/bamf-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/116/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2014-04-07 21:31:21 +0000
+++ debian/control 2015-01-27 17:12:48 +0000
@@ -93,6 +93,7 @@
93Package: gir1.2-bamf-393Package: gir1.2-bamf-3
94Section: introspection94Section: introspection
95Architecture: any95Architecture: any
96Multi-Arch: same
96Depends: ${gir:Depends},97Depends: ${gir:Depends},
97 ${misc:Depends},98 ${misc:Depends},
98Description: GObject introspection data for the Bamf library99Description: GObject introspection data for the Bamf library
99100
=== modified file 'debian/gir1.2-bamf-3.install'
--- debian/gir1.2-bamf-3.install 2012-12-19 21:57:09 +0000
+++ debian/gir1.2-bamf-3.install 2015-01-27 17:12:48 +0000
@@ -1,1 +1,1 @@
1usr/lib/girepository-1.0/Bamf-*.typelib1usr/lib/*/girepository-1.0/Bamf-*.typelib
22
=== modified file 'm4/gcov.m4'
--- m4/gcov.m4 2014-01-08 18:36:02 +0000
+++ m4/gcov.m4 2015-01-27 17:12:48 +0000
@@ -33,7 +33,7 @@
33 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])33 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
34 fi34 fi
3535
36 lcov_version_list="1.6 1.7 1.8 1.9 1.10"36 lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11 1.12"
37 AC_CHECK_PROG(LCOV, lcov, lcov)37 AC_CHECK_PROG(LCOV, lcov, lcov)
38 AC_CHECK_PROG(GENHTML, genhtml, genhtml)38 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
3939
4040
=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c 2014-04-09 16:59:37 +0000
+++ src/bamf-matcher.c 2015-01-27 17:12:48 +0000
@@ -1617,6 +1617,7 @@
1617 BamfMatcherPrivate *priv;1617 BamfMatcherPrivate *priv;
1618 BamfLegacyWindow *window;1618 BamfLegacyWindow *window;
1619 GList *desktop_files = NULL, *l;1619 GList *desktop_files = NULL, *l;
1620 gchar *app_id;
1620 char *desktop_file = NULL;1621 char *desktop_file = NULL;
1621 const char *desktop_class = NULL;1622 const char *desktop_class = NULL;
1622 const char *class_name = NULL;1623 const char *class_name = NULL;
@@ -1629,6 +1630,7 @@
16291630
1630 priv = self->priv;1631 priv = self->priv;
1631 window = bamf_window_get_window (bamf_window);1632 window = bamf_window_get_window (bamf_window);
1633 app_id = bamf_legacy_window_get_hint (window, _GTK_APPLICATION_ID);
1632 desktop_file = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);1634 desktop_file = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
1633 class_name = bamf_legacy_window_get_class_name (window);1635 class_name = bamf_legacy_window_get_class_name (window);
1634 instance_name = bamf_legacy_window_get_class_instance_name (window);1636 instance_name = bamf_legacy_window_get_class_instance_name (window);
@@ -1656,6 +1658,14 @@
1656 }1658 }
1657 }1659 }
16581660
1661 if (app_id)
1662 {
1663 if (g_hash_table_contains (priv->desktop_id_table, app_id))
1664 desktop_files = g_list_prepend (desktop_files, app_id);
1665 else
1666 g_free (app_id);
1667 }
1668
1659 if (desktop_file)1669 if (desktop_file)
1660 {1670 {
1661 desktop_class = bamf_matcher_get_desktop_file_class (self, desktop_file);1671 desktop_class = bamf_matcher_get_desktop_file_class (self, desktop_file);
16621672
=== modified file 'src/bamf-matcher.h'
--- src/bamf-matcher.h 2013-08-07 15:50:56 +0000
+++ src/bamf-matcher.h 2015-01-27 17:12:48 +0000
@@ -46,6 +46,7 @@
46#define BAMF_MATCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), BAMF_TYPE_MATCHER, BamfMatcherClass))46#define BAMF_MATCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), BAMF_TYPE_MATCHER, BamfMatcherClass))
4747
48#define _NET_WM_DESKTOP_FILE "_NET_WM_DESKTOP_FILE"48#define _NET_WM_DESKTOP_FILE "_NET_WM_DESKTOP_FILE"
49#define _GTK_APPLICATION_ID "_GTK_APPLICATION_ID"
4950
50typedef struct _BamfMatcher BamfMatcher;51typedef struct _BamfMatcher BamfMatcher;
51typedef struct _BamfMatcherClass BamfMatcherClass;52typedef struct _BamfMatcherClass BamfMatcherClass;

Subscribers

People subscribed via source and target branches

to all changes: