Google Documents Lens

Merge lp://qastaging/~mterry/unity-scope-gdrive/inline-debian into lp://qastaging/unity-scope-gdrive

  1. inline-debian
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Francis Ginther
Approved revision: 27
Merged at revision: 27
Proposed branch: lp://qastaging/~mterry/unity-scope-gdrive/inline-debian
Merge into: lp://qastaging/unity-scope-gdrive
Diff against target: 284 lines (+216/-6)
11 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+147/-0)
debian/compat (+1/-0)
debian/control (+29/-0)
debian/copyright (+11/-0)
debian/rules (+16/-0)
debian/source/format (+1/-0)
debian/source/include-binaries (+1/-0)
debian/watch (+2/-0)
po/POTFILES.in (+1/-1)
setup.py (+5/-5)
To merge this branch: bzr merge lp://qastaging/~mterry/unity-scope-gdrive/inline-debian
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Didier Roche-Tolomelli Approve
Review via email: mp+133131@code.qastaging.launchpad.net

Commit message

Bring debian/ packaging inline.

Description of the change

As discussed at UDS-R, the separate debian/ packaging branches should be brought inline. This branch does that.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looks good to me, please switch to approve once the work in jenkins is done.

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

Approving to process autolanding.

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-gdocs-mbs-autolanding-inline-convert/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-gdocs-mbs-autolanding-inline-convert/./build=pbuilder,distribution=quantal,flavor=amd64/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-gdocs-mbs-autolanding-inline-convert/./build=pbuilder,distribution=quantal,flavor=i386/1/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Added python3-distutils-extra to build host. Re-approving.

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

@Francis: with inline packaging, you shouldn't have add to add any additional build-dep. So please, rather than adding them to the build host, ping us so that we can fix the build-deps :)

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

In that particular case, it's already in the build-dep, to prepare the source package, I think that you should use something like get-build-depends script to ensure you have the right build-dep to prepare the source package.

Revision history for this message
Francis Ginther (fginther) wrote :

PASSED: Autolanding.
More details in the following jenkins job:
https://jenkins.qa.ubuntu.com/job/unity-lens-gdocs-mbs-autolanding-inline-convert/2/
Executed test runs:
    PASSED: https://jenkins.qa.ubuntu.com/job/unity-lens-gdocs-mbs-autolanding-inline-convert/2/build=pbuilder,distribution=quantal,flavor=amd64/console
    PASSED: https://jenkins.qa.ubuntu.com/job/unity-lens-gdocs-mbs-autolanding-inline-convert/2/build=pbuilder,distribution=quantal,flavor=i386/console

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