unity-lens-applications

Merge lp:~cyphermox/unity-lens-applications/libcolumbus into lp:unity-lens-applications

  1. libcolumbus
  2. Merge into trunk
Proposed by Mathieu Trudel-Lapierre
Status: Rejected
Rejected by: Mathieu Trudel-Lapierre
Proposed branch: lp:~cyphermox/unity-lens-applications/libcolumbus
Merge into: lp:unity-lens-applications
Diff against target: 80 lines (+18/-3) (has conflicts)
5 files modified
configure.ac (+5/-0)
debian/changelog (+10/-0)
debian/control (+1/-1)
src/unity-package-search.cc (+1/-1)
tests/unit/Makefile.am (+1/-1)
Text conflict in configure.ac
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~cyphermox/unity-lens-applications/libcolumbus
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Disapprove
PS Jenkins bot (community) continuous-integration Needs Fixing
Sebastien Bacher Approve
Review via email: mp+182467@code.launchpad.net

Commit message

Transition to new libcolumbus

Description of the change

Transition to new libcolumbus

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks good, thanks

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-autolanding/18/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1840/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-autolanding/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-autolanding/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-autolanding/16/console

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

FAILED: Continuous integration, rev:361
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/41/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/30/console

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

review: Needs Fixing (continuous-integration)
lp:~cyphermox/unity-lens-applications/libcolumbus updated
362. By Mathieu Trudel-Lapierre

update the name for libcolumbus0 to libcolumbus1, for real.

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

FAILED: Continuous integration, rev:362
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/42/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/31/console

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

review: Needs Fixing (continuous-integration)
lp:~cyphermox/unity-lens-applications/libcolumbus updated
363. By Mathieu Trudel-Lapierre

Really really call libcolumbus the right way

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

FAILED: Continuous integration, rev:363
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/43/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/32/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

You need the one line code change from

https://code.launchpad.net/~jpakkane/unity-lens-applications/columbus-upgrade/+merge/174350

lp:~cyphermox/unity-lens-applications/libcolumbus updated
364. By Mathieu Trudel-Lapierre

Fix for new libcolumbus1 api.

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

FAILED: Continuous integration, rev:364
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/46/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/35/console

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

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

Jpakkane's branch got merged instead.

review: Disapprove

Unmerged revisions

364. By Mathieu Trudel-Lapierre

Fix for new libcolumbus1 api.

363. By Mathieu Trudel-Lapierre

Really really call libcolumbus the right way

362. By Mathieu Trudel-Lapierre

update the name for libcolumbus0 to libcolumbus1, for real.

361. By Mathieu Trudel-Lapierre

debian/control: build-depend on libcolumbus1-dev instead of
libcolumbus0-dev.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-08-28 09:49:36 +0000
3+++ configure.ac 2013-08-29 04:39:42 +0000
4@@ -77,8 +77,13 @@
5 gee-1.0
6 dee-1.0 >= 0.5.16
7 zeitgeist-1.0 >= 0.3.8
8+<<<<<<< TREE
9 libcolumbus0 >= 0.4.0
10 unity >= 7.1.0
11+=======
12+ libcolumbus >= 1.0.0
13+ unity >= 7.0.0
14+>>>>>>> MERGE-SOURCE
15 unity-protocol-private
16 libgnome-menu-3.0 >= 3.6.0)
17
18
19=== modified file 'debian/changelog'
20--- debian/changelog 2013-08-28 13:21:46 +0000
21+++ debian/changelog 2013-08-29 04:39:42 +0000
22@@ -1,3 +1,4 @@
23+<<<<<<< TREE
24 unity-lens-applications (7.1.0+13.10.20130828.1-0ubuntu1) saucy; urgency=low
25
26 [ Michal Hruby ]
27@@ -12,6 +13,15 @@
28
29 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 28 Aug 2013 13:21:46 +0000
30
31+=======
32+unity-lens-applications (7.1.0+13.10.20130816.2-0ubuntu2) UNRELEASED; urgency=low
33+
34+ * debian/control: build-depend on libcolumbus1-dev instead of
35+ libcolumbus0-dev.
36+
37+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Tue, 27 Aug 2013 14:40:31 -0400
38+
39+>>>>>>> MERGE-SOURCE
40 unity-lens-applications (7.1.0+13.10.20130816.2-0ubuntu1) saucy; urgency=low
41
42 [ Pawel Stolowski ]
43
44=== modified file 'debian/control'
45--- debian/control 2013-08-28 09:49:36 +0000
46+++ debian/control 2013-08-29 04:39:42 +0000
47@@ -17,7 +17,7 @@
48 libxapian-dev,
49 libdb-dev,
50 libapt-pkg-dev,
51- libcolumbus0-dev,
52+ libcolumbus1-dev,
53 Standards-Version: 3.9.4
54 Homepage: https://launchpad.net/unity-lens-applications
55 # If you aren't a member of ~unity-team but need to upload packaging changes,
56
57=== modified file 'src/unity-package-search.cc'
58--- src/unity-package-search.cc 2013-05-16 11:37:05 +0000
59+++ src/unity-package-search.cc 2013-08-29 04:39:42 +0000
60@@ -714,7 +714,7 @@
61 UnityPackageSearchResult* result;
62
63 result = g_slice_new0 (UnityPackageSearchResult);
64- searcher->matcher->match(str, results);
65+ results = searcher->matcher->match(str);
66 for (size_t i = 0; i < results.size(); ++i)
67 {
68 try
69
70=== modified file 'tests/unit/Makefile.am'
71--- tests/unit/Makefile.am 2013-05-16 11:37:05 +0000
72+++ tests/unit/Makefile.am 2013-08-29 04:39:42 +0000
73@@ -108,7 +108,7 @@
74 nodist_test_software_center_details_SOURCES = $(test_software_center_details_VALASOURCES:.vala=.c)
75
76 unity-package-search.o : $(top_srcdir)/src/unity-package-search.cc $(top_srcdir)/src/unity-package-search.h
77- $(AM_V_GEN)$(CXX) --std=c++11 -g $(COVERAGE_CFLAGS) $(UNITY_PACKAGE_SEARCH_LIBS) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-1.0 libcolumbus0` -c $(top_srcdir)/src/unity-package-search.cc
78+ $(AM_V_GEN)$(CXX) --std=c++11 -g $(COVERAGE_CFLAGS) $(UNITY_PACKAGE_SEARCH_LIBS) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-1.0 libcolumbus` -c $(top_srcdir)/src/unity-package-search.cc
79 unity-ratings-db.o : $(top_srcdir)/src/unity-ratings-db.c $(top_srcdir)/src/unity-ratings-db.h
80 $(AM_V_CC)$(CC) -g $(COVERAGE_CFLAGS) $(unity_ratings_db_libs) `pkg-config --cflags --libs glib-2.0` -c $(top_srcdir)/src/unity-ratings-db.c
81

Subscribers

People subscribed via source and target branches