------------------------------------------------------------
revno: 103
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: sword
timestamp: Sat 2012-04-07 14:23:41 +0100
message:
Split libswordX into libswordX, -utils & -common, to make libswordX
non-conflicting with libswordX+1
added:
.pc/icu_in_soname.patch/
.pc/icu_in_soname.patch/cmake/
.pc/icu_in_soname.patch/cmake/install.cmake
debian/libsword-common.install
debian/libsword-utils.install
debian/patches/icu_in_soname.patch
renamed:
debian/libsword9.dirs => debian/libsword-common.dirs
debian/libsword9.links => debian/libsword-utils.links
debian/libsword9.lintian-overrides => debian/libsword-common.lintian-overrides
debian/libsword9.manpages => debian/libsword-utils.manpages
modified:
.pc/applied-patches
cmake/install.cmake
debian/changelog
debian/control
debian/libsword-dev.links
debian/libsword9.install
debian/patches/series
debian/rules
debian/libsword-common.lintian-overrides
--
lp:sword/debian
https://code.launchpad.net/~pkgcrosswire/sword/main
Your team CrossWire Packaging Team is subscribed to branch lp:sword/debian.
To unsubscribe from this branch go to
https://code.launchpad.net/~pkgcrosswire/sword/main/+edit-subscription
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2012-03-25 22:06:07 +0000
+++ .pc/applied-patches 2012-04-07 13:23:41 +0000
@@ -3,3 +3,4 @@
16_gcc4.6_sword.patch
2631_fix_curl.patch
cmake_backport.patch
+icu_in_soname.patch
=== added directory '.pc/icu_in_soname.patch'
=== added directory '.pc/icu_in_soname.patch/cmake'
=== added file '.pc/icu_in_soname.patch/cmake/install.cmake'
--- .pc/icu_in_soname.patch/cmake/install.cmake 1970-01-01 00:00:00 +0000
+++ .pc/icu_in_soname.patch/cmake/install.cmake 2012-04-07 13:23:41 +0000
@@ -0,0 +1,95 @@
+#####################################################################
+# First, install the library itself
+#
+MESSAGE(STATUS "\n-- CONFIGURING INSTALLATION DESTINATIONS")
+IF(NOT CMAKE_INSTALL_PREFIX)
+ IF(APPLE)
+ SET(SWORD_INSTALL_DIR "/opt/local")
+ ELSEIF(MSVC)
+ SET(SWORD_INSTALL_DIR "C:\\Program Files (x86)\\libsword\\")
+ ELSE(APPLE)
+ SET(SWORD_INSTALL_DIR "/usr/local")
+ ENDIF(APPLE)
+ELSE(NOT CMAKE_INSTALL_PREFIX)
+ SET(SWORD_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
+ENDIF(NOT CMAKE_INSTALL_PREFIX)
+
+# Install the library
+IF(BUILDING_SHARED)
+ INSTALL(TARGETS sword
+ DESTINATION ${SWORD_INSTALL_DIR}/lib)
+ENDIF(BUILDING_SHARED)
+IF(BUILDING_STATIC)
+ INSTALL(TARGETS sword_static
+ DESTINATION ${SWORD_INSTALL_DIR}/lib)
+ENDIF(BUILDING_STATIC)
+# Install the locales
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/locales.d
+ DESTINATION ${SWORD_INSTALL_DIR}/share/sword)
+
+# Install the headers
+INSTALL(FILES ${SWORD_INSTALL_HEADERS}
+ DESTINATION "${SWORD_INSTALL_DIR}/include/sword")
+
+IF(SWORD_INTERNAL_REGEX)
+ INSTALL(FILES ${INTERNAL_REGEX_HEADER}
+ DESTINATION "${SWORD_INSTALL_DIR}/include/sword")
+ENDIF(SWORD_INTERNAL_REGEX)
+
+MESSAGE(STATUS "Destination: ${SWORD_INSTALL_DIR}")
+
+# Configuration files, of course
+SET(prefix ${SWORD_INSTALL_DIR})
+SET(exec_prefix ${SWORD_INSTALL_DIR})
+SET(libdir ${SWORD_INSTALL_DIR}/lib)
+SET(includedir ${SWORD_INSTALL_DIR}/include)
+SET(VERSION ${SWORD_VERSION})
+IF(WITH_CURL)
+ SET(CURL_LIBS ${CURL_LIBRARY})
+ENDIF(WITH_CURL)
+IF(WITH_CLUCENE)
+ SET(CLUCENE_LIBS ${CLUCENE_LIBRARY})
+ENDIF(WITH_CLUCENE)
+IF(WITH_ICU)
+ SET(ICU_LIBS "${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}")
+ENDIF(WITH_ICU)
+
+IF(LIBSWORD_LIBRARY_TYPE STREQUAL "Static")
+ SET(SHAREDLIB_TRUE "#")
+ELSE(LIBSWORD_LIBRARY_TYPE STREQUAL "Static")
+ SET(SHAREDLIB_FALSE "#")
+ENDIF(LIBSWORD_LIBRARY_TYPE STREQUAL "Static")
+# The @ONLY restricts it because our ${variable} which are left there as part of pkg-config
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/sword.pc.in ${CMAKE_CURRENT_BINARY_DIR}/sword.pc @ONLY)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/sword.pc
+ DESTINATION "${SWORD_INSTALL_DIR}/lib/pkgconfig")
+
+# Need to build/install the
+IF(WITH_ICU AND ICU_GENRB)
+ ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
+ FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu")
+ FOREACH(translit ${translit_SOURCES})
+ STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit})
+ # Only needs to be run once, really, so we'll hook it to the end of either
+ IF(BUILDING_SHARED)
+ ADD_CUSTOM_COMMAND(TARGET sword
+ POST_BUILD
+ COMMAND ${ICU_GENRB} -s . -d "${CMAKE_CURRENT_BINARY_DIR}/icu" ${translit}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/icu"
+ COMMENT "Converting ${translit}"
+ VERBATIM
+ )
+ ELSE(BUILDING_SHARED)
+ ADD_CUSTOM_COMMAND(TARGET sword_static
+ POST_BUILD
+ COMMAND ${ICU_GENRB} -s . -d "${CMAKE_CURRENT_BINARY_DIR}/icu" ${translit}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/icu"
+ COMMENT "Converting ${translit}"
+ VERBATIM
+ )
+ ENDIF(BUILDING_SHARED)
+
+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}"
+ DESTINATION "${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
+ ENDFOREACH(translit ${translit_SOURCES})
+ENDIF(WITH_ICU AND ICU_GENRB)
=== modified file 'cmake/install.cmake'
--- cmake/install.cmake 2012-03-25 22:06:07 +0000
+++ cmake/install.cmake 2012-04-07 13:23:41 +0000
@@ -66,7 +66,7 @@
# Need to build/install the
IF(WITH_ICU AND ICU_GENRB)
- ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
+ ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_SOVERSION}_icu_${ICU_VERSION}")
FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu")
FOREACH(translit ${translit_SOURCES})
STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit})
@@ -90,6 +90,6 @@
ENDIF(BUILDING_SHARED)
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}"
- DESTINATION "${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
+ DESTINATION "${libdir}/sword/${SWORD_SOVERSION}_icu_${ICU_VERSION}")
ENDFOREACH(translit ${translit_SOURCES})
ENDIF(WITH_ICU AND ICU_GENRB)
=== modified file 'debian/changelog'
--- debian/changelog 2012-04-04 22:27:07 +0000
+++ debian/changelog 2012-04-07 13:23:41 +0000
@@ -5,8 +5,10 @@
* Backport CMake changes
* Set sword config path to /etc
* ABI was broken in 1.6.2, bump soname to libsword9 (Closes: 663096)
+ * Split libswordX into libswordX, -utils & -common, to make libswordX
+ non-conflicting with libswordX+1
- -- Dmitrijs Ledkovs <[email protected]> Wed, 04 Apr 2012 23:16:32 +0100
+ -- Dmitrijs Ledkovs <[email protected]> Sat, 07 Apr 2012 14:22:48 +0100
sword (1.6.2+dfsg-1) unstable; urgency=low
=== modified file 'debian/control'
--- debian/control 2012-04-04 22:27:07 +0000
+++ debian/control 2012-04-07 13:23:41 +0000
@@ -23,10 +23,8 @@
Package: libsword9
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libsword-common, ${shlibs:Depends}, ${misc:Depends}
Recommends: sword-frontend
-Conflicts: libsword6, libsword7, libsword8
-Replaces: libsword6, libsword7, libsword8
Description: API/library for bible software
The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
MacOSX etc.) API/library for Bible software with a constantly growing list
@@ -52,6 +50,35 @@
This package contains the static libraries and headers for developing
applications that use the SWORD library.
+Package: libsword-common
+Architecture: all
+Section: devel
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libsword6, libsword7, libsword8
+Replaces: libsword6, libsword7, libsword8
+Description: common settings and module repository for libsword
+ The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
+ MacOSX etc.) API/library for Bible software with a constantly growing list
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
+ text modules.
+ .
+ This package contains sword configuration and global module repository.
+
+Package: libsword-utils
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libsword6, libsword7, libsword8
+Replaces: libsword6, libsword7, libsword8
+Description: conversion utilities for bible documents in SWORD supported formats
+ The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
+ MacOSX etc.) API/library for Bible software with a constantly growing list
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
+ text modules.
+ .
+ This package contains utilities to convert documents in various
+ formats into those suitable to be used with SWORD library.
+
Package: libsword-dbg
Architecture: any
Section: debug
@@ -69,7 +96,7 @@
Architecture: any
Section: text
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Command line bible browsing and search tool
+Description: command line bible browsing and search tool
The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
MacOSX etc.) API/library for Bible software with a constantly growing list
of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
=== renamed file 'debian/libsword9.dirs' => 'debian/libsword-common.dirs'
=== added file 'debian/libsword-common.install'
--- debian/libsword-common.install 1970-01-01 00:00:00 +0000
+++ debian/libsword-common.install 2012-04-07 13:23:41 +0000
@@ -0,0 +1,3 @@
+usr/share/sword/
+samples/recommended/sword.conf etc/
+samples/mods.d/globals.conf usr/share/sword/mods.d/
=== renamed file 'debian/libsword9.lintian-overrides' => 'debian/libsword-common.lintian-overrides'
--- debian/libsword9.lintian-overrides 2012-04-04 22:20:55 +0000
+++ debian/libsword-common.lintian-overrides 2012-04-07 13:23:41 +0000
@@ -1,2 +1,2 @@
# This directory is to install SWORD modules by the administrator
-libsword9 binary: package-contains-empty-directory usr/share/sword/modules/
+libsword-common binary: package-contains-empty-directory usr/share/sword/modules/
=== modified file 'debian/libsword-dev.links'
--- debian/libsword-dev.links 2011-09-05 22:45:29 +0000
+++ debian/libsword-dev.links 2012-04-07 13:23:41 +0000
@@ -1,1 +1,1 @@
-usr/lib/libsword.so.8 usr/lib/libsword.so
+usr/lib/libsword.so.9 usr/lib/libsword.so
=== added file 'debian/libsword-utils.install'
--- debian/libsword-utils.install 1970-01-01 00:00:00 +0000
+++ debian/libsword-utils.install 2012-04-07 13:23:41 +0000
@@ -0,0 +1,16 @@
+usr/bin/addld
+usr/bin/imp2ld
+usr/bin/imp2gbs
+usr/bin/imp2vs
+usr/bin/installmgr
+usr/bin/mkfastmod
+usr/bin/mod2imp
+usr/bin/mod2osis
+usr/bin/mod2vpl
+usr/bin/mod2zmod
+usr/bin/osis2mod
+usr/bin/tei2mod
+usr/bin/vpl2mod
+usr/bin/vs2osisref
+usr/bin/vs2osisreftxt
+usr/bin/xml2gbs
=== renamed file 'debian/libsword9.links' => 'debian/libsword-utils.links'
=== renamed file 'debian/libsword9.manpages' => 'debian/libsword-utils.manpages'
=== modified file 'debian/libsword9.install'
--- debian/libsword9.install 2012-04-04 22:20:55 +0000
+++ debian/libsword9.install 2012-04-07 13:23:41 +0000
@@ -1,21 +1,2 @@
-samples/recommended/sword.conf etc/
+usr/lib/sword
usr/lib/libsword.so.9
-usr/lib/sword
-usr/bin/addld
-usr/bin/imp2ld
-usr/bin/imp2gbs
-usr/bin/imp2vs
-usr/bin/installmgr
-usr/bin/mkfastmod
-usr/bin/mod2imp
-usr/bin/mod2osis
-usr/bin/mod2vpl
-usr/bin/mod2zmod
-usr/bin/osis2mod
-usr/bin/tei2mod
-usr/bin/vpl2mod
-usr/bin/vs2osisref
-usr/bin/vs2osisreftxt
-usr/bin/xml2gbs
-locales.d usr/share/sword/
-samples/mods.d/globals.conf usr/share/sword/mods.d/
=== added file 'debian/patches/icu_in_soname.patch'
--- debian/patches/icu_in_soname.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/icu_in_soname.patch 2012-04-07 13:23:41 +0000
@@ -0,0 +1,24 @@
+Description: Set icu folder name using SONAME instead of upstream version string
+Author: Dmitrijs Ledkovs <[email protected]>
+
+Index: sword/cmake/install.cmake
+===================================================================
+--- sword.orig/cmake/install.cmake 2012-04-03 08:12:47.999839147 +0100
++++ sword/cmake/install.cmake 2012-04-07 14:12:20.241257963 +0100
+@@ -66,7 +66,7 @@
+
+ # Need to build/install the
+ IF(WITH_ICU AND ICU_GENRB)
+- ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
++ ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_SOVERSION}_icu_${ICU_VERSION}")
+ FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu")
+ FOREACH(translit ${translit_SOURCES})
+ STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit})
+@@ -90,6 +90,6 @@
+ ENDIF(BUILDING_SHARED)
+
+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}"
+- DESTINATION "${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
++ DESTINATION "${libdir}/sword/${SWORD_SOVERSION}_icu_${ICU_VERSION}")
+ ENDFOREACH(translit ${translit_SOURCES})
+ ENDIF(WITH_ICU AND ICU_GENRB)
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-03-25 21:09:15 +0000
+++ debian/patches/series 2012-04-07 13:23:41 +0000
@@ -3,3 +3,4 @@
16_gcc4.6_sword.patch
2631_fix_curl.patch
cmake_backport.patch
+icu_in_soname.patch
=== modified file 'debian/rules'
--- debian/rules 2012-04-04 22:20:55 +0000
+++ debian/rules 2012-04-07 13:23:41 +0000
@@ -35,7 +35,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/*
+ chmod -x debian/libsword-common/usr/share/sword/locales.d/*
override_dh_strip:
dh_strip --dbg-package=libsword-dbg
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
