Merge lp:~ubuntu-mate-dev/indicators-gtk2/indicator-application-gtk2 into lp:ubuntu/vivid/indicator-application-gtk2

[Martin Wimpress]

This merge proposal re-adds GTK2 indicator service files so that indciators work correctly in Ubuntu MATE. This merge proposal closes lp: #1319352 and doesn't conflict with any other desktop environments.

  * https://bugs.launchpad.net/ubuntu/+source/indicator-application-gtk2/+bug/1319352

[Sebastien Bacher (seb128)]

Thanks, what is the service name? Does is conflict/use the same one as the new gtk3 version? If so could that lead to have the wrong version activated under other desktops like Unity?

review: Needs Information

[Martin Wimpress (flexiondotorg)]

Well the service file is `/usr/share/dbus-1/services/indicator-application.service` which has the following content.

    [D-BUS Service]
    Name=com.canonical.indicator.application
    Exec=/usr/lib/x86_64-linux-gnu/indicator-application-service

I've installed patched versions of `indicator-application-gtk2` and `indicator-sound-gtk2` on Ubuntu 14.04 and Xubuntu 14.04. The GTK2 version indicator-application is not auto started under Unity or XFCE nor can I start it manually.

[Martin Wimpress (flexiondotorg)]

This has been tested on Xubuntu and Ubuntu, no comflicts have been encountered. What else is required for reviewing this merge proposal?

[Sebastien Bacher (seb128)]

Nothing required, out of sponsors with free cycles for review/upload, feel free to land it

review: Approve

[Daniel Holbach (dholbach)]

This fails to build for me:

Making check in tests
make[2]: Entering directory '/tmp/buildd/indicator-application-gtk2-12.10.0.1/tests'
make test-approver
make[3]: Entering directory '/tmp/buildd/indicator-application-gtk2-12.10.0.1/tests'
  CC test_approver-gen-notification-approver.xml.o
  CC test_approver-test-approver.o
  CCLD test-approver
make[3]: Leaving directory '/tmp/buildd/indicator-application-gtk2-12.10.0.1/tests'
make check-TESTS
make[3]: Entering directory '/tmp/buildd/indicator-application-gtk2-12.10.0.1/tests'
DBus daemon: unix:abstract=/tmp/dbus-8rW6Cf2ODE,guid=4525cf8249ee98d9f403ae6454ddd61f
Approver: Started with PID: 11659
Service : Started with PID: 11661
No protocol specified

(test-approver:11659): Gtk-WARNING **: cannot open display: :0
Approver: Exited with status 256
Approver: Shutting down
Service: Shutting down
DBus daemon: Shutdown
FAIL: test-approver-tester
==================================
1 of 1 test failed
Please report to <email address hidden>
==================================
Makefile:439: recipe for target 'check-TESTS' failed
make[3]: *** [check-TESTS] Error 1
make[3]: Leaving directory '/tmp/buildd/indicator-application-gtk2-12.10.0.1/tests'
Makefile:562: recipe for target 'check-am' failed
make[2]: *** [check-am] Error 2
make[2]: Leaving directory '/tmp/buildd/indicator-application-gtk2-12.10.0.1/tests'
Makefile:356: recipe for target 'check-recursive' failed
make[1]: *** [check-recursive] Error 1

review: Needs Fixing

[Martin Wimpress (flexiondotorg)]

I have been able to build this in a PPA just fine. infinity has also got it to build without error. Lubuntu are migrating to LXQt in 15.10 so Ubuntu MATE will be the only flavour using this from 15.10 onward.

Please could someone merge and upload it?

[Daniel Holbach (dholbach)]

Thanks. It indeed builds in a PPA, just not in a local pbuilder environment.

Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-08 14:43:53 +0000
+++ debian/changelog	2014-12-09 12:01:44 +0000
@@ -1,3 +1,9 @@
+indicator-application-gtk2 (12.10.0.1-0ubuntu3) vivid; urgency=low
+
+  * Re-add GTK2 indicator service files. (lp: #1319352)
+
+ -- Martin Wimpress <[e-mail]>  Tue, 09 Dec 2014 11:48:51 -0000
+
 indicator-application-gtk2 (12.10.0.1-0ubuntu2) raring; urgency=low
 
   * Conditionalised use of g_type_init(), fixing FTBFS.

=== modified file 'debian/rules'
--- debian/rules	2012-09-02 13:29:31 +0000
+++ debian/rules	2014-12-09 12:01:44 +0000
@@ -9,7 +9,5 @@
 	find debian/indicator-application-gtk2/usr/lib -name *.la -delete
 	find debian/indicator-application-gtk2/usr/lib -name *.a -delete
 	# only ship the .so file and depend on indicator-application for the rest
-	rm -rf debian/indicator-application-gtk2/usr/share/dbus-1/
 	rm -rf debian/indicator-application-gtk2/usr/share/indicator-application/
-	rm -rf debian/indicator-application-gtk2/usr/lib/$(DEB_HOST_MULTIARCH)/
 	dh_install --fail-missing