James Hunt has proposed merging lp:~jamesodhunt/upstart/libupstart-version-number into lp:upstart.
Requested reviews: Upstart Reviewers (upstart-reviewers) For more details, see: https://code.launchpad.net/~jamesodhunt/upstart/libupstart-version-number/+merge/172998 -- https://code.launchpad.net/~jamesodhunt/upstart/libupstart-version-number/+merge/172998 Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/libupstart-version-number into lp:upstart.
=== modified file 'ChangeLog' --- ChangeLog 2013-07-03 12:37:29 +0000 +++ ChangeLog 2013-07-04 10:46:24 +0000 @@ -1,3 +1,8 @@ +2013-07-04 James Hunt <[email protected]> + + * Perform 2-pass generation of libupstart.pc to ensure library + version specified correctly. + 2013-07-03 James Hunt <[email protected]> * extra/upstart-dbus-bridge.c: main(): Check nih_str_split() return. === modified file 'configure.ac' --- configure.ac 2013-07-04 09:56:25 +0000 +++ configure.ac 2013-07-04 10:46:24 +0000 @@ -113,6 +113,6 @@ dbus/Makefile init/Makefile util/Makefile conf/Makefile extra/Makefile doc/Makefile contrib/Makefile po/Makefile.in scripts/Makefile scripts/data/Makefile - test/Makefile lib/Makefile lib/libupstart.pc ]) + test/Makefile lib/Makefile lib/libupstart.pc.in ]) AC_CONFIG_HEADERS([config.h]) AC_OUTPUT === modified file 'lib/Makefile.am' --- lib/Makefile.am 2013-07-02 15:55:48 +0000 +++ lib/Makefile.am 2013-07-04 10:46:24 +0000 @@ -69,11 +69,23 @@ -e 's|[@]libupstart_version[@]|$(LIBUPSTART_VERSION_DOTTED)|g' \ $< > $@ +# libupstart.pc: libupstart.pc.in +# sed -e 's|[@]prefix[@]|$(prefix)|g' \ +# -e 's|[@]exec_prefix[@]|$(exec_prefix)|g' \ +# -e 's|[@]libdir[@]|$(libdir)|g' \ +# -e 's|[@]includedir[@]|$(includedir)|g' \ +# -e 's|[@]VERSION[@]|$(LIBUPSTART_VERSION_DOTTED)|g' \ +# $< > $@ + +libupstart.pc: libupstart.pc.in + sed -e 's|[@]LIBUPSTART_VERSION_DOTTED[@]|$(LIBUPSTART_VERSION_DOTTED)|g' \ + $< > $@ + pkgconfigdir = $(prefix)/lib/pkgconfig pkgconfig_DATA = libupstart.pc EXTRA_DIST = \ - libupstart.pc.in \ + libupstart.pc.in.in \ run_abi_checker.sh.in \ libupstart.ver \ $(abi_official) \ @@ -165,7 +177,7 @@ $(abi_build_XML) \ $(pkgconfig_DATA) -CLEANFILES += $(check_SCRIPTS) +CLEANFILES += $(check_SCRIPTS) libupstart.pc.in tests: $(check_PROGRAMS) === renamed file 'lib/libupstart.pc.in' => 'lib/libupstart.pc.in.in' --- lib/libupstart.pc.in 2013-05-22 11:11:00 +0000 +++ lib/libupstart.pc.in.in 2013-07-04 10:46:24 +0000 @@ -5,6 +5,6 @@ Name: libupstart Description: Upstart Utility Library -Version: @VERSION@ +Version: @LIBUPSTART_VERSION_DOTTED@ Libs: -L${libdir} -lupstart Cflags: -I${includedir}
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
