------------------------------------------------------------ revno: 82 committer: Dmitrijs Ledkovs <[email protected]> branch nick: sword timestamp: Tue 2010-11-30 00:30:13 +0000 message: * Bump SONAME to 9.0.0 * 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) removed: debian/clean debian/patches/02_libver.diff added: .bzr-builddeb/ .bzr-builddeb/default.conf .bzrignore debian/patches/14_remove_flags.diff debian/patches/15_move_icudatadir.diff debian/source/ debian/source/local-options renamed: debian/libsword8.dirs => debian/libsword9.dirs debian/libsword8.docs => debian/libsword9.docs debian/libsword8.install => debian/libsword9.install debian/libsword8.links => debian/libsword9.links debian/libsword8.lintian-overrides => debian/libsword9.lintian-overrides debian/libsword8.manpages => debian/libsword9.manpages modified: debian/changelog debian/control debian/patches/12_fix_compiler_warnings.diff debian/patches/13_curl.diff debian/patches/series debian/rules debian/libsword9.install
-- 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
=== added directory '.bzr-builddeb' === added file '.bzr-builddeb/default.conf' --- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000 +++ .bzr-builddeb/default.conf 2010-11-30 00:30:13 +0000 @@ -0,0 +1,2 @@ +[HOOKS] +pre-build = ./debian/rules clean === added file '.bzrignore' --- .bzrignore 1970-01-01 00:00:00 +0000 +++ .bzrignore 2010-11-30 00:30:13 +0000 @@ -0,0 +1,2 @@ +debian/source/format +tests/testsuite/*.try === modified file 'debian/changelog' --- debian/changelog 2010-05-26 17:13:43 +0000 +++ debian/changelog 2010-11-30 00:30:13 +0000 @@ -1,8 +1,14 @@ -sword (1.6.1+dfsg-3) UNRELEASED; urgency=low +sword (1.6.2+dfsg-1) UNRELEASED; urgency=low - [ Dmitrijs Ledkovs ] + [ 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 + * 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) -- Dmitrijs Ledkovs <[email protected]> Wed, 26 May 2010 17:11:22 +0000 === removed file 'debian/clean' --- debian/clean 2010-05-26 17:13:43 +0000 +++ debian/clean 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -*.1 === modified file 'debian/control' --- debian/control 2010-03-22 18:48:51 +0000 +++ debian/control 2010-11-30 00:30:13 +0000 @@ -17,16 +17,16 @@ Uploaders: Daniel Glassey <[email protected]>, Dmitrijs Ledkovs <[email protected]>, Jonathan Marsden <[email protected]> -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Homepage: http://www.crosswire.org/sword/ -Package: libsword8 +Package: libsword9 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: sword-frontend -Conflicts: libsword6, libsword7 +Conflicts: libsword6, libsword7, libsword8 Replaces: libsword1, libsword4, libsword4c2, libsword5, libsword5c2a, - libsword6, libsword-runtime, libsword-config, libsword7 + libsword6, libsword-runtime, libsword-config, 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 @@ -42,7 +42,7 @@ Package: libsword-dev Architecture: any Section: libdevel -Depends: libsword8 (= ${binary:Version}), ${misc:Depends} +Depends: libsword9 (= ${binary:Version}), ${misc:Depends} Provides: sword-dev Description: Development files for libsword The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris, @@ -57,7 +57,7 @@ Architecture: any Section: debug Priority: extra -Depends: libsword8 (= ${binary:Version}), ${misc:Depends} +Depends: libsword9 (= ${binary:Version}), ${misc:Depends} Description: API/library for bible software - Debug Files The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris, MacOSX etc.) API/library for Bible software with a constantly growing list === renamed file 'debian/libsword8.dirs' => 'debian/libsword9.dirs' === renamed file 'debian/libsword8.docs' => 'debian/libsword9.docs' === renamed file 'debian/libsword8.install' => 'debian/libsword9.install' --- debian/libsword8.install 2009-05-05 02:51:40 +0000 +++ debian/libsword9.install 2010-11-30 00:30:13 +0000 @@ -1,6 +1,5 @@ -etc/sword.conf -usr/lib/libsword.so.8.0.0 -usr/lib/libsword.so.8 +samples/recommended/sword.conf etc/ +usr/lib/libsword.so.9.0.0 usr/lib/sword usr/bin/addld usr/bin/imp2ld === renamed file 'debian/libsword8.links' => 'debian/libsword9.links' === renamed file 'debian/libsword8.lintian-overrides' => 'debian/libsword9.lintian-overrides' === renamed file 'debian/libsword8.manpages' => 'debian/libsword9.manpages' === removed file 'debian/patches/02_libver.diff' --- debian/patches/02_libver.diff 2010-01-03 02:41:31 +0000 +++ debian/patches/02_libver.diff 1970-01-01 00:00:00 +0000 @@ -1,28 +0,0 @@ -This patch changes the upstream SO name to Debian/Ubuntu SO name. - -Index: sword/lib/Makefile.am -=================================================================== ---- sword.orig/lib/Makefile.am 2010-01-03 04:36:09.622945995 +0200 -+++ sword/lib/Makefile.am 2010-01-03 04:38:16.010955077 +0200 -@@ -23,7 +23,7 @@ - - AM_CPPFLAGS += $(ICUDEF) - --libsword_la_LDFLAGS = -release $(VERSION) -+libsword_la_LDFLAGS = -version-info 8 - - include ../src/keys/Makefile.am - include ../src/utilfuns/Makefile.am -Index: sword/lib/Makefile.in -=================================================================== ---- sword.orig/lib/Makefile.in 2010-01-03 03:49:46.274945658 +0200 -+++ sword/lib/Makefile.in 2010-01-03 04:38:47.198943804 +0200 -@@ -537,7 +537,7 @@ - $(zlddir)/zld.cpp $(bindingsdir)/flatapi.cpp - @have_icu_fa...@icudef = - @have_icu_t...@icudef = -DSWICU_DATA=\"${pkglibdir}/${VERSION}_icu_${ICU_VER}\" --libsword_la_LDFLAGS = -release $(VERSION) -+libsword_la_LDFLAGS = -version-info 8 - keysdir = $(top_srcdir)/src/keys - utilfunsdir = $(top_srcdir)/src/utilfuns - @internalftplib_fa...@ftpsrc = === modified file 'debian/patches/12_fix_compiler_warnings.diff' --- debian/patches/12_fix_compiler_warnings.diff 2010-01-03 22:57:15 +0000 +++ debian/patches/12_fix_compiler_warnings.diff 2010-11-30 00:30:13 +0000 @@ -1,8 +1,6 @@ Remove compiler warnings so SWORD will compile with -Wall -Werror -Index: sword/src/mgr/filemgr.cpp -=================================================================== ---- sword.orig/src/mgr/filemgr.cpp 2010-01-04 00:38:49.052717665 +0200 -+++ sword/src/mgr/filemgr.cpp 2010-01-04 00:40:32.823732625 +0200 +--- a/src/mgr/filemgr.cpp ++++ b/src/mgr/filemgr.cpp @@ -408,7 +408,7 @@ @@ -12,10 +10,8 @@ char buf[4096]; if ((sfd = ::open(sourceFile, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH)) < 1) -Index: sword/src/utilfuns/zlib/untgz.c -=================================================================== ---- sword.orig/src/utilfuns/zlib/untgz.c 2010-01-04 00:38:49.032728497 +0200 -+++ sword/src/utilfuns/zlib/untgz.c 2010-01-04 00:39:44.144727307 +0200 +--- a/src/utilfuns/zlib/untgz.c ++++ b/src/utilfuns/zlib/untgz.c @@ -13,6 +13,8 @@ #include <fcntl.h> #ifdef unix @@ -83,10 +79,8 @@ while (1) { len = gzread(in, &buffer, BLOCKSIZE); -Index: sword/tests/testblocks.cpp -=================================================================== ---- sword.orig/tests/testblocks.cpp 2010-01-04 00:38:48.928718885 +0200 -+++ sword/tests/testblocks.cpp 2010-01-04 00:39:44.144727307 +0200 +--- a/tests/testblocks.cpp ++++ b/tests/testblocks.cpp @@ -29,14 +29,18 @@ void addEntry(EntriesBlock *eb) { string input; @@ -163,11 +157,9 @@ } } } -Index: sword/utilities/stepdump.cpp -=================================================================== ---- sword.orig/utilities/stepdump.cpp 2010-01-04 00:38:49.012719004 +0200 -+++ sword/utilities/stepdump.cpp 2010-01-04 00:39:44.144727307 +0200 -@@ -153,33 +153,56 @@ +--- a/utilities/stepdump.cpp ++++ b/utilities/stepdump.cpp +@@ -158,33 +158,56 @@ void readVersion(int fd, Version *versionRecord) { @@ -235,7 +227,7 @@ cout << "\tmodifiedBy: " << versionRecord->modifiedBy << "\n"; int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/; -@@ -187,33 +210,49 @@ +@@ -192,33 +215,49 @@ if (skip) { cout << "\nSkipping " << skip << " unknown bytes.\n"; char *skipbuf = new char[skip]; @@ -294,7 +286,7 @@ cout << "\treserved2: " << viewableHeaderRecord->reserved2 << "\n"; int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/; -@@ -221,18 +260,23 @@ +@@ -226,18 +265,23 @@ if (skip) { cout << "\nSkipping " << skip << " unknown bytes.\n"; char *skipbuf = new char[skip]; @@ -320,7 +312,7 @@ compress->zBuf(&size, *buf); strcpy(*buf, compress->Buf()); -@@ -242,30 +286,41 @@ +@@ -247,30 +291,41 @@ void readViewableBlock(int fd, ViewableBlock *vb) { @@ -368,11 +360,9 @@ (*buf)[headerControlWordAreaSize] = 0; cout << "headerControlWordArea:\n" << *buf << "\n"; -Index: sword/utilities/treeidxutil.cpp -=================================================================== ---- sword.orig/utilities/treeidxutil.cpp 2010-01-04 00:38:48.992719359 +0200 -+++ sword/utilities/treeidxutil.cpp 2010-01-04 00:39:44.144727307 +0200 -@@ -49,27 +49,33 @@ +--- a/utilities/treeidxutil.cpp ++++ b/utilities/treeidxutil.cpp +@@ -53,27 +53,33 @@ void setLocalName(TreeKeyIdx *treeKey) { @@ -412,7 +402,7 @@ treeKey->append(); treeKey->setLocalName(buf); treeKey->save(); -@@ -79,9 +85,11 @@ +@@ -83,9 +89,11 @@ void appendChild(TreeKeyIdx *treeKey) { @@ -426,7 +416,7 @@ treeKey->appendChild(); treeKey->setLocalName(buf); treeKey->save(); -@@ -114,11 +122,13 @@ +@@ -118,11 +126,13 @@ TreeKeyIdx root = *treeKey; std::string input; @@ -442,10 +432,8 @@ input = line; if (input.length() > 0) { switch (input[0]) { -Index: sword/utilities/gbfidx.cpp -=================================================================== ---- sword.orig/utilities/gbfidx.cpp 2010-01-04 00:38:48.952718391 +0200 -+++ sword/utilities/gbfidx.cpp 2010-01-04 00:39:44.144727307 +0200 +--- a/utilities/gbfidx.cpp ++++ b/utilities/gbfidx.cpp @@ -53,7 +53,7 @@ int main(int argc, char **argv) { @@ -560,11 +548,9 @@ } } } -Index: sword/utilities/genbookutil.cpp -=================================================================== ---- sword.orig/utilities/genbookutil.cpp 2010-01-04 00:38:49.024719769 +0200 -+++ sword/utilities/genbookutil.cpp 2010-01-04 00:39:44.144727307 +0200 -@@ -48,9 +48,11 @@ +--- a/utilities/genbookutil.cpp ++++ b/utilities/genbookutil.cpp +@@ -53,9 +53,11 @@ void setLocalName(TreeKeyIdx *treeKey) { @@ -578,7 +564,7 @@ SWBuf name = buf; treeKey->setLocalName(name.trim()); treeKey->save(); -@@ -58,18 +60,22 @@ +@@ -63,18 +65,22 @@ void gotoPath(TreeKeyIdx *treeKey) { @@ -605,7 +591,7 @@ SWBuf path = buf; treeKey->assureKeyPath(path.trim()); } -@@ -86,10 +92,12 @@ +@@ -91,10 +97,12 @@ SWBuf body; TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book); if (treeKey->getOffset()) { @@ -620,7 +606,7 @@ SWBuf text = buf; text.trim(); if ((text[0] == '.') && (text[1] == 0)) -@@ -106,9 +114,11 @@ +@@ -111,9 +119,11 @@ void appendSibbling(TreeKeyIdx *treeKey) { if (treeKey->getOffset()) { @@ -634,7 +620,7 @@ SWBuf name = buf; treeKey->append(); treeKey->setLocalName(name.trim()); -@@ -119,9 +129,11 @@ +@@ -124,9 +134,11 @@ void appendChild(TreeKeyIdx *treeKey) { @@ -648,7 +634,7 @@ SWBuf name = buf; treeKey->appendChild(); treeKey->setLocalName(name.trim()); -@@ -163,11 +175,13 @@ +@@ -168,11 +180,13 @@ treeKey = (TreeKeyIdx *)(SWKey *)(*book); SWBuf input; @@ -664,11 +650,9 @@ input = line; input.trim(); if (input.length() > 0) { -Index: sword/utilities/vpl2mod.cpp -=================================================================== ---- sword.orig/utilities/vpl2mod.cpp 2010-01-04 00:38:48.968728584 +0200 -+++ sword/utilities/vpl2mod.cpp 2010-01-04 00:39:44.144727307 +0200 -@@ -67,14 +67,18 @@ +--- a/utilities/vpl2mod.cpp ++++ b/utilities/vpl2mod.cpp +@@ -72,14 +72,18 @@ break; } @@ -690,11 +674,9 @@ (*buf)[size] = 0; // clean up any trailing junk on buf -Index: sword/utilities/installmgr.cpp -=================================================================== ---- sword.orig/utilities/installmgr.cpp 2010-01-04 00:38:48.984719291 +0200 -+++ sword/utilities/installmgr.cpp 2010-01-04 00:39:44.144727307 +0200 -@@ -65,8 +65,10 @@ +--- a/utilities/installmgr.cpp ++++ b/utilities/installmgr.cpp +@@ -69,8 +69,10 @@ cout << "then type yes at the prompt\n\n"; cout << "enable? [no] "; @@ -707,11 +689,9 @@ confirmed = (!strcmp(prompt, "yes\n")); cout << "\n"; } -Index: sword/utilities/step2vpl.cpp -=================================================================== ---- sword.orig/utilities/step2vpl.cpp 2010-01-04 00:38:48.936719093 +0200 -+++ sword/utilities/step2vpl.cpp 2010-01-04 00:39:44.148729122 +0200 -@@ -218,93 +218,169 @@ +--- a/utilities/step2vpl.cpp ++++ b/utilities/step2vpl.cpp +@@ -223,93 +223,169 @@ void readVersion(int fd, Version *versionRecord) { @@ -916,7 +896,7 @@ compress->zBuf(&size, *buf); strcpy(*buf, compress->Buf()); -@@ -312,35 +388,53 @@ +@@ -317,35 +393,53 @@ void readViewableBlock(int fd, ViewableBlock *vb) { @@ -977,7 +957,7 @@ VSyncPoint vSyncPoint; lseek(fdvsync, vSyncBooksInfo->offset, SEEK_SET); -@@ -351,9 +445,15 @@ +@@ -356,9 +450,15 @@ char *sectionName; char *verseText; @@ -996,7 +976,7 @@ vSyncPoint.offset = SECTIONSLEVELSTART + (vSyncPoint.offset * SECTIONSLEVELSIZE); lseek(fdsections, vSyncPoint.offset, SEEK_SET); readSectionLevelInfo(fdsections, §ionLevelInfo); -@@ -408,26 +508,50 @@ +@@ -413,26 +513,50 @@ void readSectionName(int fd, SectionLevelInfo *sli, char **name) { @@ -1058,11 +1038,9 @@ } void cleanBuf(char *buf) { -Index: sword/utilities/cipherraw.cpp -=================================================================== ---- sword.orig/utilities/cipherraw.cpp 2010-01-04 00:38:48.960718319 +0200 -+++ sword/utilities/cipherraw.cpp 2010-01-04 00:39:44.148729122 +0200 -@@ -43,7 +43,7 @@ +--- a/utilities/cipherraw.cpp ++++ b/utilities/cipherraw.cpp +@@ -48,7 +48,7 @@ SWCipher *zobj; VerseKey key; RawVerse *rawdrv; @@ -1071,7 +1049,7 @@ long tmpoff = 0, offset, loffset = 0, lzoffset = 0; unsigned short size, lsize = 0, lzsize; char *tmpbuf; -@@ -69,10 +69,18 @@ +@@ -74,10 +74,18 @@ delete [] tmpbuf; printf("\n"); @@ -1094,7 +1072,7 @@ key.AutoNormalize(0); key.Headings(1); -@@ -84,8 +92,13 @@ +@@ -89,8 +97,13 @@ printf("using previous offset,size %d\n", size); offset = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR); printf("%ld %ld %d \n", offset, lzoffset, lzsize); @@ -1110,7 +1088,7 @@ } else { lsize = size; -@@ -102,13 +115,23 @@ +@@ -107,13 +120,23 @@ offset = lseek(ofd[key.Testament() - 1], 0, SEEK_CUR); tmpoff = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR); printf("%s: (%ld) NEW offset: %ld; size: %d\n", (const char *)key, tmpoff, offset, size); @@ -1138,10 +1116,8 @@ lzsize = size; } } -Index: sword/utilities/lexdump.c -=================================================================== ---- sword.orig/utilities/lexdump.c 2010-01-04 00:38:49.004730321 +0200 -+++ sword/utilities/lexdump.c 2010-01-04 00:39:44.148729122 +0200 +--- a/utilities/lexdump.c ++++ b/utilities/lexdump.c @@ -40,7 +40,7 @@ int main(int argc, char **argv) { === modified file 'debian/patches/13_curl.diff' --- debian/patches/13_curl.diff 2010-03-22 18:24:17 +0000 +++ debian/patches/13_curl.diff 2010-11-30 00:30:13 +0000 @@ -5,13 +5,11 @@ message: applied Karl's patch to fix libcurl problem with status reporter data. -Index: sword/src/mgr/curlftpt.cpp -=================================================================== ---- sword.orig/src/mgr/curlftpt.cpp 2010-03-22 18:22:59.045847934 +0000 -+++ sword/src/mgr/curlftpt.cpp 2010-03-22 18:23:02.244846081 +0000 -@@ -177,6 +177,9 @@ - res = curl_easy_perform(session); - SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n"); +--- a/src/mgr/curlftpt.cpp ++++ b/src/mgr/curlftpt.cpp +@@ -180,6 +180,9 @@ + // it seems CURL tries to use this option data later for some reason, so we unset here + curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL); + // it seems CURL tries to use this option data later for some reason, so we unset here + curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL); === added file 'debian/patches/14_remove_flags.diff' --- debian/patches/14_remove_flags.diff 1970-01-01 00:00:00 +0000 +++ debian/patches/14_remove_flags.diff 2010-11-30 00:30:13 +0000 @@ -0,0 +1,46 @@ +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 + # + === added file 'debian/patches/15_move_icudatadir.diff' --- debian/patches/15_move_icudatadir.diff 1970-01-01 00:00:00 +0000 +++ debian/patches/15_move_icudatadir.diff 2010-11-30 00:30:13 +0000 @@ -0,0 +1,21 @@ +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 +@@ -62,7 +62,7 @@ + + # Need to build/install the + IF(WITH_ICU AND ICU_GENRB) +- ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}") ++ 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}) +@@ -88,4 +88,4 @@ + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}" + DESTINATION "${libdir}/${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-03-22 18:24:17 +0000 +++ debian/patches/series 2010-11-30 00:30:13 +0000 @@ -1,3 +1,4 @@ -02_libver.diff 12_fix_compiler_warnings.diff 13_curl.diff +14_remove_flags.diff +15_move_icudatadir.diff === modified file 'debian/rules' --- debian/rules 2010-05-26 17:13:43 +0000 +++ debian/rules 2010-11-30 00:30:13 +0000 @@ -1,24 +1,35 @@ #!/usr/bin/make -f +#DH_VERBOSE := 1 +ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog) +ver:=$(shell dpkg-parsechangelog | sed -nr "2s/Version: (.*)-.*/\1/p") + WFLAGS := -Wall -Werror -CFLAGS = -g $(WFLAGS) -CXXFLAGS = -g $(WFLAGS) -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) -CFLAGS += -O0 -CXXFLAGS += -O0 +ifneq (,$(shell dpkg-buildflags --version)) +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(WFLAGS) +CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) $(WFLAGS) else -CFLAGS += -O3 -CXXFLAGS += -O3 + # these can all go aways when we support lucid+ only + CFLAGS = -g $(WFLAGS) + CXXFLAGS = -g $(WFLAGS) + ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 + CXXFLAGS += -O0 + else + CFLAGS += -O2 + CXXFLAGS += -O2 + endif endif -ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog) %: - dh --with quilt $@ + dh $@ --with quilt override_dh_auto_configure: - dh_auto_configure -- \ - --enable-tests \ - --enable-debug + dh_auto_configure -Scmake -- \ + -DLIBSWORD_LIBRARY_TYPE="Shared Static" \ + -DLIBSWORD_SOVERSION=9.0.0 \ + -DCMAKE_BUILD_TYPE=NONE \ + -DSWORD_BINDINGS="Python" debian/man/%.1: debian/man/%.1.pod - pod2man --release=$$VERSION --center "" $< > $@ + pod2man --release="SWORD $(ver)" --center "Sword Module Utilities" $< > $@ override_dh_auto_build: $(basename $(wildcard debian/man/*.pod)) dh_auto_build --parallel override_dh_auto_test: @@ -29,9 +40,10 @@ override_dh_strip: dh_strip --dbg-package=libsword-dbg override_dh_makeshlibs: - dh_makeshlibs -V"libsword8 (>= 1.6)" + dh_makeshlibs -V"libsword9 (>= 1.6.2)" override_dh_clean: - dh_clean $(patsubst %.pod, %.1, $(wildcard debian/man/*.pod)) + echo $(if $(ppa),"1.0","3.0 (quilt)") > debian/source/format + dh_clean $(patsubst %.pod, %, $(wildcard debian/man/*.pod)) MAKEFILE = $(firstword $(MAKEFILE_LIST)) SOURCE_DIR = $(dir $(MAKEFILE))/.. @@ -40,8 +52,4 @@ cd $(SOURCE_DIR) && uscan --force-download --rename --destdir . override_dh_builddeb: -ifeq ($(ppa),) - dh_builddeb -else - dh_builddeb -- -Zlzma -endif + dh_builddeb $(if $(ppa),-- -Zlzma) === added directory 'debian/source' === added file 'debian/source/local-options' --- debian/source/local-options 1970-01-01 00:00:00 +0000 +++ debian/source/local-options 2010-11-30 00:30:13 +0000 @@ -0,0 +1,3 @@ +unapply-patches +abort-on-upstream-changes +extend-diff-ignore=.bzr-builddeb
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
