Merge lp:~pitti/unity-gtk-module/env-race into lp:unity-gtk-module

[Martin Pitt]

Fix $GTK_MODULES race condition

Fix race condition in bug 1618886 and fix Vcs-* tags.

[Ted Gould (ted)]

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2016-08-04 10:51:59 +0000
+++ data/Makefile.am	2016-09-13 15:03:34 +0000
@@ -10,7 +10,4 @@
 systemd_userunitdir = $(SYSTEMD_USERUNITDIR)
 systemd_userunit_DATA = unity-gtk-module.service
 
-upstart_systemd_overridedir = $(datadir)/upstart/systemd-session/upstart/
-upstart_systemd_override_DATA = unity-gtk-module.override
-
 EXTRA_DIST = $(dist_upstart_job_DATA)
 
=== removed file 'data/unity-gtk-module.override'
--- data/unity-gtk-module.override	2016-08-03 16:01:11 +0000
+++ data/unity-gtk-module.override	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-manual
 
=== modified file 'data/unity-gtk-module.service'
--- data/unity-gtk-module.service	2016-08-03 16:01:11 +0000
+++ data/unity-gtk-module.service	2016-09-13 15:03:34 +0000
@@ -8,12 +8,10 @@
 RemainAfterExit=yes
 ExecStart=/bin/sh -ec '\
         GTK_MODULES="$${GTK_MODULES:+$GTK_MODULES:}unity-gtk-module";\
-        dbus-update-activation-environment --verbose --systemd GTK_MODULES;\
-        initctl set-env --global GTK_MODULES=$${GTK_MODULES} || true'
+        dbus-update-activation-environment --verbose --systemd GTK_MODULES'
 ExecStopPost=/bin/sh -ec '\
         GTK_MODULES=$$(echo -n $${GTK_MODULES} | awk -v RS=: -v ORS=: "/^unity-gtk-module$/ {next} {print}" | sed -e "s/:*$//");\
-        dbus-update-activation-environment --verbose --systemd GTK_MODULES;\
-        initctl set-env --global GTK_MODULES=$${GTK_MODULES} || true'
+        dbus-update-activation-environment --verbose --systemd GTK_MODULES'
 
 [Install]
 WantedBy=ubuntu-session.target
 
=== modified file 'debian/control'
--- debian/control	2016-08-04 10:51:59 +0000
+++ debian/control	2016-09-13 15:03:34 +0000
@@ -13,8 +13,8 @@
 # If you aren't a member of ~indicator-applet-developers but need to upload
 # packaging changes, just go ahead.  ~indicator-applet-developers will notice
 # and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk
-Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk/files
+Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk.15.04
+Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk.15.04
 
 Package: libunity-gtk-parser-dev-common
 Section: libdevel