Online Accounts: libaccounts-glib

Merge lp://staging/~robru/libaccounts-glib/inline-packaging into lp://staging/libaccounts-glib

  1. inline-packaging
  2. Merge into trunk
Proposed by Robert Bruce Park
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 167
Merged at revision: 163
Proposed branch: lp://staging/~robru/libaccounts-glib/inline-packaging
Merge into: lp://staging/libaccounts-glib
Diff against target: 419 lines (+348/-0)
14 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+77/-0)
debian/compat (+1/-0)
debian/control (+78/-0)
debian/copyright (+14/-0)
debian/gir1.2-accounts-1.0.install (+2/-0)
debian/libaccounts-glib-dev.dirs (+2/-0)
debian/libaccounts-glib-dev.install (+6/-0)
debian/libaccounts-glib-doc.install (+1/-0)
debian/libaccounts-glib-tools.install (+2/-0)
debian/libaccounts-glib0.dirs (+1/-0)
debian/libaccounts-glib0.install (+1/-0)
debian/libaccounts-glib0.symbols (+135/-0)
debian/rules (+26/-0)
To merge this branch: bzr merge lp://staging/~robru/libaccounts-glib/inline-packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Alberto Mardegan (community) Approve
Robert Bruce Park (community) Approve
David King (community) Needs Fixing
Víctor R. Ruiz Pending
Didier Roche-Tolomelli Pending
Ken VanDine Pending
Review via email: mp+144419@code.staging.launchpad.net

Commit message

Inline packaging metadata.

Description of the change

So I am experiencing a test failure with this build, not sure how to fix it. Here is the build log: http://paste.ubuntu.com/1561300/

Also, for some reason automake was configured to expect gtk-doc.make file in the source tree root. Is that standard practise? It wasn't there (and git was configured specifically to ignore it), so I had to create a symlink there to the system file in order for the build to even start.

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

FAILED: Continuous integration, rev:162
http://s-jenkins:8080/job/libaccounts-glib-ci/1/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=amd64/1/console
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=i386/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libaccounts-glib-ci/1//rebuild/?

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

FAILED: Continuous integration, rev:163
http://s-jenkins:8080/job/libaccounts-glib-ci/2/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=amd64/2/console
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=i386/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libaccounts-glib-ci/2//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
David King (amigadave) wrote :

There is a better way of fixing this than creating a symlink, which is to use the "gtkdocize" tool to copy (or symlink) gtk-doc.make to the build directory. The autogen.sh script in the libacounts-glib git repository already does this:

http://code.google.com/p/accounts-sso/source/browse/autogen.sh?repo=libaccounts-glib

and this is the same technique used in gnome-control-center-signon. In summary, call the autogen.sh script to prepare the build system, for example:

http://bazaar.launchpad.net/~online-accounts/gnome-control-center-signon/trunk/view/head:/debian/rules#L17

As the autoreconf and configure steps should likely be separate, I will add the NOCONFIGURE logic to the autogen.sh from libaccounts-glib.

review: Needs Fixing
Revision history for this message
Robert Bruce Park (robru) wrote :

Alright, I've fixed gtk-doc.make, and this seems to have cleared up the test failures I was seeing earlier, but now there's just a minor fail-missing issue that I need mardy to have a look at. Should these files be included in a package, or just turfed?

http://paste.ubuntu.com/1563844/

Thanks mardy!

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

FAILED: Continuous integration, rev:164
http://s-jenkins:8080/job/libaccounts-glib-ci/3/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=amd64/3/console
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=i386/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libaccounts-glib-ci/3//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote :

The DTDs should be installed to the -dev package, the man pages with the -tools package, and that .conf file can be removed.

Revision history for this message
Robert Bruce Park (robru) wrote :

Done and done! Please merge ;-)

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

FAILED: Continuous integration, rev:165
http://s-jenkins:8080/job/libaccounts-glib-ci/4/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=amd64/4/console
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=i386/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libaccounts-glib-ci/4//rebuild/?

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

FAILED: Continuous integration, rev:165
http://s-jenkins:8080/job/libaccounts-glib-ci/5/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=amd64/5/console
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=i386/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libaccounts-glib-ci/5//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

Looks like jenkins needs to be configured not to use the old packaging branch anymore. Can somebody fix this for me?

Revision history for this message
Robert Bruce Park (robru) wrote :

My mistake, looks like there was a missing build-dep. Fixed, please merge!

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

PASSED: Continuous integration, rev:167
http://s-jenkins:8080/job/libaccounts-glib-ci/6/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=amd64/6/console
    SUCCESS: http://s-jenkins:8080/job/libaccounts-glib-ci/./build=pbuilder,distribution=raring,flavor=i386/6/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libaccounts-glib-ci/6//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote :

Thanks a lot Robert!

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

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/libaccounts-glib-autolanding/1/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/1/console
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-autolanding/./build=pbuilder,distribution=raring,flavor=i386/1/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

Ok, *now* for sure jenkins needs to be configured not to use the old packaging branch, because there is a conflict between it and the inlined packaging data ;-)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/libaccounts-glib-autolanding/2/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/2/console
    FAILURE: http://s-jenkins:8080/job/libaccounts-glib-autolanding/./build=pbuilder,distribution=raring,flavor=i386/2/console

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: