------------------------------------------------------------ revno: 90 committer: Dmitrijs Ledkovs <[email protected]> branch nick: debian timestamp: Sat 2011-08-06 21:29:21 +0100 message: * Usie dpkg-buildflags * document vs2osisreftxt.1 * 3.0 (quilt) format only (launchpad ppa supports it now) * fix gcc-4.6 warnings removed: debian/patches/daily.series added: debian/man/vs2osisreftxt.1.pod debian/patches/16_gcc4.6_sword.patch debian/patches/17_gcc4.6_zlib.patch debian/patches/2631_fix_curl.patch debian/source/format renamed: debian/libsword9.dirs => debian/libsword8.dirs debian/libsword9.docs => debian/libsword8.docs debian/libsword9.install => debian/libsword8.install debian/libsword9.links => debian/libsword8.links debian/libsword9.lintian-overrides => debian/libsword8.lintian-overrides debian/libsword9.manpages => debian/libsword8.manpages modified: .bzrignore debian/changelog debian/control debian/patches/series debian/rules debian/libsword8.install debian/libsword8.lintian-overrides debian/libsword8.manpages
-- 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 '.bzrignore' --- .bzrignore 2010-11-30 00:30:13 +0000 +++ .bzrignore 2011-08-06 20:29:21 +0000 @@ -1,2 +1,1 @@ -debian/source/format tests/testsuite/*.try === modified file 'debian/changelog' --- debian/changelog 2010-12-01 22:36:48 +0000 +++ debian/changelog 2011-08-06 20:29:21 +0000 @@ -3,14 +3,16 @@ [ 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 * 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) + * Usie dpkg-buildflags * Make CMake honour environmental variables * Create python-sword package (LP: #49959) + * document vs2osisreftxt.1 + * 3.0 (quilt) format only (launchpad ppa supports it now) + * fix gcc-4.6 warnings -- Dmitrijs Ledkovs <[email protected]> Tue, 30 Nov 2010 23:06:43 +0000 === modified file 'debian/control' --- debian/control 2010-11-30 23:19:12 +0000 +++ debian/control 2011-08-06 20:29:21 +0000 @@ -1,6 +1,5 @@ Source: sword -Build-Depends: quilt (>= 0.46-7~), - debhelper (>= 7.0.50~), +Build-Depends: debhelper (>= 7.0.50~), cmake, swig, python-all-dev, @@ -21,13 +20,12 @@ Standards-Version: 3.9.1 Homepage: http://www.crosswire.org/sword/ -Package: libsword9 +Package: libsword8 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: sword-frontend -Conflicts: libsword6, libsword7, libsword8 -Replaces: libsword1, libsword4, libsword4c2, libsword5, libsword5c2a, - libsword6, libsword-runtime, libsword-config, libsword7, libsword8 +Conflicts: libsword6, libsword7 +Replaces: libsword6, libsword7 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 @@ -43,7 +41,7 @@ Package: libsword-dev Architecture: any Section: libdevel -Depends: libsword9 (= ${binary:Version}), ${misc:Depends} +Depends: libsword8 (= ${binary:Version}), ${misc:Depends} Provides: sword-dev Description: Development files for libsword The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris, @@ -58,7 +56,7 @@ Architecture: any Section: debug Priority: extra -Depends: libsword9 (= ${binary:Version}), ${misc:Depends} +Depends: libsword8 (= ${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/libsword9.dirs' => 'debian/libsword8.dirs' === renamed file 'debian/libsword9.docs' => 'debian/libsword8.docs' === renamed file 'debian/libsword9.install' => 'debian/libsword8.install' --- debian/libsword9.install 2010-11-30 19:21:51 +0000 +++ debian/libsword8.install 2011-08-06 20:29:21 +0000 @@ -1,5 +1,5 @@ samples/recommended/sword.conf etc/ -usr/lib/libsword.so.9 +usr/lib/libsword.so.8 usr/lib/sword usr/bin/addld usr/bin/imp2ld === renamed file 'debian/libsword9.links' => 'debian/libsword8.links' === renamed file 'debian/libsword9.lintian-overrides' => 'debian/libsword8.lintian-overrides' --- debian/libsword9.lintian-overrides 2010-11-30 13:57:46 +0000 +++ debian/libsword8.lintian-overrides 2011-08-06 20:29:21 +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/ +libsword8 binary: package-contains-empty-directory usr/share/sword/modules/ === renamed file 'debian/libsword9.manpages' => 'debian/libsword8.manpages' --- debian/libsword9.manpages 2010-11-30 00:30:13 +0000 +++ debian/libsword8.manpages 2011-08-06 20:29:21 +0000 @@ -9,5 +9,6 @@ debian/man/tei2mod.1 debian/man/vpl2mod.1 debian/man/vs2osisref.1 +debian/man/vs2osisreftxt.1 debian/man/xml2gbs.1 === added file 'debian/man/vs2osisreftxt.1.pod' --- debian/man/vs2osisreftxt.1.pod 1970-01-01 00:00:00 +0000 +++ debian/man/vs2osisreftxt.1.pod 2011-08-06 20:29:21 +0000 @@ -0,0 +1,38 @@ +# This is manual page in Perl POD format. Read more at +# http://perldoc.perl.org/perlpod.html or run command: +# +# perldoc perlpod | less +# +# To check the syntax: +# +# podchecker *.pod +# +# Create manual page with command: +# +# pod2man PAGE.N.pod > PAGE.N + +=head1 NAME + +vs2osisreftxt - a tool that probably does something with OSIS refs + +=head1 SYNOPSIS + +vs2osisreftxt STRING [local_name] [test-in-set-verse] + +=head1 DESCRIPTION + +Apart from synopsis, little is know what this does. Probably something +to do with parsing verses or verse references to/from string to/from +OSIS in a given locale or something along the lines. Email me if you +can give better description of what this util does. + +=head1 Authors + +This manual page was written by Dmitrijs Ledkovs <[email protected]> for +Debian project but may be used by others. + +=head1 SEE ALSO + +L<vs2osisref> + +=cut === added file 'debian/patches/16_gcc4.6_sword.patch' --- debian/patches/16_gcc4.6_sword.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/16_gcc4.6_sword.patch 2011-08-06 20:29:21 +0000 @@ -0,0 +1,338 @@ +Description: gcc-4.6 -Wunused-but-set-variable fixes +Origin: commit, revision id: [email protected] +Author: Dmitrijs Ledkovs <[email protected]> +Last-Update: 2011-08-05 +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 @@ + if ((!stricmp(driver, "zText")) || (!stricmp(driver, "zCom"))) { + SWCompress *compress = 0; + int blockType = CHAPTERBLOCKS; +- int blockNum = 1; + misc1 = ((entry = section.find("BlockType")) != section.end()) ? (*entry).second : (SWBuf)"CHAPTER"; + if (!stricmp(misc1.c_str(), "VERSE")) + blockType = VERSEBLOCKS; +@@ -908,9 +907,6 @@ + else if (!stricmp(misc1.c_str(), "BOOK")) + blockType = BOOKBLOCKS; + +- misc1 = ((entry = section.find("BlockNumber")) != section.end()) ? (*entry).second : (SWBuf)"1"; +- blockNum = atoi(misc1.c_str()); +- + 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 @@ + SWBuf strongnum; + SWBuf strongtense; + bool hideText = false; +- int wordLen = 0; + int wordCount = 0; + + const char *from; +@@ -50,7 +49,6 @@ + from = orig.c_str(); + for (text = ""; *from; from++) { + if (*from == '<') { +- wordLen = wordCount; + 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 @@ + char token[2112]; // cheese. Fix. + int tokpos = 0; + bool intoken = false; +- bool lastspace = false; + int word = 1; + char val[128]; + char wordstr[5]; +@@ -152,14 +151,11 @@ + else strong << 1; + + SWModule *sLex = 0; +- SWModule *sMorph = 0; + if (gh == 'G') { + sLex = defaultGreekLex; +- sMorph = defaultGreekParse; + } + if (gh == 'H') { + sLex = defaultHebLex; +- sMorph = defaultHebParse; + } + SWBuf lexName = ""; + if (sLex) { +@@ -223,7 +219,6 @@ + } + else { + text += *from; +- lastspace = (*from == ' '); + } + } + + +=== 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 @@ + char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) { + SWBuf token; + bool intoken = false; +- bool lastspace = false; + + const SWBuf orig = text; + const char * from = orig.c_str(); +@@ -90,7 +89,6 @@ + } + else { + text.append(*from); +- lastspace = (*from == ' '); + } + } + } + +=== 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 @@ + char token[2048]; // cheese. Fix. + int tokpos = 0; + bool intoken = false; +- bool lastspace = false; + SWBuf orig = text; + const char *from = orig.c_str(); + +@@ -90,7 +89,6 @@ + } + else { + text.append(*from); +- lastspace = (*from == ' '); + } + } + } + +=== 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 @@ + char OSISRuby::processText(SWBuf &text, const SWKey *key, const SWModule *module) { + SWBuf token; + bool intoken = false; +- bool lastspace = false; + + const SWBuf orig = text; + const char * from = orig.c_str(); +@@ -83,7 +82,6 @@ + } + else { + text.append(*from); +- lastspace = (*from == ' '); + } + } + } + +=== 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 @@ + char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) { + SWBuf token; + bool intoken = false; +- bool lastspace = false; + int wordNum = 1; + char wordstr[5]; + const char *wordStart = 0; +@@ -280,7 +279,6 @@ + } + else { + text.append(*from); +- lastspace = (*from == ' '); + } + } + 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 @@ + char token[2112]; // cheese. Fix. + int tokpos = 0; + bool intoken = false; +- bool lastspace = false; + int wordNum = 1; + char wordstr[5]; + SWBuf modName = (module)?module->Name():""; +@@ -186,7 +185,6 @@ + } + else { + text.append(*from); +- lastspace = (*from == ' '); + } + } + } + +=== 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 @@ + char token[2112]; // cheese. Fix. + int tokpos = 0; + bool intoken = false; +- bool lastspace = false; + int word = 1; + char val[128]; + char *valto; +@@ -166,14 +165,11 @@ + else strong << 1; + + SWModule *sLex = 0; +- SWModule *sMorph = 0; + if (gh == 'G') { + sLex = defaultGreekLex; +- sMorph = defaultGreekParse; + } + if (gh == 'H') { + sLex = defaultHebLex; +- sMorph = defaultHebParse; + } + SWBuf lexName = ""; + if (sLex) { +@@ -204,16 +200,6 @@ + textStr += lastAppendLen; + SWBuf spanStart = ""; + +- +- +-/* +- if (sMorph) { +- SWBuf popMorph = "<a onclick=\""; +- popMorph.appendFormatted("p(\'%s\',\'%s\','%s','');\" >%s</a>", sMorph->Name(), morph.c_str(), wordID.c_str(), morph.c_str()); +- morph = popMorph; +- } +-*/ +- + // 'p' = 'fillpop' to save bandwidth + const char *m = strchr(morph.c_str(), ':'); + if (m) m++; +@@ -237,7 +223,6 @@ + } + else { + text += *from; +- lastspace = (*from == ' '); + } + } + + +=== 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 @@ + char UTF8HTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) + { + unsigned char *from; +- int len; + char digit[10]; + unsigned long ch; + if ((unsigned long)key < 2) // hack, we're en(1)/de(0)ciphering + return (char)-1; + +- len = strlen(text.c_str()) + 2; // shift string to right of buffer +- + 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 @@ + { + unsigned char *from; + +- int len; + unsigned long uchar; + unsigned char significantFirstBits, subsequent; + + if ((unsigned long)key < 2) {// hack, we're en(1)/de(0)ciphering + return (char)-1; + } +- len = strlen(text.c_str()) + 1; // shift string to right of buffer + + 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 @@ + //3.Get the hostname part. This is the part from pos up to the first slash + bool checkPath = true; + bool checkParams = true; +- bool checkAnchor = true; + + end = strchr(urlPtr, '/'); + if (!end) { +@@ -145,7 +144,6 @@ + end = strchr(urlPtr, '#'); + } + if (!end) { +- checkAnchor = false; + end = urlPtr+strlen(urlPtr); + } + +@@ -160,7 +158,6 @@ + end = strchr(urlPtr, '#'); + } + if (!end) { +- checkAnchor = false; + end = urlPtr+strlen(urlPtr); + } + +@@ -174,14 +171,6 @@ + SWBuf paramName; + SWBuf paramValue; + +-/* +- end = strchr(urlPtr, '#'); +- if (!end) { +- checkAnchor = false; +- end = urlPtr+strlen(urlPtr); +- } +-*/ +- //end = (start && strchr(start, '?')) ? strchr(start, '?')+1 :0; + 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 @@ + const char* osisDoc = argv[2]; + int append = 0; + SWBuf compType = ""; +- bool isCommentary = false; + int iType = 4; + int entrySize = 0; + SWBuf cipherKey = ""; +@@ -1464,9 +1463,6 @@ + } + usage(*argv, "-s requires one of <2|4>"); + } +- else if (!strcmp(argv[i], "-C")) { +- isCommentary = true; +- } + else if (!strcmp(argv[i], "-d")) { + if (i+1 < argc) debug |= atoi(argv[++i]); + else usage(*argv, "-d requires <flags>"); + === added file 'debian/patches/17_gcc4.6_zlib.patch' --- debian/patches/17_gcc4.6_zlib.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/17_gcc4.6_zlib.patch 2011-08-06 20:29:21 +0000 @@ -0,0 +1,55 @@ +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; + === added file 'debian/patches/2631_fix_curl.patch' --- debian/patches/2631_fix_curl.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/2631_fix_curl.patch 2011-08-06 20:29:21 +0000 @@ -0,0 +1,30 @@ +Description: types.h is no longer part of cURL stable +Origin: commit, revision id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2631 +Author: chrislit +Last-Update: 2011-07-03 +X-Bzr-Revision-Id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2631 + +=== modified file 'src/mgr/curlftpt.cpp' +--- old/src/mgr/curlftpt.cpp 2010-03-20 11:49:54 +0000 ++++ new/src/mgr/curlftpt.cpp 2011-07-03 09:40:30 +0000 +@@ -26,7 +26,6 @@ + #include <fcntl.h> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> + +=== modified file 'src/mgr/curlhttpt.cpp' +--- old/src/mgr/curlhttpt.cpp 2009-10-21 23:46:40 +0000 ++++ new/src/mgr/curlhttpt.cpp 2011-07-03 09:40:30 +0000 +@@ -25,7 +25,6 @@ + #include <cctype> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> + === removed file 'debian/patches/daily.series' --- debian/patches/daily.series 2010-12-06 22:56:49 +0000 +++ debian/patches/daily.series 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -12_fix_compiler_warnings.diff -13_curl.diff -14_compiler_flags.diff === modified file 'debian/patches/series' --- debian/patches/series 2010-11-30 13:57:46 +0000 +++ debian/patches/series 2011-08-06 20:29:21 +0000 @@ -2,3 +2,6 @@ 13_curl.diff 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 2010-12-07 00:56:35 +0000 +++ debian/rules 2011-08-06 20:29:21 +0000 @@ -4,31 +4,17 @@ ver:=$(shell dpkg-parsechangelog | sed -nr "2s/Version: (.*)-.*/\1/p") bd :=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) py :=obj-$(bd)/bindings/swig/python -daily:=$(shell sed -n "1s/.*2010.*-.*/yes/p" debian/changelog) WFLAGS := -Wall -Werror -ifneq (,$(shell dpkg-buildflags --version)) CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(WFLAGS) CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) $(WFLAGS) -else - # 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 %: - dh $@ --with quilt + dh $@ override_dh_auto_configure: dh_auto_configure -Scmake -- \ -DLIBSWORD_LIBRARY_TYPE="Shared Static" \ - -DLIBSWORD_SOVERSION=9 \ + -DLIBSWORD_SOVERSION=8 \ -DCMAKE_BUILD_TYPE=NONE \ -DSWORD_BUILD_TESTS="Yes" \ -DSWORD_BINDINGS="Python" @@ -36,24 +22,26 @@ pod2man --release="SWORD $(ver)" --center "Sword Module Utilities" $< > $@ override_dh_auto_build: $(basename $(wildcard debian/man/*.pod)) dh_auto_build -Scmake --parallel - CFLAGS="$(CFLAGS) -Wno-error" dh_auto_configure -Spython_distutils -D$(py) - CFLAGS="$(CFLAGS) -Wno-error" dh_auto_build -Spython_distutils -D$(py) override_dh_auto_test: $(shell cd tests/testsuite && ./runall.sh 1>&2) override_dh_auto_install: dh_auto_install -Scmake + # if you do python-build in dh_auto_build, it will be rebuild again *sigh* + CFLAGS="$(CFLAGS) -Wno-error" dh_auto_configure -Spython_distutils -D$(py) + CFLAGS="$(CFLAGS) -Wno-error" dh_auto_build -Spython_distutils -D$(py) CFLAGS="$(CFLAGS) -Wno-error" dh_auto_install -Spython_distutils -D$(py) 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/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 \ + debian/libsword-dbg/usr/lib/debug/usr/lib/pymodules override_dh_makeshlibs: dh_makeshlibs -V override_dh_clean: - echo $(if $(ppa),"1.0","3.0 (quilt)") > debian/source/format - $(if $(daily),cp debian/patches/daily.series debian/patches/series) dh_clean $(patsubst %.pod, %, $(wildcard debian/man/*.pod)) MAKEFILE = $(firstword $(MAKEFILE_LIST)) === added file 'debian/source/format' --- debian/source/format 1970-01-01 00:00:00 +0000 +++ debian/source/format 2011-08-06 20:29:21 +0000 @@ -0,0 +1,1 @@ +3.0 (quilt)
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
