lp:~cyphermox/libappindicator/fix-test-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:libappindicator/13.04 at revision 248

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2013-01-23

Indicator Applet Developers: Pending requested 2013-01-23

Diff: 624 lines (+70/-273)

14 files modified

autogen.sh (+1/-0)
configure.ac (+1/-1)
debian/changelog (+8/-9)
debian/rules (+9/-3)
docs/reference/Makefile.am (+10/-12)
docs/reference/tmpl/libappindicator-unused.sgml (+0/-42)
gtk-doc.local.make (+0/-194)
tests/Makefile.am (+9/-1)
tests/test-libappindicator-dbus-client.c (+0/-2)
tests/test-libappindicator-fallback-item.c (+1/-1)
tests/test-libappindicator-fallback-watcher.c (+2/-3)
tests/test-libappindicator-status-client.c (+1/-3)
tests/test-libappindicator.c (+28/-0)
tests/test-simple-app.c (+0/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

249. By Mathieu Trudel-Lapierre on 2013-01-23

Increase dbus-test-runner timeout to 5 minutes to give tests enough time to start up and run on buildds, especially on slow architectures.

248. By Mathieu Trudel-Lapierre on 2013-01-23

resolve conflicts on acinclude.m4

247. By Chris J Arges <arges@macgyver> on 2013-01-21

This fixes python multi-arch include issues.

This changes fixes a FTBFS issue found during an archive rebuild:
http://people.ubuntuwire.org/~wgrant/rebuild-ftbfs-test/test-rebuild-20121221-raring.html.

Approved by Mathieu Trudel-Lapierre.

246. By Ted Gould on 2012-12-05

Adding a custom clean rule to the inline packaging.

245. By Mathieu Trudel-Lapierre on 2012-12-05

Inline packaging

244. By Lars Karlitski on 2012-10-11

Merge lp:~robert-ancell/libappindicator/lp-1065310

Fix Vala classes not being able to inherit from Indicator

243. By Charles Kerr on 2012-07-11

bump version to 12.10.0

242. By Charles Kerr on 2012-06-18

merge lp:~evgeni/libappindicator/optional-mono to make Mono binding generation optional. This way we don't FTB on architectures that don't support Mono.

241. By Charles Kerr on 2012-06-18

merge bzr merge lp:~evgeni/libappindicator/multiarch-same-devheaders so that we don't include build-time filenames in comments of the enum header files.

240. By Charles Kerr on 2012-04-23

merge lp:~ted/libappindicator/app_name to try the application name as a fallback if the client doesn't explicitly set the title.