------------------------------------------------------------
revno: 83
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: sword
timestamp: Tue 2010-11-30 13:57:46 +0000
message:
Fixing up sword with cmake build
removed:
debian/patches/14_remove_flags.diff
added:
debian/libsword-dev.links
debian/patches/14_compiler_flags.diff
modified:
debian/control
debian/libsword9.install
debian/libsword9.links
debian/libsword9.lintian-overrides
debian/patches/15_move_icudatadir.diff
debian/patches/series
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/control'
--- debian/control 2010-11-30 00:30:13 +0000
+++ debian/control 2010-11-30 13:57:46 +0000
@@ -1,9 +1,6 @@
Source: sword
-Build-Depends: autotools-dev,
- quilt,
- patchutils (>= 0.2.31),
- cdbs (>= 0.4.34),
- debhelper (>= 5.0.7),
+Build-Depends: quilt (>= 0.46-7~),
+ debhelper (>= 7.0.50~),
libz-dev,
pkg-config,
libcurl4-gnutls-dev,
=== added file 'debian/libsword-dev.links'
--- debian/libsword-dev.links 1970-01-01 00:00:00 +0000
+++ debian/libsword-dev.links 2010-11-30 13:57:46 +0000
@@ -0,0 +1,1 @@
+usr/lib/libsword.so.9.0.0 usr/lib/libsword.so
=== modified file 'debian/libsword9.install'
--- debian/libsword9.install 2010-11-30 00:30:13 +0000
+++ debian/libsword9.install 2010-11-30 13:57:46 +0000
@@ -15,5 +15,7 @@
usr/bin/tei2mod
usr/bin/vpl2mod
usr/bin/vs2osisref
+usr/bin/vs2osisreftxt
usr/bin/xml2gbs
-usr/share/sword
+locales.d usr/share/sword/
+samples/mods.d/globals.conf usr/share/sword/mods.d/
=== modified file 'debian/libsword9.links'
--- debian/libsword9.links 2010-11-30 00:30:13 +0000
+++ debian/libsword9.links 2010-11-30 13:57:46 +0000
@@ -1,3 +1,4 @@
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/libsword9.lintian-overrides'
--- debian/libsword9.lintian-overrides 2010-11-30 00:30:13 +0000
+++ debian/libsword9.lintian-overrides 2010-11-30 13:57:46 +0000
@@ -1,2 +1,2 @@
# This directory is to install SWORD modules by the administrator
-libsword8 binary: package-contains-empty-directory usr/share/sword/modules/
+libsword9 binary: package-contains-empty-directory usr/share/sword/modules/
=== added file 'debian/patches/14_compiler_flags.diff'
--- debian/patches/14_compiler_flags.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/14_compiler_flags.diff 2010-11-30 13:57:46 +0000
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -139,17 +139,17 @@
+
+ IF(BUILDING_SHARED)
+ SET_TARGET_PROPERTIES(sword
+- PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS}
++ PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC"
+ )
+ ENDIF(BUILDING_SHARED)
+
+ IF(BUILDING_STATIC)
+ SET_TARGET_PROPERTIES(sword_static
+- PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS}
++ PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}
+ )
+ ENDIF(BUILDING_STATIC)
+
+-MESSAGE(STATUS "Setting CFlags for compile to ${SWORD_CFLAGS}")
++MESSAGE(STATUS "Setting CFlags for compile to ${COMPILE_FLAGS}")
+
+ ##############################################################################################
+ # Setting libraries and includes
=== removed file 'debian/patches/14_remove_flags.diff'
--- debian/patches/14_remove_flags.diff 2010-11-30 00:30:13 +0000
+++ debian/patches/14_remove_flags.diff 1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-Remove mangling of user environmental flags.
-=== modified file 'CMakeLists.txt'
---- a/CMakeLists.txt 2010-11-28 12:59:25 +0000
-+++ b/CMakeLists.txt 2010-11-29 00:17:06 +0000
-@@ -88,19 +88,6 @@
- # Some random user settings
- #
-
--IF(SWORD_ENABLE_PROFILE STREQUAL "Yes")
-- SET_TARGET_PROPERTIES(sword
-- PROPERTIES COMPILE_FLAGS "-pg"
-- )
--ENDIF(SWORD_ENABLE_PROFILE STREQUAL "Yes")
--
--IF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes")
-- SET_TARGET_PROPERTIES(sword
-- PROPERTIES COMPILE_FLAGS "-g -finstrument-functions"
-- )
-- TARGET_LINK_LIBRARIES(libsword fnccheck)
--ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes")
--
- IF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "")
- ADD_DEFINITIONS(-DGLOBCONFPATH="${SWORD_GLOBAL_CONF_DIR}/sword.conf")
- ENDIF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "")
-@@ -137,20 +124,6 @@
- SET(SWORD_CFLAGS "${SWORD_CFLAGS} -Werror")
- ENDIF(SWORD_ENABLE_WARNINGS STREQUAL "Yes")
-
--IF(BUILDING_SHARED)
-- SET_TARGET_PROPERTIES(sword
-- PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS}
-- )
--ENDIF(BUILDING_SHARED)
--
--IF(BUILDING_STATIC)
-- SET_TARGET_PROPERTIES(sword_static
-- PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS}
-- )
--ENDIF(BUILDING_STATIC)
--
--MESSAGE(STATUS "Setting CFlags for compile to ${SWORD_CFLAGS}")
--
- ##############################################################################################
- # Setting libraries and includes
- #
-
=== modified file 'debian/patches/15_move_icudatadir.diff'
--- debian/patches/15_move_icudatadir.diff 2010-11-30 00:30:13 +0000
+++ debian/patches/15_move_icudatadir.diff 2010-11-30 13:57:46 +0000
@@ -1,7 +1,7 @@
Move transliteration files into $(libdir)/sword sub-dir
=== modified file 'cmake/install.cmake'
---- a/cmake/install.cmake 2010-11-28 12:59:25 +0000
-+++ b/cmake/install.cmake 2010-11-29 00:36:59 +0000
+--- a/cmake/install.cmake
++++ b/cmake/install.cmake
@@ -62,7 +62,7 @@
# Need to build/install the
@@ -11,11 +11,13 @@
FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu")
FOREACH(translit ${translit_SOURCES})
STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit})
-@@ -88,4 +88,4 @@
+@@ -86,6 +86,6 @@
+ ENDIF(BUILDING_SHARED)
+
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}"
- DESTINATION "${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}")
+- DESTINATION "${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}")
++ DESTINATION "${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
ENDFOREACH(translit ${translit_SOURCES})
-ENDIF(WITH_ICU AND ICU_GENRB)
\ No newline at end of file
+ENDIF(WITH_ICU AND ICU_GENRB)
-
=== modified file 'debian/patches/series'
--- debian/patches/series 2010-11-30 00:30:13 +0000
+++ debian/patches/series 2010-11-30 13:57:46 +0000
@@ -1,4 +1,4 @@
12_fix_compiler_warnings.diff
13_curl.diff
-14_remove_flags.diff
+14_compiler_flags.diff
15_move_icudatadir.diff
=== modified file 'debian/rules'
--- debian/rules 2010-11-30 00:30:13 +0000
+++ debian/rules 2010-11-30 13:57:46 +0000
@@ -25,8 +25,9 @@
override_dh_auto_configure:
dh_auto_configure -Scmake -- \
-DLIBSWORD_LIBRARY_TYPE="Shared Static" \
- -DLIBSWORD_SOVERSION=9.0.0 \
+ -DLIBSWORD_SOVERSION=9 \
-DCMAKE_BUILD_TYPE=NONE \
+ -DSWORD_BUILD_TESTS="Yes" \
-DSWORD_BINDINGS="Python"
debian/man/%.1: debian/man/%.1.pod
pod2man --release="SWORD $(ver)" --center "Sword Module Utilities" $< > $@
@@ -37,6 +38,7 @@
override_dh_install:
chrpath -d debian/tmp/usr/bin/* debian/tmp/usr/lib/*so*
dh_install --list-missing
+ chmod -x debian/libsword9/usr/share/sword/locales.d/*
override_dh_strip:
dh_strip --dbg-package=libsword-dbg
override_dh_makeshlibs:
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
