Merge lp:~charlesk/ido/nogtk2 into lp:ido/12.10

Proposed by Charles Kerr
Status: Merged
Approved by: Charles Kerr
Approved revision: 115
Merged at revision: 112
Proposed branch: lp:~charlesk/ido/nogtk2
Merge into: lp:ido/12.10
Diff against target: 0 lines
To merge this branch: bzr merge lp:~charlesk/ido/nogtk2
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Needs Fixing
Lars Karlitski (community) Approve
Review via email: mp+105010@code.launchpad.net

Description of the change

require gtk3

To post a comment you must log in.
Revision history for this message
Lars Karlitski (larsu) :
review: Approve
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ido-autolanding/1/

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ido-autolanding/2/

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/ido-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ido-ci/./label=precise/2/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Jenkins is reporting a failure in dh_install; "dh_install: libido-0.1-0 missing files (debian/tmp/usr/lib/libido-*.so.*), aborting". I'm noticing that he's trying to build in precise, will update this proposal to quantal and kick off again, apologies for any further merge-proposal spam.

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ido-autolanding/3/

review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Jenkins builds trunk cleanly in quantal; do we want to fix the packaging for this branch before landing this change?

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ido-autolanding/6/

review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

The failure above is a conflict during merging:
Committed revision 112.
+ cd work/trunk
+ [ -n lp:ido ]
+ bzr merge lp:ido
+N src/idoswitchmenuitem.c
+N src/idoswitchmenuitem.h
 M NEWS
 M configure.ac
 M example/menus.c
 M src/Makefile.am
Text conflict in configure.ac
1 conflicts encountered.

lp:~charlesk/ido/nogtk2 updated
112. By Charles Kerr

sync with lp:ido

113. By Charles Kerr

remove the gtk2 conditional compiles for IdoEntryMenuItem

114. By Charles Kerr

remove the gtk2 conditional compiles for IdoCalendarMenuItem

115. By Charles Kerr

remove the gtk2 conditional compiles for IdoMessageDialog

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/ido-ci/12/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ido-ci/./label=quantal/12/console

review: Needs Fixing (continuous-integration)

Preview Diff

Empty

Subscribers

People subscribed via source and target branches