Merge lp:~ken-vandine/overlay-scrollbar/xsession into lp:overlay-scrollbar

Proposed by Ken VanDine
Status: Merged
Merged at revision: 217
Proposed branch: lp:~ken-vandine/overlay-scrollbar/xsession
Merge into: lp:overlay-scrollbar
Diff against target: 55 lines (+17/-0)
4 files modified
Makefile.am (+1/-0)
configure.ac (+2/-0)
data/81overlay-scrollbar.in (+4/-0)
data/Makefile.am (+10/-0)
To merge this branch: bzr merge lp:~ken-vandine/overlay-scrollbar/xsession
Reviewer Review Type Date Requested Status
Andrea Cimitan Approve
Review via email: mp+58681@code.launchpad.net

Description of the change

Install an xsession script to enable the scrollbars globally

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

looks good to me, well done ken!

review: Approve
217. By Andrea Cimitan

merged branch xsession and prepare to 0.1.9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2011-03-02 16:15:54 +0000
3+++ Makefile.am 2011-04-21 14:36:09 +0000
4@@ -1,5 +1,6 @@
5 SUBDIRS = \
6 misc \
7+ data \
8 build \
9 pkgconfig \
10 os \
11
12=== modified file 'configure.ac'
13--- configure.ac 2011-04-20 18:52:11 +0000
14+++ configure.ac 2011-04-21 14:36:09 +0000
15@@ -22,6 +22,7 @@
16 OS_LT_AGE=0
17 OS_LT_VERSION="$OS_LT_CURRENT:$OS_LT_REV:$OS_LT_AGE"
18 OS_LT_LDFLAGS="-version-info $OS_LT_VERSION"
19+AC_SUBST(OS_LT_CURRENT)
20 AC_SUBST(PGM_LT_VERSION)
21 AC_SUBST(PGM_LT_LDFLAGS)
22
23@@ -137,6 +138,7 @@
24 AC_CONFIG_FILES([
25 Makefile
26 misc/Makefile
27+ data/Makefile
28 build/Makefile
29 pkgconfig/Makefile
30 pkgconfig/overlay-scrollbar.pc
31
32=== added directory 'data'
33=== added file 'data/81overlay-scrollbar.in'
34--- data/81overlay-scrollbar.in 1970-01-01 00:00:00 +0000
35+++ data/81overlay-scrollbar.in 2011-04-21 14:36:09 +0000
36@@ -0,0 +1,4 @@
37+if [ -f @libdir@/liboverlay-scrollbar-@OS_MAJORMINOR@.so.@OS_LT_CURRENT@ ]
38+then
39+ export LIBOVERLAY_SCROLLBAR=1
40+fi
41
42=== added file 'data/Makefile.am'
43--- data/Makefile.am 1970-01-01 00:00:00 +0000
44+++ data/Makefile.am 2011-04-21 14:36:09 +0000
45@@ -0,0 +1,10 @@
46+EXTRA_DIST = 81overlay-scrollbar.in
47+
48+CLEANFILES = 81overlay-scrollbar
49+
50+81overlay-scrollbar: 81overlay-scrollbar.in
51+ sed -e "s|\@libdir\@|$(libdir)|" -e "s|\@OS_MAJORMINOR\@|@OS_MAJORMINOR@|" -e "s|\@OS_LT_CURRENT\@|$(OS_LT_CURRENT)|" $< > $@
52+
53+xsessiondir = $(sysconfdir)/X11/Xsession.d
54+
55+nodist_xsession_DATA = 81overlay-scrollbar

Subscribers

People subscribed via source and target branches