Unity GTK+ module

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

  1. upstart-job
  2. Merge into trunk.13.10
Proposed by Ted Gould
Status: Merged
Approved by: William Hua
Approved revision: 301
Merged at revision: 303
Proposed branch: lp:~ted/unity-gtk-module/upstart-job
Merge into: lp:unity-gtk-module/13.10
Diff against target: 68 lines (+12/-15)
4 files modified
configure.ac (+0/-3)
data/Makefile.am (+3/-3)
data/unity-gtk-module.conf (+8/-8)
debian/unity-gtk-module-common.install (+1/-1)
To merge this branch: bzr merge lp:~ted/unity-gtk-module/upstart-job
Reviewer Review Type Date Requested Status
William Hua (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+172629@code.launchpad.net

Commit message

Converts from using Xsession to using Upstart

Description of the change

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
301. By Ted Gould

Typo

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
William Hua (attente) wrote :

Tested, looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
20AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk=2|3], [GTK+ version [default=3]])], [], [with_gtk=3])20AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk=2|3], [GTK+ version [default=3]])], [], [with_gtk=3])
21AC_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`])21AC_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`])
22AC_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])22AC_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])
23AC_ARG_WITH([x11-sysconfdir], [AS_HELP_STRING([--with-x11-sysconfdir=DIR], [X11 configuration directory [default=$sysconfdir]])], [], [with_x11_sysconfdir=$sysconfdir])
24AC_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])
2523
26AM_PATH_PYTHON24AM_PATH_PYTHON
2725
28AC_SUBST([GTK_VERSION], [$with_gtk])26AC_SUBST([GTK_VERSION], [$with_gtk])
29AC_SUBST([GTK_MODULE_DIR], [$with_gtk_module_dir])27AC_SUBST([GTK_MODULE_DIR], [$with_gtk_module_dir])
30AC_SUBST([X_SESSION_DIR], [$with_x_session_dir])
3128
32AM_CONDITIONAL([GTK3], [test GTK$with_gtk = GTK3])29AM_CONDITIONAL([GTK3], [test GTK$with_gtk = GTK3])
3330
3431
=== 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 @@
1pkgconfigdir = $(libdir)/pkgconfig1pkgconfigdir = $(libdir)/pkgconfig
2pkgconfig_DATA = unity-gtk$(GTK_VERSION)-parser.pc2pkgconfig_DATA = unity-gtk$(GTK_VERSION)-parser.pc
33
4xsessiondir = $(X_SESSION_DIR)4upstart_jobdir = $(datadir)/upstart/sessions/
5dist_xsession_DATA = 80unity-gtk-module5dist_upstart_job_DATA = unity-gtk-module.conf
66
7EXTRA_DIST = $(dist_xsession_DATA)7EXTRA_DIST = $(dist_upstart_job_DATA)
88
=== 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 @@
1# If not found (removed + not purged), don't do anything1description "Unity GTK Module Environment variables"
2for file in /usr/lib/*/gtk-*/modules/libunity-gtk-module.so; do2
3 [ -e "$file" ] || continue3start on starting dbus
4
5script
4 if [ -n "$GTK_MODULES" ]6 if [ -n "$GTK_MODULES" ]
5 then7 then
6 GTK_MODULES="$GTK_MODULES:unity-gtk-module"8 GTK_MODULES="$GTK_MODULES:unity-gtk-module"
@@ -13,8 +15,6 @@
13 UBUNTU_MENUPROXY=115 UBUNTU_MENUPROXY=1
14 fi16 fi
1517
16 export GTK_MODULES18 initctl set-env --global GTK_MODULES=$GTK_MODULES
17 export UBUNTU_MENUPROXY19 initctl set-env --global UBUNTU_MENUPROXY=$UBUNTU_MENUPROXY
1820end script
19 return
20done
2121
=== 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 @@
1etc/X11/Xsession.d/*1usr/share/upstart/sessions/*

Subscribers

People subscribed via source and target branches