upstart

Merge lp:~jamesodhunt/upstart/libupstart-version-number into lp:upstart

  1. libupstart-version-number
  2. Merge into trunk
Proposed by James Hunt
Status: Merged
Merged at revision: 1503
Proposed branch: lp:~jamesodhunt/upstart/libupstart-version-number
Merge into: lp:upstart
Diff against target: 66 lines (+13/-4)
4 files modified
ChangeLog (+5/-0)
configure.ac (+1/-1)
lib/Makefile.am (+6/-2)
lib/libupstart.pc.in.in (+1/-1)
To merge this branch: bzr merge lp:~jamesodhunt/upstart/libupstart-version-number
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Approve
Review via email: mp+172998@code.launchpad.net
To post a comment you must log in.
lp:~jamesodhunt/upstart/libupstart-version-number updated
1504. By James Hunt

Tidy-up.

Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-07-03 12:37:29 +0000
3+++ ChangeLog 2013-07-04 10:54:28 +0000
4@@ -1,3 +1,8 @@
5+2013-07-04 James Hunt <james.hunt@ubuntu.com>
6+
7+ * Perform 2-pass generation of libupstart.pc to ensure library
8+ version specified correctly.
9+
10 2013-07-03 James Hunt <james.hunt@ubuntu.com>
11
12 * extra/upstart-dbus-bridge.c: main(): Check nih_str_split() return.
13
14=== modified file 'configure.ac'
15--- configure.ac 2013-07-04 09:56:25 +0000
16+++ configure.ac 2013-07-04 10:54:28 +0000
17@@ -113,6 +113,6 @@
18 dbus/Makefile init/Makefile util/Makefile conf/Makefile
19 extra/Makefile doc/Makefile contrib/Makefile po/Makefile.in
20 scripts/Makefile scripts/data/Makefile
21- test/Makefile lib/Makefile lib/libupstart.pc ])
22+ test/Makefile lib/Makefile lib/libupstart.pc.in ])
23 AC_CONFIG_HEADERS([config.h])
24 AC_OUTPUT
25
26=== modified file 'lib/Makefile.am'
27--- lib/Makefile.am 2013-07-02 15:55:48 +0000
28+++ lib/Makefile.am 2013-07-04 10:54:28 +0000
29@@ -69,11 +69,15 @@
30 -e 's|[@]libupstart_version[@]|$(LIBUPSTART_VERSION_DOTTED)|g' \
31 $< > $@
32
33+libupstart.pc: libupstart.pc.in
34+ sed -e 's|[@]LIBUPSTART_VERSION_DOTTED[@]|$(LIBUPSTART_VERSION_DOTTED)|g' \
35+ $< > $@
36+
37 pkgconfigdir = $(prefix)/lib/pkgconfig
38 pkgconfig_DATA = libupstart.pc
39
40 EXTRA_DIST = \
41- libupstart.pc.in \
42+ libupstart.pc.in.in \
43 run_abi_checker.sh.in \
44 libupstart.ver \
45 $(abi_official) \
46@@ -165,7 +169,7 @@
47 $(abi_build_XML) \
48 $(pkgconfig_DATA)
49
50-CLEANFILES += $(check_SCRIPTS)
51+CLEANFILES += $(check_SCRIPTS) libupstart.pc.in
52
53 tests: $(check_PROGRAMS)
54
55
56=== renamed file 'lib/libupstart.pc.in' => 'lib/libupstart.pc.in.in'
57--- lib/libupstart.pc.in 2013-05-22 11:11:00 +0000
58+++ lib/libupstart.pc.in.in 2013-07-04 10:54:28 +0000
59@@ -5,6 +5,6 @@
60
61 Name: libupstart
62 Description: Upstart Utility Library
63-Version: @VERSION@
64+Version: @LIBUPSTART_VERSION_DOTTED@
65 Libs: -L${libdir} -lupstart
66 Cflags: -I${includedir}

Subscribers

People subscribed via source and target branches