------------------------------------------------------------ revno: 91 committer: Dmitrijs Ledkovs <[email protected]> branch nick: debian timestamp: Sun 2011-08-07 00:11:34 +0100 message: Update patch series removed: debian/patches/17_gcc4.6_zlib.patch modified: debian/patches/16_gcc4.6_sword.patch debian/patches/series debian/rules
-- 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 'debian/patches/16_gcc4.6_sword.patch' --- debian/patches/16_gcc4.6_sword.patch 2011-08-06 20:29:21 +0000 +++ debian/patches/16_gcc4.6_sword.patch 2011-08-06 23:11:34 +0000 @@ -5,9 +5,11 @@ X-Bzr-Revision-Id: [email protected] === modified file 'src/mgr/swmgr.cpp' ---- old/src/mgr/swmgr.cpp 2011-08-01 13:55:40 +0000 -+++ new/src/mgr/swmgr.cpp 2011-08-05 20:06:47 +0000 -@@ -899,7 +899,6 @@ +Index: debian/src/mgr/swmgr.cpp +=================================================================== +--- debian.orig/src/mgr/swmgr.cpp ++++ debian/src/mgr/swmgr.cpp +@@ -889,7 +889,6 @@ SWModule *SWMgr::CreateMod(const char *n if ((!stricmp(driver, "zText")) || (!stricmp(driver, "zCom"))) { SWCompress *compress = 0; int blockType = CHAPTERBLOCKS; @@ -15,7 +17,7 @@ misc1 = ((entry = section.find("BlockType")) != section.end()) ? (*entry).second : (SWBuf)"CHAPTER"; if (!stricmp(misc1.c_str(), "VERSE")) blockType = VERSEBLOCKS; -@@ -908,9 +907,6 @@ +@@ -898,9 +897,6 @@ SWModule *SWMgr::CreateMod(const char *n else if (!stricmp(misc1.c_str(), "BOOK")) blockType = BOOKBLOCKS; @@ -25,11 +27,11 @@ misc1 = ((entry = section.find("CompressType")) != section.end()) ? (*entry).second : (SWBuf)"LZSS"; #ifndef EXCLUDEZLIB if (!stricmp(misc1.c_str(), "ZIP")) - -=== modified file 'src/modules/filters/gbfrtf.cpp' ---- old/src/modules/filters/gbfrtf.cpp 2009-02-07 08:00:28 +0000 -+++ new/src/modules/filters/gbfrtf.cpp 2011-08-05 20:06:47 +0000 -@@ -42,7 +42,6 @@ +Index: debian/src/modules/filters/gbfrtf.cpp +=================================================================== +--- debian.orig/src/modules/filters/gbfrtf.cpp ++++ debian/src/modules/filters/gbfrtf.cpp +@@ -42,7 +42,6 @@ char GBFRTF::processText(SWBuf &text, co SWBuf strongnum; SWBuf strongtense; bool hideText = false; @@ -37,7 +39,7 @@ int wordCount = 0; const char *from; -@@ -50,7 +49,6 @@ +@@ -50,7 +49,6 @@ char GBFRTF::processText(SWBuf &text, co from = orig.c_str(); for (text = ""; *from; from++) { if (*from == '<') { @@ -45,11 +47,11 @@ wordCount = 0; intoken = true; tokpos = 0; - -=== modified file 'src/modules/filters/gbfwordjs.cpp' ---- old/src/modules/filters/gbfwordjs.cpp 2009-02-07 08:00:28 +0000 -+++ new/src/modules/filters/gbfwordjs.cpp 2011-08-05 20:06:47 +0000 -@@ -57,7 +57,6 @@ +Index: debian/src/modules/filters/gbfwordjs.cpp +=================================================================== +--- debian.orig/src/modules/filters/gbfwordjs.cpp ++++ debian/src/modules/filters/gbfwordjs.cpp +@@ -57,7 +57,6 @@ char GBFWordJS::processText(SWBuf &text, char token[2112]; // cheese. Fix. int tokpos = 0; bool intoken = false; @@ -57,7 +59,7 @@ int word = 1; char val[128]; char wordstr[5]; -@@ -152,14 +151,11 @@ +@@ -152,14 +151,11 @@ char GBFWordJS::processText(SWBuf &text, else strong << 1; SWModule *sLex = 0; @@ -72,7 +74,7 @@ } SWBuf lexName = ""; if (sLex) { -@@ -223,7 +219,6 @@ +@@ -223,7 +219,6 @@ char GBFWordJS::processText(SWBuf &text, } else { text += *from; @@ -80,11 +82,11 @@ } } - -=== modified file 'src/modules/filters/osislemma.cpp' ---- old/src/modules/filters/osislemma.cpp 2009-02-07 08:00:28 +0000 -+++ new/src/modules/filters/osislemma.cpp 2011-08-05 20:06:47 +0000 -@@ -44,7 +44,6 @@ +Index: debian/src/modules/filters/osislemma.cpp +=================================================================== +--- debian.orig/src/modules/filters/osislemma.cpp ++++ debian/src/modules/filters/osislemma.cpp +@@ -44,7 +44,6 @@ OSISLemma::~OSISLemma() { char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) { SWBuf token; bool intoken = false; @@ -92,7 +94,7 @@ const SWBuf orig = text; const char * from = orig.c_str(); -@@ -90,7 +89,6 @@ +@@ -90,7 +89,6 @@ char OSISLemma::processText(SWBuf &text, } else { text.append(*from); @@ -100,11 +102,11 @@ } } } - -=== modified file 'src/modules/filters/osismorph.cpp' ---- old/src/modules/filters/osismorph.cpp 2009-02-07 08:00:28 +0000 -+++ new/src/modules/filters/osismorph.cpp 2011-08-05 20:06:47 +0000 -@@ -45,7 +45,6 @@ +Index: debian/src/modules/filters/osismorph.cpp +=================================================================== +--- debian.orig/src/modules/filters/osismorph.cpp ++++ debian/src/modules/filters/osismorph.cpp +@@ -45,7 +45,6 @@ char OSISMorph::processText(SWBuf &text, char token[2048]; // cheese. Fix. int tokpos = 0; bool intoken = false; @@ -112,7 +114,7 @@ SWBuf orig = text; const char *from = orig.c_str(); -@@ -90,7 +89,6 @@ +@@ -90,7 +89,6 @@ char OSISMorph::processText(SWBuf &text, } else { text.append(*from); @@ -120,11 +122,11 @@ } } } - -=== modified file 'src/modules/filters/osisruby.cpp' ---- old/src/modules/filters/osisruby.cpp 2009-04-13 00:34:44 +0000 -+++ new/src/modules/filters/osisruby.cpp 2011-08-05 20:06:47 +0000 -@@ -44,7 +44,6 @@ +Index: debian/src/modules/filters/osisruby.cpp +=================================================================== +--- debian.orig/src/modules/filters/osisruby.cpp ++++ debian/src/modules/filters/osisruby.cpp +@@ -44,7 +44,6 @@ OSISRuby::~OSISRuby() { char OSISRuby::processText(SWBuf &text, const SWKey *key, const SWModule *module) { SWBuf token; bool intoken = false; @@ -132,7 +134,7 @@ const SWBuf orig = text; const char * from = orig.c_str(); -@@ -83,7 +82,6 @@ +@@ -83,7 +82,6 @@ char OSISRuby::processText(SWBuf &text, } else { text.append(*from); @@ -140,11 +142,11 @@ } } } - -=== modified file 'src/modules/filters/osisstrongs.cpp' ---- old/src/modules/filters/osisstrongs.cpp 2009-03-09 23:11:25 +0000 -+++ new/src/modules/filters/osisstrongs.cpp 2011-08-05 20:06:47 +0000 -@@ -49,7 +49,6 @@ +Index: debian/src/modules/filters/osisstrongs.cpp +=================================================================== +--- debian.orig/src/modules/filters/osisstrongs.cpp ++++ debian/src/modules/filters/osisstrongs.cpp +@@ -49,7 +49,6 @@ OSISStrongs::~OSISStrongs() { char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) { SWBuf token; bool intoken = false; @@ -152,7 +154,7 @@ int wordNum = 1; char wordstr[5]; const char *wordStart = 0; -@@ -280,7 +279,6 @@ +@@ -280,7 +279,6 @@ char OSISStrongs::processText(SWBuf &tex } else { text.append(*from); @@ -160,11 +162,11 @@ } } return 0; - -=== modified file 'src/modules/filters/osiswordjs.cpp' ---- old/src/modules/filters/osiswordjs.cpp 2009-03-09 23:11:25 +0000 -+++ new/src/modules/filters/osiswordjs.cpp 2011-08-05 20:06:47 +0000 -@@ -59,7 +59,6 @@ +Index: debian/src/modules/filters/osiswordjs.cpp +=================================================================== +--- debian.orig/src/modules/filters/osiswordjs.cpp ++++ debian/src/modules/filters/osiswordjs.cpp +@@ -59,7 +59,6 @@ char OSISWordJS::processText(SWBuf &text char token[2112]; // cheese. Fix. int tokpos = 0; bool intoken = false; @@ -172,7 +174,7 @@ int wordNum = 1; char wordstr[5]; SWBuf modName = (module)?module->Name():""; -@@ -186,7 +185,6 @@ +@@ -186,7 +185,6 @@ char OSISWordJS::processText(SWBuf &text } else { text.append(*from); @@ -180,11 +182,11 @@ } } } - -=== modified file 'src/modules/filters/thmlwordjs.cpp' ---- old/src/modules/filters/thmlwordjs.cpp 2009-02-07 08:00:28 +0000 -+++ new/src/modules/filters/thmlwordjs.cpp 2011-08-05 20:06:47 +0000 -@@ -58,7 +58,6 @@ +Index: debian/src/modules/filters/thmlwordjs.cpp +=================================================================== +--- debian.orig/src/modules/filters/thmlwordjs.cpp ++++ debian/src/modules/filters/thmlwordjs.cpp +@@ -58,7 +58,6 @@ char ThMLWordJS::processText(SWBuf &text char token[2112]; // cheese. Fix. int tokpos = 0; bool intoken = false; @@ -192,7 +194,7 @@ int word = 1; char val[128]; char *valto; -@@ -166,14 +165,11 @@ +@@ -166,14 +165,11 @@ char ThMLWordJS::processText(SWBuf &text else strong << 1; SWModule *sLex = 0; @@ -207,7 +209,7 @@ } SWBuf lexName = ""; if (sLex) { -@@ -204,16 +200,6 @@ +@@ -204,16 +200,6 @@ char ThMLWordJS::processText(SWBuf &text textStr += lastAppendLen; SWBuf spanStart = ""; @@ -224,7 +226,7 @@ // 'p' = 'fillpop' to save bandwidth const char *m = strchr(morph.c_str(), ':'); if (m) m++; -@@ -237,7 +223,6 @@ +@@ -237,7 +223,6 @@ char ThMLWordJS::processText(SWBuf &text } else { text += *from; @@ -232,11 +234,11 @@ } } - -=== modified file 'src/modules/filters/utf8html.cpp' ---- old/src/modules/filters/utf8html.cpp 2009-02-07 08:00:28 +0000 -+++ new/src/modules/filters/utf8html.cpp 2011-08-05 20:06:47 +0000 -@@ -34,14 +34,11 @@ +Index: debian/src/modules/filters/utf8html.cpp +=================================================================== +--- debian.orig/src/modules/filters/utf8html.cpp ++++ debian/src/modules/filters/utf8html.cpp +@@ -34,14 +34,11 @@ UTF8HTML::UTF8HTML() { char UTF8HTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) { unsigned char *from; @@ -251,11 +253,11 @@ SWBuf orig = text; from = (unsigned char *)orig.c_str(); - -=== modified file 'src/modules/filters/utf8latin1.cpp' ---- old/src/modules/filters/utf8latin1.cpp 2009-02-07 08:00:28 +0000 -+++ new/src/modules/filters/utf8latin1.cpp 2011-08-05 20:06:47 +0000 -@@ -36,14 +36,12 @@ +Index: debian/src/modules/filters/utf8latin1.cpp +=================================================================== +--- debian.orig/src/modules/filters/utf8latin1.cpp ++++ debian/src/modules/filters/utf8latin1.cpp +@@ -36,14 +36,12 @@ char UTF8Latin1::processText(SWBuf &text { unsigned char *from; @@ -270,11 +272,11 @@ SWBuf orig = text; from = (unsigned char*)orig.c_str(); - -=== modified file 'src/utilfuns/url.cpp' ---- old/src/utilfuns/url.cpp 2009-02-14 05:48:58 +0000 -+++ new/src/utilfuns/url.cpp 2011-08-05 20:06:47 +0000 -@@ -133,7 +133,6 @@ +Index: debian/src/utilfuns/url.cpp +=================================================================== +--- debian.orig/src/utilfuns/url.cpp ++++ debian/src/utilfuns/url.cpp +@@ -133,7 +133,6 @@ void URL::parse () { //3.Get the hostname part. This is the part from pos up to the first slash bool checkPath = true; bool checkParams = true; @@ -282,7 +284,7 @@ end = strchr(urlPtr, '/'); if (!end) { -@@ -145,7 +144,6 @@ +@@ -145,7 +144,6 @@ void URL::parse () { end = strchr(urlPtr, '#'); } if (!end) { @@ -290,7 +292,7 @@ end = urlPtr+strlen(urlPtr); } -@@ -160,7 +158,6 @@ +@@ -160,7 +158,6 @@ void URL::parse () { end = strchr(urlPtr, '#'); } if (!end) { @@ -298,7 +300,7 @@ end = urlPtr+strlen(urlPtr); } -@@ -174,14 +171,6 @@ +@@ -174,14 +171,6 @@ void URL::parse () { SWBuf paramName; SWBuf paramValue; @@ -313,11 +315,11 @@ end = urlPtr; while (end) { paramName = ""; - -=== modified file 'utilities/osis2mod.cpp' ---- old/utilities/osis2mod.cpp 2010-10-04 08:35:09 +0000 -+++ new/utilities/osis2mod.cpp 2011-08-05 20:06:47 +0000 -@@ -1416,7 +1416,6 @@ +Index: debian/utilities/osis2mod.cpp +=================================================================== +--- debian.orig/utilities/osis2mod.cpp ++++ debian/utilities/osis2mod.cpp +@@ -1416,7 +1416,6 @@ int main(int argc, char **argv) { const char* osisDoc = argv[2]; int append = 0; SWBuf compType = ""; @@ -325,7 +327,7 @@ int iType = 4; int entrySize = 0; SWBuf cipherKey = ""; -@@ -1464,9 +1463,6 @@ +@@ -1464,9 +1463,6 @@ int main(int argc, char **argv) { } usage(*argv, "-s requires one of <2|4>"); } @@ -335,4 +337,3 @@ else if (!strcmp(argv[i], "-d")) { if (i+1 < argc) debug |= atoi(argv[++i]); else usage(*argv, "-d requires <flags>"); - === removed file 'debian/patches/17_gcc4.6_zlib.patch' --- debian/patches/17_gcc4.6_zlib.patch 2011-08-06 20:29:21 +0000 +++ debian/patches/17_gcc4.6_zlib.patch 1970-01-01 00:00:00 +0000 @@ -1,55 +0,0 @@ -Description: gcc-4.6 -Wunused-but-set-variables and undefined symbols -Origin: commit, revision id: [email protected] -Author: Dmitrijs Ledkovs <[email protected]> -Last-Update: 2011-08-06 -X-Bzr-Revision-Id: [email protected] - -=== modified file 'src/utilfuns/zlib/untgz.c' ---- old/src/utilfuns/zlib/untgz.c 2001-03-23 09:00:15 +0000 -+++ new/src/utilfuns/zlib/untgz.c 2011-08-06 20:25:19 +0000 -@@ -35,6 +35,7 @@ - # endif - #else - # include <utime.h> -+# include <sys/stat.h> - #endif - - -@@ -80,7 +81,6 @@ - - enum { TGZ_EXTRACT = 0, TGZ_LIST }; - --static char *TGZfname OF((const char *)); - void TGZnotfound OF((const char *)); - - int getoct OF((char *, int)); -@@ -102,28 +102,6 @@ - - static char *TGZprefix[] = { "\0", ".tgz", ".tar.gz", ".tar", NULL }; - --/* Return the real name of the TGZ archive */ --/* or NULL if it does not exist. */ -- --static char *TGZfname OF((const char *fname)) --{ -- static char buffer[1024]; -- int origlen,i; -- -- strcpy(buffer,fname); -- origlen = strlen(buffer); -- -- for (i=0; TGZprefix[i]; i++) -- { -- strcpy(buffer+origlen,TGZprefix[i]); -- if (access(buffer,F_OK) == 0) -- return buffer; -- } -- return NULL; --} -- --/* error message for the filename */ -- - void TGZnotfound OF((const char *fname)) - { - int i; - === modified file 'debian/patches/series' --- debian/patches/series 2011-08-06 20:29:21 +0000 +++ debian/patches/series 2011-08-06 23:11:34 +0000 @@ -3,5 +3,4 @@ 14_compiler_flags.diff 15_move_icudatadir.diff 16_gcc4.6_sword.patch -17_gcc4.6_zlib.patch 2631_fix_curl.patch === modified file 'debian/rules' --- debian/rules 2011-08-06 20:29:21 +0000 +++ debian/rules 2011-08-06 23:11:34 +0000 @@ -4,13 +4,14 @@ ver:=$(shell dpkg-parsechangelog | sed -nr "2s/Version: (.*)-.*/\1/p") bd :=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) py :=obj-$(bd)/bindings/swig/python +pyh:=$(shell if [ -f /usr/share/perl5/Debian/Debhelper/Sequence/python2.pm ]; then echo python2; else echo py_support; fi) WFLAGS := -Wall -Werror CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(WFLAGS) CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) $(WFLAGS) %: - dh $@ + dh $@ --with $(pyh) override_dh_auto_configure: dh_auto_configure -Scmake -- \ -DLIBSWORD_LIBRARY_TYPE="Shared Static" \ @@ -36,8 +37,8 @@ chmod -x debian/libsword8/usr/share/sword/locales.d/* override_dh_strip: dh_strip --dbg-package=libsword-dbg - # lintian: python-debug-in-wrong-location - mv debian/libsword-dbg/usr/lib/debug/usr/lib/pyshared \ + # lintian: python-debug-in-wrong-location, for some value of dh_strip + -mv debian/libsword-dbg/usr/lib/debug/usr/lib/pyshared \ debian/libsword-dbg/usr/lib/debug/usr/lib/pymodules override_dh_makeshlibs: dh_makeshlibs -V
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
