Ubuntu
libindicator package

Merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/libindicator/upstream into lp://qastaging/~ubuntu-desktop/libindicator/ubuntu

  1. Precise (12.04)
  2. upstream
  3. Merge into ubuntu
Proposed by Charles Kerr
Status: Merged
Merged at revision: 388
Proposed branch: lp://qastaging/~indicator-applet-developers/ubuntu/precise/libindicator/upstream
Merge into: lp://qastaging/~ubuntu-desktop/libindicator/ubuntu
Diff against target: 13690 lines (+70/-13320)
21 files modified
AUTHORS (+1/-0)
ChangeLog (+24/-0)
INSTALL (+7/-2)
Makefile.am (+2/-2)
Makefile.in (+4/-4)
compile (+0/-143)
config.guess (+0/-1502)
config.sub (+0/-1714)
configure (+12/-10)
configure.ac (+2/-1)
debian/changelog (+8/-0)
debian/rules (+1/-1)
depcomp (+0/-630)
install-sh (+0/-520)
libindicator/Makefile.in (+1/-0)
libindicator/indicator-image-helper.c (+1/-0)
libindicator/indicator-service-manager.c (+5/-2)
ltmain.sh (+0/-8413)
missing (+0/-376)
tests/Makefile.in (+1/-0)
tools/Makefile.in (+1/-0)
To merge this branch: bzr merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/libindicator/upstream
Reviewer Review Type Date Requested Status
Charles Kerr Pending
Ken VanDine Pending
Review via email: mp+100030@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-03-28.

Description of the change

Resubmitting 0.4.94.

The previous attempt had errors caused by a bug in Makefile.am that didn't populate the auto-generated files AUTHORS and Changelog. Also, the aux files such as 'compile', 'config.guess', 'config.sub' etc. now reside in build-aux/ rather than top-srcdir.

One other note, "DEB_MAKE_CHECK_TARGET := check" has been commented out in debian/rules due to a tool bug that causes "make check" to fail spectacularly, killing the X server it's running on. According to seb128 this is a known bug outside of libindicator and a fix is being worked on.

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

Charles, r431 in your vcs seems buggy, you emptied the AUTHORS and changed quite some files, what,how did you do the changes in that commit?

Revision history for this message
Charles Kerr (charlesk) wrote : Posted in a previous version of this proposal

NFI. I'll rewind and redo.

review: Needs Fixing

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