Merge lp://qastaging/~cyphermox/libindicator/inline into lp://qastaging/libindicator/13.04

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 485
Merged at revision: 473
Proposed branch: lp://qastaging/~cyphermox/libindicator/inline
Merge into: lp://qastaging/libindicator/13.04
Diff against target: 920 lines (+843/-0)
15 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+662/-0)
debian/compat (+1/-0)
debian/control (+96/-0)
debian/copyright (+17/-0)
debian/libindicator-dev.install (+4/-0)
debian/libindicator-tools.install (+2/-0)
debian/libindicator3-7.install (+1/-0)
debian/libindicator3-dev.install (+4/-0)
debian/libindicator3-tools.install (+1/-0)
debian/libindicator7.install (+1/-0)
debian/rules (+48/-0)
debian/source/format (+1/-0)
debian/source/options (+1/-0)
debian/watch (+2/-0)
To merge this branch: bzr merge lp://qastaging/~cyphermox/libindicator/inline
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+135507@code.qastaging.launchpad.net

Commit message

Description of the change

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

hey,

670 --- debian/compat 1970-01-01 00:00:00 +0000
671 +++ debian/compat 2012-11-21 20:23:25 +0000
672 @@ -0,0 +1,1 @@
673 +5

-> hum, I guess it needs to be 9

698 +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu
699 +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu
-> I think it needs to be changed to the real upstream URL + add the warning (see my comment yesterday on another MR)

879 +override_dh_makeshlibs:
880 + dh_makeshlibs -plibindicator7 -V 'libindicator7 (>= 0.4.90)'
881 + dh_makeshlibs -plibindicator3-7 -V 'libindicator3-7 (>= 0.4.90)'
882 +
and adding DPKG_GENSYMBOLS_CHECK_LEVEL=4
Not for this merge, but I think we should add a symbols file for the library rather than using a shlibs, wdyt? Can you add that to your list?

Please fix the 2 first steps and I'll approve. Thanks. (builds fine in pbuilder)

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

Looks good, thanks! Approving :)

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

FAILED: Autolanding.
No commit message was specified.

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

Srry. I misconfigured the job so the MP wasn't properly updated.
The build however failed with the following which seems to be a real (and not jenkins) error.
Please let me know if it is Jenkins.

actual build is here:
https://jenkins.qa.ubuntu.com/job/libindicator-autolanding/2/

make[2]: Leaving directory `/tmp/buildd/libindicator-12.10.2/builddir/gtk3'
dh override_dh_auto_install --with autoreconf
make[1]: Leaving directory `/tmp/buildd/libindicator-12.10.2'
   debian/rules override_dh_install
make[1]: Entering directory `/tmp/buildd/libindicator-12.10.2'
find debian/tmp -name \*.la -delete
find debian/tmp -name libdummy-indicator\* -delete
rm -f debian/tmp/gtk3/usr/share/libindicator/80indicator-debugging
dh_install --fail-missing
dh_install: libindicator7 missing files (debian/tmp/gtk2/usr/lib/libindicator.so.*), aborting
make[1]: *** [override_dh_install] Error 2
make[1]: Leaving directory `/tmp/buildd/libindicator-12.10.2'
make: *** [binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2
E: Failed autobuilding of package
W: no hooks of type C found -- ignoring

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

it seems something in distro landed and the side effect is that it's multiarched now:
debian/tmp/gtk3/usr/lib/x86_64-linux-gnu/ for instance.

Mathieu, can you have a look, see what happens for all packages depending on it? It should be transparent, but better to ensure they continue working :)
(and change the path in the .install files)

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
483. By Mathieu Trudel-Lapierre

  - Use calls to dh_install per-package to use the right source
    directories.
* debian/*.install: drop the debian/tmp/gtk* path elements and update for
  multiarch.

484. By Mathieu Trudel-Lapierre

Add the proper Pre-Depends: multiarch to libindicator3-7.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
485. By Mathieu Trudel-Lapierre

Add and export DPKG_GENSYMBOLS_CHECK_LEVEL.

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

For the record a "PASSED" approval from Jenkins hasn't come through--Jenkins approves as of this moment, and jobs have been amended for inline; autolanding should proceed as normal upon approval.

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

ok, let's get it merged in then :)

review: Approve

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