Merge lp:~ted/unity-gtk-module/upstart-job into lp:unity-gtk-module/13.10

[Ted Gould]

Converts from using Xsession to using Upstart

Converts the unity-gtk-module's environment variables from using Xsession to using Upstart jobs. This gets us ready for when Xsession starts going away.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:300
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-amd64-ci/6
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-armhf-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-gtk-module-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:300
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-armhf-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-gtk-module-ci/11/rebuild

review: Approve (continuous-integration)

[lp:~ted/unity-gtk-module/upstart-job]

301. By Ted Gould on 2013-07-02

Typo

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:301
http://jenkins.qa.ubuntu.com/job/unity-gtk-module-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-gtk-module-saucy-armhf-ci/9

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-gtk-module-ci/13/rebuild

review: Approve (continuous-integration)

[William Hua (attente)]

Tested, looks good.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-05-03 00:21:12 +0000
+++ configure.ac	2013-07-02 20:32:27 +0000
@@ -20,14 +20,11 @@
 AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk=2|3], [GTK+ version [default=3]])], [], [with_gtk=3])
 AC_ARG_WITH([gtk-libdir], [AS_HELP_STRING([--with-gtk-libdir=DIR], [GTK+ library directory [default=`pkg-config --variable=libdir gtk+-3.0`]])], [], [with_gtk_libdir=`pkg-config --variable=libdir gtk+-\$with_gtk.0`])
 AC_ARG_WITH([gtk-module-dir], [AS_HELP_STRING([--with-gtk-module-dir=DIR], [GTK+ module directory [default=`pkg-config --variable=libdir gtk+-3.0`/gtk-3.0/modules]])], [], [with_gtk_module_dir=$with_gtk_libdir/gtk-$with_gtk.0/modules])
-AC_ARG_WITH([x11-sysconfdir], [AS_HELP_STRING([--with-x11-sysconfdir=DIR], [X11 configuration directory [default=$sysconfdir]])], [], [with_x11_sysconfdir=$sysconfdir])
-AC_ARG_WITH([x-session-dir], [AS_HELP_STRING([--with-x-session-dir=DIR], [Xsession.d directory [default=$with_x11_sysconfdir/X11/Xsession.d]])], [], [with_x_session_dir=$with_x11_sysconfdir/X11/Xsession.d])
 
 AM_PATH_PYTHON
 
 AC_SUBST([GTK_VERSION], [$with_gtk])
 AC_SUBST([GTK_MODULE_DIR], [$with_gtk_module_dir])
-AC_SUBST([X_SESSION_DIR], [$with_x_session_dir])
 
 AM_CONDITIONAL([GTK3], [test GTK$with_gtk = GTK3])
 

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-01-15 03:48:02 +0000
+++ data/Makefile.am	2013-07-02 20:32:27 +0000
@@ -1,7 +1,7 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = unity-gtk$(GTK_VERSION)-parser.pc
 
-xsessiondir = $(X_SESSION_DIR)
-dist_xsession_DATA = 80unity-gtk-module
+upstart_jobdir = $(datadir)/upstart/sessions/
+dist_upstart_job_DATA = unity-gtk-module.conf
 
-EXTRA_DIST = $(dist_xsession_DATA)
+EXTRA_DIST = $(dist_upstart_job_DATA)

=== renamed file 'data/80unity-gtk-module' => 'data/unity-gtk-module.conf'
--- data/80unity-gtk-module	2013-06-28 13:05:01 +0000
+++ data/unity-gtk-module.conf	2013-07-02 20:32:27 +0000
@@ -1,6 +1,8 @@
-# If not found (removed + not purged), don't do anything
-for file in /usr/lib/*/gtk-*/modules/libunity-gtk-module.so; do
-    [ -e "$file" ] || continue
+description "Unity GTK Module Environment variables"
+
+start on starting dbus
+
+script
     if [ -n "$GTK_MODULES" ]
     then
       GTK_MODULES="$GTK_MODULES:unity-gtk-module"
@@ -13,8 +15,6 @@
       UBUNTU_MENUPROXY=1
     fi
 
-    export GTK_MODULES
-    export UBUNTU_MENUPROXY
-
-    return
-done
+    initctl set-env --global GTK_MODULES=$GTK_MODULES
+    initctl set-env --global UBUNTU_MENUPROXY=$UBUNTU_MENUPROXY
+end script

=== modified file 'debian/unity-gtk-module-common.install'
--- debian/unity-gtk-module-common.install	2013-04-30 16:41:33 +0000
+++ debian/unity-gtk-module-common.install	2013-07-02 20:32:27 +0000
@@ -1,1 +1,1 @@
-etc/X11/Xsession.d/*
+usr/share/upstart/sessions/*