------------------------------------------------------------ revno: 84 committer: Dmitrijs Ledkovs <[email protected]> branch nick: sword timestamp: Tue 2010-11-30 19:21:51 +0000 message: * Bump SONAME to 9 * Make CMake honour environmental variables modified: debian/changelog debian/libsword9.install debian/libsword9.links debian/patches/14_compiler_flags.diff debian/rules
-- lp:~pkgcrosswire/sword/main https://code.launchpad.net/~pkgcrosswire/sword/main Your team Crosswire Packaging Team is subscribed to branch lp:~pkgcrosswire/sword/main. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/sword/main/+edit-subscription
=== modified file 'debian/changelog' --- debian/changelog 2010-11-30 00:30:13 +0000 +++ debian/changelog 2010-11-30 19:21:51 +0000 @@ -3,14 +3,15 @@ [ Dmitrijs Ledkovs <[email protected]> ] * Revamped debian/rules to use dh tiny rules style * Raised compat to debhelper 7 and change associated packaging files - * Bump SONAME to 9.0.0 + * Bump SONAME to 9 * Use CMake to build sword * debian/patches/02_libver.diff: dropped, using CMake variable * Add debian/source/local-options with VCS friendly options * Add .bzr-builddeb/default.conf to facilitate building from bzr * Using dpkg-buildflags (if available) + * Make CMake honour environmental variables - -- Dmitrijs Ledkovs <[email protected]> Wed, 26 May 2010 17:11:22 +0000 + -- Dmitrijs Ledkovs <[email protected]> Tue, 30 Nov 2010 19:20:20 +0000 sword (1.6.1+dfsg-2) unstable; urgency=low === modified file 'debian/libsword9.install' --- debian/libsword9.install 2010-11-30 13:57:46 +0000 +++ debian/libsword9.install 2010-11-30 19:21:51 +0000 @@ -1,5 +1,5 @@ samples/recommended/sword.conf etc/ -usr/lib/libsword.so.9.0.0 +usr/lib/libsword.so.9 usr/lib/sword usr/bin/addld usr/bin/imp2ld === modified file 'debian/libsword9.links' --- debian/libsword9.links 2010-11-30 13:57:46 +0000 +++ debian/libsword9.links 2010-11-30 19:21:51 +0000 @@ -1,4 +1,3 @@ usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2osis.1.gz usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2vpl.1.gz usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2zmod.1.gz -usr/lib/libsword.so.9.0.0 usr/lib/libsword.so.9 === modified file 'debian/patches/14_compiler_flags.diff' --- debian/patches/14_compiler_flags.diff 2010-11-30 13:57:46 +0000 +++ debian/patches/14_compiler_flags.diff 2010-11-30 19:21:51 +0000 @@ -1,3 +1,4 @@ +Make CMake honour environmental flags. --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,17 +139,17 @@ @@ -5,19 +6,19 @@ IF(BUILDING_SHARED) SET_TARGET_PROPERTIES(sword - PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS} -+ PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC" ++ PROPERTIES COMPILE_FLAGS "$ENV{CFLAGS} -fPIC" ) ENDIF(BUILDING_SHARED) IF(BUILDING_STATIC) SET_TARGET_PROPERTIES(sword_static - PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS} -+ PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} ++ PROPERTIES COMPILE_FLAGS "$ENV{CFLAGS}" ) ENDIF(BUILDING_STATIC) -MESSAGE(STATUS "Setting CFlags for compile to ${SWORD_CFLAGS}") -+MESSAGE(STATUS "Setting CFlags for compile to ${COMPILE_FLAGS}") ++MESSAGE(STATUS "Setting CFlags for compile to $ENV{CFLAGS}") ############################################################################################## # Setting libraries and includes === modified file 'debian/rules' --- debian/rules 2010-11-30 13:57:46 +0000 +++ debian/rules 2010-11-30 19:21:51 +0000 @@ -1,5 +1,5 @@ #!/usr/bin/make -f -#DH_VERBOSE := 1 +DH_VERBOSE := 1 ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog) ver:=$(shell dpkg-parsechangelog | sed -nr "2s/Version: (.*)-.*/\1/p") @@ -42,7 +42,7 @@ override_dh_strip: dh_strip --dbg-package=libsword-dbg override_dh_makeshlibs: - dh_makeshlibs -V"libsword9 (>= 1.6.2)" + dh_makeshlibs -V override_dh_clean: echo $(if $(ppa),"1.0","3.0 (quilt)") > debian/source/format dh_clean $(patsubst %.pod, %, $(wildcard debian/man/*.pod))
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
