------------------------------------------------------------
revno: 112
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: sword
timestamp: Wed 2012-11-21 03:01:06 +0000
message:
no more extra patches
removed:
debian/patches/2662.patch
debian/patches/2665.patch
debian/patches/2666.patch
debian/patches/2670.patch
debian/patches/2687.patch
--
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
=== removed file 'debian/patches/2662.patch'
--- debian/patches/2662.patch 2012-11-21 02:01:01 +0000
+++ debian/patches/2662.patch 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-Description: cleaned up clucene2 support.
-Origin: commit, revision id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2662
-Author: scribe
-Last-Update: 2011-10-29
-X-Bzr-Revision-Id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2662
-
-=== modified file 'src/modules/swmodule.cpp'
---- old/src/modules/swmodule.cpp 2011-10-29 15:16:41 +0000
-+++ new/src/modules/swmodule.cpp 2011-10-29 15:28:23 +0000
-@@ -1160,7 +1160,7 @@
- doc->add(*_CLNEW Field(_T("content"), (wchar_t *)utf8ToWChar(content).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED));
-
- if (strong.length() > 0) {
--+ doc->add(*_CLNEW Field(_T("lemma"), (wchar_t *)utf8ToWChar(strong).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED));
-+ doc->add(*_CLNEW Field(_T("lemma"), (wchar_t *)utf8ToWChar(strong).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED));
- //printf("setting fields (%s).\ncontent: %s\nlemma: %s\n", (const char *)*key, content, strong.c_str());
- }
-
-
=== removed file 'debian/patches/2665.patch'
--- debian/patches/2665.patch 2012-11-21 02:01:01 +0000
+++ debian/patches/2665.patch 1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-Description: Adding changes to CLucene detection into CMake toolchain.
-Origin: commit, revision id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2665
-Author: greg.hellings
-Last-Update: 2011-11-02
-X-Bzr-Revision-Id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2665
-
-=== modified file 'CMakeLists.txt'
---- old/CMakeLists.txt 2011-07-11 13:25:55 +0000
-+++ new/CMakeLists.txt 2011-11-02 14:53:20 +0000
-@@ -169,6 +169,10 @@
- INCLUDE_DIRECTORIES(${CLUCENE_INCLUDE_DIR})
- SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CLUCENE_LIBRARY})
- LINK_DIRECTORIES(${CLUCENE_LIBRARY_DIR})
-+ ADD_DEFINITIONS(-DUSELUCENE)
-+ IF(CLUCENE2)
-+ ADD_DEFINITIONS(-DCLUCENE2)
-+ ENDIF(CLUCENE2)
- ENDIF(WITH_CLUCENE)
- IF(WITH_ICU)
- INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
-
-=== modified file 'cmake/FindCLucene.cmake'
---- old/cmake/FindCLucene.cmake 2010-12-07 02:29:28 +0000
-+++ new/cmake/FindCLucene.cmake 2011-11-02 14:53:20 +0000
-@@ -83,19 +83,26 @@
- FIND_PATH(CLUCENE_LIBRARY_DIR
- NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
- IF (CLUCENE_LIBRARY_DIR)
-+ SET(CLUCENE_INCLUDE_DIR ${CLUCENE_INCLUDE_DIR} ${CLUCENE_LIBRARY_DIR})
- #MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
- FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
- STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
- IF (CLMATCH)
- STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})
-- IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-- MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
-- SET(CLUCENE_GOOD_VERSION FALSE)
-- ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-- IF (CLUCENE_VERSION STREQUAL "0.9.17")
-- MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
-- SET(CLUCENE_GOOD_VERSION FALSE)
-- ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
-+ IF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
-+ MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
-+ SET(CLUCENE_GOOD_VERSION FALSE)
-+ ENDIF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
-+ IF (CLUCENE_VERSION STREQUAL "0.9.17")
-+ MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
-+ SET(CLUCENE_GOOD_VERSION FALSE)
-+ ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
-+ IF (CLUCENE_VERSION VERSION_GREATER "2.0")
-+ MESSAGE (STATUS "Found CLucene 2, enabling compatibility mode")
-+ SET(CLUCENE2 TRUE)
-+ ELSE (CLUCENE_VERSION VERSION_GREATER "2.0")
-+ SET(CLUCENE2 FALSE)
-+ ENDIF (CLUCENE_VERSION VERSION_GREATER "2.0")
- ENDIF (CLMATCH)
- ELSE (CLUCENE_LIBRARY_DIR)
- #MESSAGE(STATUS "CLucene library dir not found.")
-
=== removed file 'debian/patches/2666.patch'
--- debian/patches/2666.patch 2012-11-21 02:01:01 +0000
+++ debian/patches/2666.patch 1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-Description: fix for clucene builds on f16
- fix for pointer conversion warning on f16. changed userData generic store from void * to __u64 to be consistent on every arch and should have enough space for any size it used to be compiled to on any arch (we're not compile for 128 bit yet, right? :)
-Origin: commit, revision id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2666
-Author: scribe
-Last-Update: 2011-11-05
-X-Bzr-Revision-Id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2666
-
-=== modified file 'include/swkey.h'
---- old/include/swkey.h 2011-07-23 17:39:20 +0000
-+++ new/include/swkey.h 2011-11-05 23:57:38 +0000
-@@ -27,6 +27,7 @@
- #include <swobject.h>
-
- #include <defs.h>
-+#include <sysdata.h>
- #include <utilstr.h>
-
- SWORD_NAMESPACE_START
-@@ -111,8 +112,8 @@
-
- public:
-
-- // misc pointer for whatever
-- void *userData;
-+ // misc storage for whatever
-+ __u64 userData;
-
- /** initializes instance of SWKey from a string
- * All keys can be reduced to a string representation which should be able
-
-=== modified file 'include/sysdata.h'
---- old/include/sysdata.h 2010-04-17 06:51:27 +0000
-+++ new/include/sysdata.h 2011-11-05 23:57:38 +0000
-@@ -18,9 +18,12 @@
- typedef signed int __s32;
- typedef unsigned int __u32;
-
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--//typedef __signed__ long long __s64;
--//typedef unsigned long long __u64;
-+#ifdef __GNUC__
-+__extension__ typedef __signed__ long long __s64;
-+__extension__ typedef unsigned long long __u64;
-+#else
-+typedef signed long long __s64;
-+typedef unsigned long long __u64;
- #endif
-
- #undef __swswap16
-
-=== modified file 'src/keys/versekey.cpp'
---- old/src/keys/versekey.cpp 2011-07-22 11:03:45 +0000
-+++ new/src/keys/versekey.cpp 2011-11-05 23:57:38 +0000
-@@ -696,7 +696,7 @@
- lastKey->LowerBound(*curKey);
- lastKey->setPosition(TOP);
- tmpListKey << *lastKey;
-- tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str()));
-+ tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
- }
- else {
- if (!dash) { // if last separator was not a dash just add
-@@ -709,7 +709,7 @@
- lastKey->UpperBound(*curKey);
- *lastKey = TOP;
- tmpListKey << *lastKey;
-- tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str()));
-+ tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
- }
- else {
- bool f = false;
-@@ -723,7 +723,7 @@
- lastKey->UpperBound(*curKey);
- *lastKey = TOP;
- tmpListKey << *lastKey;
-- tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str()));
-+ tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
- }
- }
- else if (expandRange) {
-@@ -735,7 +735,7 @@
- *curKey = MAXVERSE;
- newElement->UpperBound(*curKey);
- *newElement = TOP;
-- tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str()));
-+ tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
- }
- }
- }
-@@ -921,7 +921,7 @@
- lastKey->LowerBound(*curKey);
- *lastKey = TOP;
- tmpListKey << *lastKey;
-- tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str()));
-+ tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
- }
- else {
- if (!dash) { // if last separator was not a dash just add
-@@ -934,7 +934,7 @@
- lastKey->UpperBound(*curKey);
- *lastKey = TOP;
- tmpListKey << *lastKey;
-- tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str()));
-+ tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
- }
- else {
- bool f = false;
-@@ -948,7 +948,7 @@
- lastKey->UpperBound(*curKey);
- *lastKey = TOP;
- tmpListKey << *lastKey;
-- tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str()));
-+ tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
- }
- }
- else if (expandRange) {
-@@ -960,7 +960,7 @@
- *curKey = MAXVERSE;
- newElement->UpperBound(*curKey);
- *newElement = TOP;
-- tmpListKey.GetElement()->userData = (void *)(bufStart+(buf-iBuf.c_str()));
-+ tmpListKey.GetElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
- }
- }
- }
-
-=== modified file 'src/modules/swmodule.cpp'
---- old/src/modules/swmodule.cpp 2011-10-29 15:28:23 +0000
-+++ new/src/modules/swmodule.cpp 2011-11-05 23:57:38 +0000
-@@ -529,7 +529,7 @@
- }
- }
- listKey << *resultKey;
-- listKey.GetElement()->userData = (void *)((__u32)(h->score(i)*100));
-+ listKey.GetElement()->userData = (__u64)((__u32)(h->score(i)*100));
- }
- (*percent)(98, percentUserData);
- }
-
=== removed file 'debian/patches/2670.patch'
--- debian/patches/2670.patch 2012-11-21 02:54:01 +0000
+++ debian/patches/2670.patch 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-Description: added cast to clucene's Hits object
- uncommented genID
-Origin: commit, revision id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2670
-Author: scribe
-Last-Update: 2011-11-12
-X-Bzr-Revision-Id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2670
-
-=== modified file 'utilities/osis2mod.cpp'
---- old/utilities/osis2mod.cpp 2011-11-12 17:35:32 +0000
-+++ new/utilities/osis2mod.cpp 2011-11-12 20:07:47 +0000
-@@ -590,7 +590,7 @@
-
- // Flags indicating whether we are processing the content of to be prepended to a verse
- static bool inPreVerse = false;
--// static int genID = 1;
-+ static int genID = 1;
-
- // Flag indicating whether we are in "Words of Christ"
- static bool inWOC = false;
-
=== removed file 'debian/patches/2687.patch'
--- debian/patches/2687.patch 2012-11-21 02:01:01 +0000
+++ debian/patches/2687.patch 1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-Description: Make lucene enables builds actually install a correct sword.pc which will include the clucene libs
-Origin: commit, revision id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2687
-Author: scribe
-Last-Update: 2012-03-03
-X-Bzr-Revision-Id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2687
-
-=== modified file 'configure.ac'
---- old/configure.ac 2011-11-05 23:57:38 +0000
-+++ new/configure.ac 2012-03-03 13:09:14 +0000
-@@ -260,6 +260,7 @@
- AM_CFLAGS="$AM_CFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
- LIBS="$LIBS $CLUCENE2_LIBS"
- with_clucene="yes 2.x"
-+ CLUCENE_LIBS="$CLUCENE_LIBS $CLUCENE2_LIBS"
- else
- if test "x$CLUCENE_LIBS" != x; then
- echo "lucene 0.x found - lucene searching options available"
-@@ -312,6 +313,7 @@
- AC_SUBST(CURL_LIBS)
- AC_SUBST(ICU_LIBS)
- AC_SUBST(ICU_IOLIBS)
-+AC_SUBST(CLUCENE_LIBS)
-
-
- # ---------------------------------------------------------------------
-
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
