[Pkg-crosswire-commits] [sword] 02/03: Imported Debian patch 1.7.2+dfsg-1

Roberto C. Sanchez roberto at moszumanska.debian.org
Mon May 12 12:22:18 UTC 2014


This is an automated email from the git hooks/post-receive script.

roberto pushed a commit to branch master
in repository sword.

commit e08828aafb4a32ee52586e1696e4d16b426366f5
Merge: e2b4166 7a00574
Author: Dimitri John Ledkov <xnox at debian.org>
Date:   Sat Apr 19 15:05:09 2014 +0100

    Imported Debian patch 1.7.2+dfsg-1

 CMakeLists.txt                                     |   115 +-
 ChangeLog                                          |   289 +-
 INSTALL                                            |    38 +-
 Makefile.am                                        |     3 +-
 Makefile.in                                        |   487 +-
 README                                             |     6 +-
 aclocal.m4                                         |   828 +-
 bindings/CMakeLists.txt                            |     5 +
 bindings/Makefile                                  |     9 -
 bindings/Makefile.am                               |     7 -
 bindings/README                                    |    35 +
 bindings/autogen.sh                                |    23 -
 bindings/bcppmake/MainCLXTest.cpp                  |     7 +-
 bindings/bcppmake/MainCLXTest.h                    |    22 +
 bindings/bcppmake/MainTest.cpp                     |     7 +-
 bindings/bcppmake/MainTest.h                       |    22 +
 bindings/bcppmake/clxtest.cpp                      |     7 +-
 bindings/bcppmake/sword.c                          |     7 +-
 bindings/bcppmake/test.cpp                         |     7 +-
 bindings/configure.ac                              |   127 -
 bindings/corba/Makefile.am                         |     3 -
 bindings/corba/java/Makefile                       |     7 +-
 bindings/corba/java/Makefile.in                    |    43 -
 .../java/src/org/crosswire/sword/orb/SwordOrb.java |    23 +-
 bindings/corba/omniorbcpp/Makefile                 |     6 +-
 bindings/corba/omniorbcpp/server.cpp               |     9 +-
 bindings/corba/omniorbcpp/swordorb-impl.cpp        |   125 +-
 bindings/corba/omniorbcpp/swordorb-impl.hpp        |    14 +-
 bindings/corba/omniorbcpp/testclient.cpp           |    13 +-
 bindings/corba/orbitcpp/server.cpp                 |    11 +-
 bindings/corba/orbitcpp/swordorb-impl.cpp          |    62 +-
 bindings/corba/orbitcpp/swordorb-impl.hpp          |    15 +-
 bindings/corba/orbitcpp/testclient.cpp             |    13 +-
 bindings/corba/orbitcpp/webmgr.hpp                 |    23 +-
 bindings/corba/swordorb.idl                        |     7 +-
 bindings/flatapi.cpp                               |    55 +-
 bindings/gsoap/gsoapsword.cpp                      |    15 +-
 bindings/gsoap/gsoapsword.h                        |     9 +-
 bindings/gsoap/testclient.cpp                      |     9 +-
 bindings/java-jni/README                           |    20 +-
 bindings/java-jni/jni/Android.mk                   |    52 +-
 bindings/java-jni/jni/Application.mk               |     1 +
 bindings/java-jni/jni/swordstub.cpp                |   123 +-
 bindings/java-jni/jni/webmgr.hpp                   |    23 +-
 .../org/crosswire/android/sword/InstallMgr.java    |    22 +
 .../src/org/crosswire/android/sword/SWMgr.java     |    22 +
 .../src/org/crosswire/android/sword/SWModule.java  |    22 +
 bindings/objc/ObjCSword.h                          |     2 +-
 bindings/objc/ObjCSword.xcodeproj/project.pbxproj  |  6451 +++++++----
 bindings/objc/ObjCSword_Prefix.pch                 |     2 +-
 .../ObjCSword_preLion.xcodeproj/project.pbxproj    |  1060 ++
 bindings/objc/README                               |     9 +-
 bindings/objc/build_sword/Makefile                 |    25 -
 bindings/objc/build_sword/build_mac_sword.sh       |   159 +-
 .../objc/build_sword/build_ub_mac_swordutils.sh    |     7 +-
 bindings/objc/build_sword/readme.txt               |     9 +-
 bindings/objc/dependencies/retrieve.sh             |     8 +
 bindings/objc/dependencies/retrieve_iOS.sh         |     6 +
 bindings/objc/src/DefaultFilterProvider.h          |    37 +
 bindings/objc/src/DefaultFilterProvider.mm         |    44 +
 bindings/objc/src/FilterProviderFactory.h          |    24 +
 bindings/objc/src/FilterProviderFactory.mm         |    42 +
 bindings/objc/src/SwordBible.h                     |    17 +-
 bindings/objc/src/SwordBible.mm                    |   104 +-
 bindings/objc/src/SwordBibleBook.h                 |    22 +-
 bindings/objc/src/SwordBibleBook.mm                |    10 +-
 bindings/objc/src/SwordBibleChapter.h              |     2 +-
 bindings/objc/src/SwordBibleTextEntry.h            |     6 +-
 bindings/objc/src/SwordBibleTextEntry.m            |     4 +-
 bindings/objc/src/SwordBook.h                      |     8 +-
 bindings/objc/src/SwordBook.mm                     |    37 +-
 bindings/objc/src/SwordCommentary.h                |     6 +-
 bindings/objc/src/SwordCommentary.mm               |    13 +-
 bindings/objc/src/SwordDictionary.h                |     6 +-
 bindings/objc/src/SwordDictionary.mm               |    12 +-
 bindings/objc/src/SwordFilter.h                    |    61 +
 bindings/objc/src/SwordFilter.mm                   |   142 +
 bindings/objc/src/SwordInstallSource.h             |    23 +-
 bindings/objc/src/SwordInstallSource.mm            |    57 +-
 ...rceController.h => SwordInstallSourceManager.h} |    22 +-
 ...eController.mm => SwordInstallSourceManager.mm} |   138 +-
 bindings/objc/src/SwordKey.h                       |    18 +-
 bindings/objc/src/SwordKey.mm                      |    16 +-
 bindings/objc/src/SwordListKey.h                   |    25 +-
 bindings/objc/src/SwordListKey.mm                  |    37 +-
 bindings/objc/src/SwordLocaleManager.h             |    10 +-
 bindings/objc/src/SwordLocaleManager.mm            |    16 +-
 bindings/objc/src/SwordManager.h                   |    33 +-
 bindings/objc/src/SwordManager.mm                  |   181 +-
 bindings/objc/src/SwordModule+Index.h              |     2 +-
 bindings/objc/src/SwordModule.h                    |    91 +-
 bindings/objc/src/SwordModule.mm                   |   147 +-
 bindings/objc/src/SwordModuleTextEntry.h           |     2 +-
 bindings/objc/src/SwordModuleTreeEntry.h           |     2 +-
 bindings/objc/src/SwordUtil.h                      |    20 +
 bindings/objc/src/SwordUtil.m                      |    64 +
 bindings/objc/src/SwordVerseKey.h                  |    28 +-
 bindings/objc/src/SwordVerseKey.mm                 |    36 +-
 bindings/objc/src/SwordVerseManager.h              |    10 +-
 bindings/objc/src/SwordVerseManager.mm             |    14 +-
 bindings/objc/src/VerseEnumerator.h                |     2 +-
 bindings/objc/src/VerseEnumerator.mm               |     3 +-
 bindings/objc/src/services/Configuration.h         |     7 +-
 bindings/objc/src/services/Configuration.m         |    26 +-
 bindings/objc/src/services/OSXConfiguration.h      |     2 +-
 bindings/objc/src/services/iOSConfiguration.h      |    24 +
 bindings/objc/src/services/iOSConfiguration.m      |    38 +
 bindings/objc/test/SwordListKeyTest.m              |     4 +-
 bindings/objc/test/SwordManagerTest.m              |    12 +-
 bindings/objc/test/SwordModuleLongRunTest.mm       |    18 +-
 bindings/objc/test/SwordModuleTest.h               |     3 +-
 bindings/objc/test/SwordModuleTest.m               |    92 +-
 bindings/objc/test/Tests-Info.plist                |    22 +
 bindings/swig/CMakeLists.txt                       |    41 +
 bindings/swig/README                               |    26 +-
 bindings/swig/deprecations.i                       |    62 +
 bindings/swig/examples/av11n.py                    |   112 +
 bindings/swig/examples/mod2zmod.pl                 |    13 +-
 bindings/swig/ftptrans.i                           |     6 -
 bindings/swig/listkey.i                            |     7 +-
 bindings/swig/multimapwdef.i                       |    11 +
 bindings/swig/osishtmlhref.i                       |     2 -
 bindings/swig/package/Makefile.am                  |    40 +-
 bindings/swig/package/Makefile.in                  |   413 +-
 bindings/swig/package/README                       |    28 +
 bindings/swig/package/README.cvs                   |    10 -
 bindings/swig/package/aclocal.m4                   |  8724 +-------------
 bindings/swig/package/config.guess                 |   405 +-
 bindings/swig/package/config.sub                   |   279 +-
 bindings/swig/package/configure                    | 10440 ++++++++---------
 bindings/swig/package/configure.ac                 |    10 +-
 bindings/swig/package/depcomp                      |   531 +-
 bindings/swig/package/deprecations.i               |    62 +
 bindings/swig/package/ftptrans.i                   |     6 -
 bindings/swig/package/install-sh                   |    35 +-
 bindings/swig/package/listkey.i                    |     7 +-
 bindings/swig/package/ltmain.sh                    |  4017 ++++---
 {m4 => bindings/swig/package/m4}/libtool.m4        |  2256 ++--
 {m4 => bindings/swig/package/m4}/ltoptions.m4      |    32 +-
 bindings/swig/package/m4/ltsugar.m4                |   123 +
 {m4 => bindings/swig/package/m4}/ltversion.m4      |    12 +-
 {m4 => bindings/swig/package/m4}/lt~obsolete.m4    |    12 +-
 bindings/swig/package/missing                      |   461 +-
 bindings/swig/package/multimapwdef.i               |    11 +
 bindings/swig/package/osishtmlhref.i               |     2 -
 bindings/swig/package/perl.m4                      |     2 +-
 bindings/swig/package/php4.m4                      |     2 +-
 bindings/swig/package/python.m4                    |     2 +-
 bindings/swig/package/remotetrans.i                |     6 +
 bindings/swig/package/rendercallback.h             |     4 +-
 bindings/swig/package/swbuf.i                      |     2 +-
 bindings/swig/package/swig.m4                      |     2 +-
 bindings/swig/package/swkey.i                      |     6 +
 bindings/swig/package/swmodule.i                   |     4 +-
 bindings/swig/package/sword.i                      |    13 +-
 bindings/swig/package/sword.m4                     |     4 +-
 bindings/swig/package/tcl.m4                       |     2 +-
 bindings/swig/package/versekey.i                   |    23 +-
 bindings/swig/package/zlib.m4                      |     6 +-
 bindings/swig/perl/CMakeLists.txt                  |    68 +
 bindings/swig/perl/install.cmake                   |     3 +
 bindings/swig/python/CMakeLists.txt                |    58 +
 bindings/swig/python/install.cmake.in              |     4 +
 bindings/swig/remotetrans.i                        |     6 +
 bindings/swig/rendercallback.h                     |     4 +-
 bindings/swig/swbuf.i                              |     2 +-
 bindings/swig/swkey.i                              |     6 +
 bindings/swig/swmodule.i                           |     4 +-
 bindings/swig/sword.i                              |    13 +-
 bindings/swig/sword.pl                             |    42 +-
 bindings/swig/versekey.i                           |    23 +-
 bindings/swig/vstudio/libsword_csharpsword.vcproj  |    12 -
 buildtest.cpp                                      |    18 +-
 cmake/FindCLucene.cmake                            |    34 +-
 cmake/FindICU.cmake                                |    73 +-
 cmake/FindRegex.cmake                              |     6 +
 cmake/bindings.cmake                               |   135 -
 cmake/build-debug.sh                               |    24 +
 cmake/build-release.sh                             |    24 +
 cmake/install.cmake                                |    69 +-
 cmake/muxsources.cmake                             |    29 +-
 cmake/options.cmake                                |    52 +
 cmake/sources.cmake                                |    81 +-
 cmake/toolchains/Toolchain-mingw32.cmake           |    36 +
 cmake/toolchains/Toolchain-mingw64-x64.cmake       |    37 +
 cmake/toolchains/Toolchain-mingw64-x86.cmake       |    36 +
 config.guess                                       |   405 +-
 config.sub                                         |   279 +-
 configure                                          | 11481 +++++++++----------
 configure.ac                                       |   131 +-
 debian/changelog                                   |    12 +-
 debian/compat                                      |     2 +-
 debian/control                                     |    18 +-
 debian/{libsword9.docs => libsword10.docs}         |     1 -
 debian/libsword10.install                          |     1 +
 debian/libsword9.install                           |     2 -
 debian/patches/12_fix_compiler_warnings.diff       |   268 +-
 debian/patches/13_curl.diff                        |     2 +-
 debian/patches/dso-missing-shared.patch            |     6 +-
 debian/patches/no-included-zconf.h.diff            |    10 +-
 debian/patches/series                              |    14 +-
 debian/rules                                       |     2 +-
 debian/source/local-options                        |     1 -
 debian/source/options                              |     2 -
 depcomp                                            |   531 +-
 doc/Doxyfile                                       |     2 +-
 doc/Makefile.am                                    |     1 -
 doc/README                                         |     5 +-
 doc/greektrans.txt                                 |    81 -
 examples/Makefile.in                               |   314 +-
 examples/classes/Makefile                          |     4 +-
 examples/classes/README                            |     4 +
 examples/classes/ciphercng.cpp                     |    19 +-
 examples/classes/lastVerseInChapter.cpp            |    56 +
 examples/{simple.cpp => classes/showchapter.cpp}   |    46 +-
 examples/classes/swmgrex.cpp                       |    44 +-
 examples/{simple.cpp => classes/verseposition.cpp} |    46 +-
 examples/classes/verseranges.cpp                   |   127 +
 examples/cmdline/CMakeLists.txt                    |     1 +
 examples/cmdline/Makefile.am                       |     4 +-
 examples/cmdline/Makefile.in                       |   295 +-
 examples/cmdline/listoptions.cpp                   |    22 +-
 examples/cmdline/lookup.cpp                        |    32 +-
 examples/cmdline/outplain.cpp                      |    48 +-
 examples/cmdline/outrender.cpp                     |    42 +-
 examples/cmdline/search.cpp                        |    40 +-
 examples/cmdline/threaded_search.cpp               |    22 +-
 examples/cmdline/verserangeparse.cpp               |    48 +-
 examples/simple.cpp                                |    11 +-
 icu/Makefile.am                                    |    55 -
 icu/Makefile.in                                    |   477 -
 icu/translit_Any_Latex.txt                         |    78 -
 icu/translit_Any_Latin1.txt                        |    89 -
 icu/translit_BETA_Greek.txt                        |   119 -
 icu/translit_BGreek_Greek.txt                      |   155 -
 icu/translit_CCAT_Hebrew.txt                       |   200 -
 icu/translit_CCAT_Syriac.txt                       |    87 -
 icu/translit_Latin_Coptic.txt                      |   129 -
 icu/translit_Latin_Gothic.txt                      |    57 -
 icu/translit_Latin_Ugaritic.txt                    |    63 -
 icu/translit_swordindex.txt                        |    83 -
 include/Greek2Greek.h                              |   117 -
 include/GreekChars.h                               |   154 -
 include/Makefile.am                                |    27 +-
 include/SwordAPI.pas                               |     8 +-
 include/{zipcomprs.h => bz2comprs.h}               |    18 +-
 include/canon.h                                    |   201 +-
 include/canon_abbrevs.h                            |    18 +-
 include/canon_catholic.h                           |   186 +-
 include/canon_catholic2.h                          |   189 +-
 include/canon_german.h                             |   164 +-
 include/canon_kjva.h                               |   192 +-
 include/canon_leningrad.h                          |   129 +-
 include/canon_luther.h                             |   186 +-
 include/canon_lxx.h                                |   403 +
 include/canon_mt.h                                 |   129 +-
 include/canon_nrsv.h                               |   164 +-
 include/canon_nrsva.h                              |   196 +-
 include/canon_null.h                               |     7 +-
 include/canon_orthodox.h                           |   370 +
 include/canon_synodal.h                            |   198 +-
 include/canon_synodalp.h                           |   173 -
 include/canon_synodalprot.h                        |   316 +
 include/canon_vulg.h                               |   192 +-
 include/cipherfil.h                                |     6 +-
 include/config.h                                   |    84 -
 include/config.h.in                                |     3 +
 include/curlftpt.h                                 |    51 +-
 include/curlhttpt.h                                |    51 +-
 include/defs.h                                     |    53 +-
 include/echomod.h                                  |    11 +-
 include/encfiltmgr.h                               |    12 +-
 include/entriesblk.h                               |    22 +
 include/femain.h                                   |     8 +-
 include/filemgr.h                                  |    39 +-
 include/flatapi.h                                  |     8 +-
 include/ftplib.h                                   |    43 +-
 include/ftplibftpt.h                               |    53 +-
 include/gbffootnotes.h                             |     6 +-
 include/gbfheadings.h                              |     6 +-
 include/gbfhtml.h                                  |     6 +-
 include/gbfhtmlhref.h                              |     8 +-
 include/gbfmorph.h                                 |     6 +-
 include/gbfosis.h                                  |     6 +-
 include/gbfplain.h                                 |     6 +-
 include/gbfredletterwords.h                        |     6 +-
 include/gbfrtf.h                                   |     6 +-
 include/gbfstrongs.h                               |     6 +-
 include/gbfthml.h                                  |     6 +-
 include/gbfwebif.h                                 |    12 +-
 include/gbfwordjs.h                                |     6 +-
 include/{gbfhtmlhref.h => gbfxhtml.h}              |    19 +-
 include/greeklexattribs.h                          |     6 +-
 include/hebrewmcim.h                               |    22 +
 include/hrefcom.h                                  |    13 +-
 include/installmgr.h                               |    40 +-
 include/latin1utf16.h                              |     6 +-
 include/latin1utf8.h                               |     6 +-
 include/listkey.h                                  |    50 +-
 include/localemgr.h                                |     9 +-
 include/lzsscomprs.h                               |    61 +-
 include/markupfiltmgr.h                            |     9 +-
 include/multimapwdef.h                             |    36 +-
 include/nullim.h                                   |    22 +
 include/{osisruby.h => osisenum.h}                 |    78 +-
 include/osisfootnotes.h                            |     6 +-
 include/{osislemma.h => osisglosses.h}             |    16 +-
 include/osisheadings.h                             |    13 +-
 include/osishtmlhref.h                             |     8 +-
 include/osislemma.h                                |     6 +-
 include/osismorph.h                                |     6 +-
 include/osismorphsegmentation.h                    |     6 +-
 include/osisosis.h                                 |     6 +-
 include/osisplain.h                                |     6 +-
 include/osisredletterwords.h                       |     6 +-
 include/osisreferencelinks.h                       |    55 +
 include/osisrtf.h                                  |     6 +-
 include/osisscripref.h                             |     6 +-
 include/osisstrongs.h                              |     6 +-
 include/osisvariants.h                             |    20 +-
 include/osiswebif.h                                |    11 +-
 include/osiswordjs.h                               |     6 +-
 include/{osishtmlhref.h => osisxhtml.h}            |    42 +-
 include/{osislemma.h => osisxlit.h}                |    16 +-
 include/papyriplain.h                              |    10 +-
 include/plainfootnotes.h                           |    41 -
 include/plainhtml.h                                |    38 -
 include/rawcom.h                                   |    13 +-
 include/rawcom4.h                                  |    13 +-
 include/rawfiles.h                                 |    15 +-
 include/rawgenbook.h                               |    16 +-
 include/rawld.h                                    |    17 +-
 include/rawld4.h                                   |    17 +-
 include/rawstr.h                                   |    18 +-
 include/rawstr4.h                                  |    18 +-
 include/rawtext.h                                  |    13 +-
 include/rawtext4.h                                 |    14 +-
 include/rawverse.h                                 |    22 +-
 include/rawverse4.h                                |    29 +-
 include/{ftptrans.h => remotetrans.h}              |    58 +-
 include/roman.h                                    |     7 +-
 include/rtfhtml.h                                  |     6 +-
 include/sapphire.h                                 |    53 +-
 include/{thmlgbf.h => scsuutf8.h}                  |    22 +-
 include/stringmgr.h                                |    11 +-
 include/strkey.h                                   |     7 +-
 include/swbasicfilter.h                            |    15 +-
 include/swbuf.h                                    |    79 +-
 include/swcacher.h                                 |    10 +-
 include/swcipher.h                                 |     8 +-
 include/swcom.h                                    |    39 +-
 include/swcomprs.h                                 |     8 +-
 include/swconfig.h                                 |     9 +-
 include/swdisp.h                                   |    12 +-
 include/swfilter.h                                 |    18 +-
 include/swfiltermgr.h                              |     9 +-
 include/swgenbook.h                                |    43 +-
 include/swinputmeth.h                              |    27 +-
 include/swkey.h                                    |    40 +-
 include/swld.h                                     |    18 +-
 include/swlocale.h                                 |     9 +-
 include/swlog.h                                    |     7 +-
 include/swmacs.h                                   |     7 +-
 include/swmgr.h                                    |    37 +-
 include/swmodule.h                                 |   222 +-
 include/swobject.h                                 |    43 +-
 include/swoptfilter.h                              |    13 +-
 include/swsearchable.h                             |     9 +-
 include/swtext.h                                   |    15 +-
 include/swunicod.h                                 |    43 -
 include/swversion.h                                |    15 +-
 include/{swversion.h => swversion.h.in}            |    15 +-
 include/sysdata.h                                  |    34 +-
 include/teihtmlhref.h                              |     8 +-
 include/teiplain.h                                 |     6 +-
 include/teirtf.h                                   |     6 +-
 include/{teihtmlhref.h => teixhtml.h}              |    18 +-
 include/thmlfootnotes.h                            |     6 +-
 include/thmlgbf.h                                  |     6 +-
 include/thmlheadings.h                             |     6 +-
 include/thmlhtml.h                                 |     6 +-
 include/thmlhtmlhref.h                             |     8 +-
 include/thmllemma.h                                |     6 +-
 include/thmlmorph.h                                |     6 +-
 include/thmlosis.h                                 |     6 +-
 include/thmlplain.h                                |     6 +-
 include/thmlrtf.h                                  |     6 +-
 include/thmlscripref.h                             |     6 +-
 include/thmlstrongs.h                              |     6 +-
 include/thmlvariants.h                             |    21 +-
 include/thmlwebif.h                                |    14 +-
 include/thmlwordjs.h                               |     6 +-
 include/{thmlhtmlhref.h => thmlxhtml.h}            |    23 +-
 include/treekey.h                                  |    11 +-
 include/treekeyidx.h                               |     7 +-
 include/unicodertf.h                               |     6 +-
 include/url.h                                      |    39 +-
 include/utf16utf8.h                                |     6 +-
 include/utf8arabicpoints.h                         |     7 +-
 include/utf8arshaping.h                            |     6 +-
 include/utf8bidireorder.h                          |     6 +-
 include/utf8cantillation.h                         |     6 +-
 include/utf8greekaccents.h                         |     6 +-
 include/utf8hebrewpoints.h                         |     6 +-
 include/utf8html.h                                 |     6 +-
 include/utf8latin1.h                               |     6 +-
 include/utf8nfc.h                                  |     6 +-
 include/utf8nfkd.h                                 |     6 +-
 include/utf8transliterator.h                       |    19 +-
 include/utf8utf16.h                                |     6 +-
 include/utilstr.h                                  |    35 +-
 include/utilxml.h                                  |    10 +-
 include/versekey.h                                 |   203 +-
 include/versetreekey.h                             |    12 +-
 include/{versemgr.h => versificationmgr.h}         |    27 +-
 include/{zipcomprs.h => xzcomprs.h}                |    18 +-
 include/zcom.h                                     |    15 +-
 include/zipcomprs.h                                |     8 +-
 include/zld.h                                      |    20 +-
 include/zstr.h                                     |    31 +-
 include/ztext.h                                    |    15 +-
 include/zverse.h                                   |    37 +-
 install-sh                                         |    35 +-
 lib/Makefile.in                                    |  2011 ++--
 lib/bcppmake/libsword.bdsproj                      |     1 -
 lib/bcppmake/libsword.bpf                          |    30 +-
 lib/bcppmake/libsword.bpr                          |    79 +-
 lib/vcppmake/libsword.sln                          |    20 +
 lib/vcppmake/libsword.vcxproj                      |   479 +
 lib/vcppmake/vc8/libsword.vcproj                   |  7024 ------------
 locales.d/ar-utf8.conf                             |   141 +
 locales.d/{bg_BG-utf8.conf => bg-utf8.conf}        |     0
 locales.d/de-utf8.conf                             |     3 +
 locales.d/fo-utf8.conf                             |   199 +
 locales.d/fr-utf8.conf                             |     9 +-
 locales.d/fr.conf                                  |     9 +-
 locales.d/iu-utf8.conf                             |   292 +
 locales.d/locales.conf                             |  1301 +--
 locales.d/pon_utf8.conf                            |   151 +
 locales.d/{ru_RU-utf8.conf => ru-utf8.conf}        |   124 +-
 locales.d/ru_RU-utf8.conf                          |   122 +
 locales.d/{uk_UA-utf8.conf => uk-utf8.conf}        |     0
 ltmain.sh                                          |  4017 ++++---
 m4/acx_clucene.m4                                  |     2 +-
 m4/colored-echo.m4                                 |    75 -
 m4/libtool.m4                                      |  2256 ++--
 m4/ltoptions.m4                                    |    32 +-
 m4/ltversion.m4                                    |    12 +-
 m4/lt~obsolete.m4                                  |    12 +-
 missing                                            |   461 +-
 olb/Convert.bpr                                    |   116 -
 olb/Convert.cpp                                    |    44 -
 olb/Doinit.c                                       |   149 -
 olb/Getstrng.c                                     |    43 -
 olb/Getvrsn.c                                      |    67 -
 olb/Mainfrm.cpp                                    |   327 -
 olb/Mainfrm.dfm                                    |   Bin 897 -> 0 bytes
 olb/Mainfrm.h                                      |    69 -
 olb/Online.c                                       |   114 -
 olb/addstrongs.cpp                                 |   118 -
 olb/dumpav.cpp                                     |    46 -
 olb/olb.bpg                                        |    26 -
 olb/olb2sword.bpr                                  |   112 -
 olb/olb2sword.cpp                                  |   312 -
 olb/online.ide                                     |   Bin 40902 -> 0 bytes
 olb/online.prj                                     |     1 -
 olb/prn2sword.bpr                                  |   123 -
 olb/prn2sword.cpp                                  |    49 -
 olb/prn2swordfrm.cpp                               |   501 -
 olb/prn2swordfrm.dfm                               |   Bin 2540 -> 0 bytes
 olb/prn2swordfrm.h                                 |    54 -
 samples/mods.conf.large                            |   466 -
 samples/mods.conf.small                            |   144 -
 samples/mods.d/rwp.conf                            |    23 -
 samples/mods.d/strongsnt.conf                      |     6 -
 samples/mods.d/strongsot.conf                      |     6 -
 samples/mods.d/vines.conf                          |    18 -
 samples/mods.d/web.conf                            |    17 -
 samples/mods.d/websters.conf                       |    61 -
 scripts/burncd                                     |     1 -
 scripts/demotar                                    |     1 -
 scripts/disttar                                    |     7 -
 scripts/dlltar                                     |     1 -
 scripts/eastonstar                                 |     1 -
 scripts/mhctar                                     |     1 -
 scripts/mkcd                                       |     6 -
 scripts/mkswordbase                                |     2 +
 scripts/mkswordbase2                               |     2 +
 scripts/mkswordtar                                 |     4 +-
 scripts/svetar                                     |     1 -
 scripts/swordenv                                   |     1 -
 scripts/swtxtdsp.bat                               |     2 -
 scripts/vinestar                                   |     1 -
 scripts/webtar                                     |     1 -
 src/frontend/X11/Makefile                          |     5 -
 src/frontend/framework/femain.cpp                  |    11 +-
 src/frontend/im/hebrewmcim.cpp                     |    24 +-
 src/frontend/im/nullim.cpp                         |     9 +-
 src/frontend/im/swinputmeth.cpp                    |    21 +-
 src/frontend/swdisp.cpp                            |    20 +-
 src/frontend/swlog.cpp                             |    13 +-
 src/frontend/windoze/Makefile                      |     5 -
 src/keys/listkey.cpp                               |    75 +-
 src/keys/nt.bks                                    |   Bin 112 -> 0 bytes
 src/keys/nt.cps                                    |   Bin 1152 -> 0 bytes
 src/keys/ot.bks                                    |   Bin 160 -> 0 bytes
 src/keys/ot.cps                                    |   Bin 3876 -> 0 bytes
 src/keys/strkey.cpp                                |    10 +-
 src/keys/swkey.cpp                                 |    24 +-
 src/keys/treekey.cpp                               |     8 +-
 src/keys/treekeyidx.cpp                            |    12 +-
 src/keys/versekey.cpp                              |   772 +-
 src/keys/versetreekey.cpp                          |    50 +-
 src/mgr/Makefile.am                                |     4 +-
 src/mgr/curlftpt.cpp                               |   150 +-
 src/mgr/curlhttpt.cpp                              |   142 +-
 src/mgr/encfiltmgr.cpp                             |   150 +-
 src/mgr/filemgr.cpp                                |    19 +-
 src/mgr/ftplibftpt.cpp                             |   126 +-
 src/mgr/installmgr.cpp                             |   118 +-
 src/mgr/localemgr.cpp                              |    17 +-
 src/mgr/markupfiltmgr.cpp                          |   442 +-
 src/mgr/{ftptrans.cpp => remotetrans.cpp}          |    65 +-
 src/mgr/stringmgr.cpp                              |   125 +-
 src/mgr/swcacher.cpp                               |    13 +-
 src/mgr/swconfig.cpp                               |    14 +-
 src/mgr/swfiltermgr.cpp                            |    12 +-
 src/mgr/swlocale.cpp                               |    24 +-
 src/mgr/swmgr.cpp                                  |   179 +-
 src/mgr/swsearchable.cpp                           |    17 +-
 src/mgr/{versemgr.cpp => versificationmgr.cpp}     |   145 +-
 src/modules/comments/hrefcom/hrefcom.cpp           |    14 +-
 src/modules/comments/rawcom/rawcom.cpp             |    39 +-
 src/modules/comments/rawcom4/Makefile              |     5 +
 src/modules/comments/rawcom4/rawcom4.cpp           |    39 +-
 src/modules/comments/rawfiles/rawfiles.cpp         |    58 +-
 src/modules/comments/swcom.cpp                     |    30 +-
 src/modules/comments/zcom/zcom.cpp                 |    47 +-
 src/modules/common/Makefile.am                     |     4 +-
 .../common/{zipcomprs.cpp => bz2comprs.cpp}        |    48 +-
 src/modules/common/compress.cpp.txt                |   767 --
 src/modules/common/entriesblk.cpp                  |     9 +-
 src/modules/common/lzsscomprs.cpp                  |   120 +-
 .../common/{swcomprs.doc => lzsscomprs.txt}        |     0
 src/modules/common/rawstr.cpp                      |    22 +-
 src/modules/common/rawstr4.cpp                     |    24 +-
 src/modules/common/rawverse.cpp                    |    13 +-
 src/modules/common/rawverse4.cpp                   |    17 +-
 src/modules/common/sapphire.cpp                    |    48 +-
 src/modules/common/swcipher.cpp                    |     8 +-
 src/modules/common/swcomprs.cpp                    |     7 +-
 src/modules/common/{zipcomprs.cpp => xzcomprs.cpp} |    48 +-
 src/modules/common/zipcomprs.cpp                   |     8 +-
 src/modules/common/zstr.cpp                        |    27 +-
 src/modules/common/zverse.cpp                      |    38 +-
 src/modules/filters/Makefile.am                    |    14 +-
 src/modules/filters/cipherfil.cpp                  |    11 +-
 src/modules/filters/gbffootnotes.cpp               |    28 +-
 src/modules/filters/gbfheadings.cpp                |    29 +-
 src/modules/filters/gbfhtml.cpp                    |    12 +-
 src/modules/filters/gbfhtmlhref.cpp                |    22 +-
 src/modules/filters/gbfmorph.cpp                   |    26 +-
 src/modules/filters/gbfosis.cpp                    |    22 +-
 src/modules/filters/gbfplain.cpp                   |    11 +-
 src/modules/filters/gbfredletterwords.cpp          |    26 +-
 src/modules/filters/gbfrtf.cpp                     |     7 +-
 src/modules/filters/gbfstrongs.cpp                 |    26 +-
 src/modules/filters/gbfthml.cpp                    |    13 +-
 src/modules/filters/gbfwebif.cpp                   |    17 +-
 src/modules/filters/gbfwordjs.cpp                  |    43 +-
 .../filters/{gbfhtmlhref.cpp => gbfxhtml.cpp}      |   111 +-
 src/modules/filters/greeklexattribs.cpp            |     7 +-
 src/modules/filters/latin1utf16.cpp                |     7 +-
 src/modules/filters/latin1utf8.cpp                 |    12 +-
 src/modules/filters/{osisruby.cpp => osisenum.cpp} |   192 +-
 src/modules/filters/osisfootnotes.cpp              |    29 +-
 .../filters/{osisruby.cpp => osisglosses.cpp}      |   192 +-
 src/modules/filters/osisheadings.cpp               |   228 +-
 src/modules/filters/osishtmlhref.cpp               |   157 +-
 src/modules/filters/osislemma.cpp                  |    28 +-
 src/modules/filters/osismorph.cpp                  |    27 +-
 src/modules/filters/osismorphsegmentation.cpp      |    27 +-
 src/modules/filters/osisosis.cpp                   |    24 +-
 src/modules/filters/osisplain.cpp                  |    64 +-
 src/modules/filters/osisredletterwords.cpp         |    25 +-
 src/modules/filters/osisreferencelinks.cpp         |   114 +
 src/modules/filters/osisrtf.cpp                    |    25 +-
 src/modules/filters/osisscripref.cpp               |    26 +-
 src/modules/filters/osisstrongs.cpp                |    29 +-
 src/modules/filters/osisvariants.cpp               |    82 +-
 src/modules/filters/osiswebif.cpp                  |    60 +-
 src/modules/filters/osiswordjs.cpp                 |    34 +-
 .../filters/{osishtmlhref.cpp => osisxhtml.cpp}    |   410 +-
 src/modules/filters/{osisruby.cpp => osisxlit.cpp} |   192 +-
 src/modules/filters/papyriplain.cpp                |     6 +-
 src/modules/filters/plainfootnotes.cpp             |    85 -
 src/modules/filters/plainhtml.cpp                  |    89 -
 src/modules/filters/rtfhtml.cpp                    |    38 +-
 src/modules/filters/scsuutf8.cpp                   |   246 +
 src/modules/filters/swbasicfilter.cpp              |    28 +-
 src/modules/filters/swoptfilter.cpp                |     9 +-
 src/modules/filters/teihtmlhref.cpp                |    22 +-
 src/modules/filters/teiplain.cpp                   |    10 +-
 src/modules/filters/teirtf.cpp                     |   416 +-
 .../filters/{teihtmlhref.cpp => teixhtml.cpp}      |    34 +-
 src/modules/filters/thmlfootnotes.cpp              |    30 +-
 src/modules/filters/thmlgbf.cpp                    |     9 +-
 src/modules/filters/thmlheadings.cpp               |    26 +-
 src/modules/filters/thmlhtml.cpp                   |    11 +-
 src/modules/filters/thmlhtmlhref.cpp               |    34 +-
 src/modules/filters/thmllemma.cpp                  |    26 +-
 src/modules/filters/thmlmorph.cpp                  |    25 +-
 src/modules/filters/thmlosis.cpp                   |    22 +-
 src/modules/filters/thmlplain.cpp                  |     7 +-
 src/modules/filters/thmlrtf.cpp                    |    17 +-
 src/modules/filters/thmlscripref.cpp               |    32 +-
 src/modules/filters/thmlstrongs.cpp                |    26 +-
 src/modules/filters/thmlvariants.cpp               |    59 +-
 src/modules/filters/thmlwebif.cpp                  |    14 +-
 src/modules/filters/thmlwordjs.cpp                 |    43 +-
 .../filters/{thmlhtmlhref.cpp => thmlxhtml.cpp}    |    49 +-
 src/modules/filters/unicodertf.cpp                 |     6 +-
 src/modules/filters/utf16utf8.cpp                  |    10 +-
 src/modules/filters/utf8arabicpoints.cpp           |   174 +-
 src/modules/filters/utf8arshaping.cpp              |     9 +-
 src/modules/filters/utf8bidireorder.cpp            |    15 +-
 src/modules/filters/utf8cantillation.cpp           |    26 +-
 src/modules/filters/utf8greekaccents.cpp           |    29 +-
 src/modules/filters/utf8hebrewpoints.cpp           |    30 +-
 src/modules/filters/utf8html.cpp                   |    14 +-
 src/modules/filters/utf8latin1.cpp                 |    11 +-
 src/modules/filters/utf8nfc.cpp                    |     7 +-
 src/modules/filters/utf8nfkd.cpp                   |    12 +-
 src/modules/filters/utf8transliterator.cpp         |   126 +-
 src/modules/filters/utf8utf16.cpp                  |     8 +-
 src/modules/genbook/rawgenbook/rawgenbook.cpp      |    22 +-
 src/modules/genbook/swgenbook.cpp                  |    17 +-
 src/modules/lexdict/rawld/rawld.cpp                |    28 +-
 src/modules/lexdict/rawld4/rawld4.cpp              |    27 +-
 src/modules/lexdict/swld.cpp                       |    30 +-
 src/modules/lexdict/zld/zld.cpp                    |    28 +-
 src/modules/readme                                 |     9 -
 src/modules/swmodule.cpp                           |   454 +-
 src/modules/tests/echomod.cpp                      |    10 +-
 src/modules/texts/rawtext/rawtext.cpp              |    49 +-
 src/modules/texts/rawtext4/Makefile                |     5 +
 src/modules/texts/rawtext4/rawtext4.cpp            |    54 +-
 src/modules/texts/swtext.cpp                       |    31 +-
 src/modules/texts/ztext/ztext.cpp                  |    59 +-
 src/utilfuns/Makefile.am                           |     1 -
 src/utilfuns/ftplib.c                              |    63 +-
 src/utilfuns/roman.cpp                             |    13 +-
 src/utilfuns/swbuf.cpp                             |    50 +-
 src/utilfuns/swobject.cpp                          |    45 +-
 src/utilfuns/swunicod.cpp                          |   138 -
 src/utilfuns/swversion.cpp                         |    18 +-
 src/utilfuns/url.cpp                               |    90 +-
 src/utilfuns/utilstr.cpp                           |   217 +-
 src/utilfuns/utilxml.cpp                           |    18 +-
 src/utilfuns/zlib/untgz.c                          |    27 +-
 sword.kdevprj                                      |    16 +-
 sword.pc.in                                        |     2 +-
 test-driver                                        |   127 +
 tests/CMakeLists.txt                               |     3 +
 tests/Makefile.am                                  |    17 +-
 tests/Makefile.in                                  |   576 +-
 tests/{modtest.cpp => bibliotest.cpp}              |    27 +-
 tests/casttest.cpp                                 |     9 +-
 tests/ciphertest.cpp                               |    11 +-
 tests/complzss.cpp                                 |     9 +-
 tests/compnone.cpp                                 |     9 +-
 tests/compzip.cpp                                  |     9 +-
 tests/configtest.cpp                               |     9 +-
 tests/cppunit/Makefile.in                          |   782 +-
 tests/cppunit/main.cpp                             |     6 +-
 tests/cppunit/stringmgr_test.cpp                   |     9 +-
 tests/cppunit/swbuf_test.cpp                       |     9 +-
 tests/cppunit/url_test.cpp                         |     9 +-
 tests/cppunit/versekey_test.cpp                    |     9 +-
 tests/filtertest.cpp                               |    22 +-
 tests/icutest.cpp                                  |     9 +-
 tests/indextest.cpp                                |    15 +-
 tests/installmgrtest.cpp                           |    10 +-
 tests/introtest.cpp                                |   111 +-
 tests/keycast.cpp                                  |     9 +-
 tests/keytest.cpp                                  |    71 +-
 tests/lextest.cpp                                  |     9 +-
 tests/listtest.cpp                                 |    37 +-
 tests/localetest.cpp                               |    13 +-
 tests/mgrtest.cpp                                  |    21 +-
 tests/modtest.cpp                                  |    17 +-
 tests/osistest.cpp                                 |   111 +
 tests/outputcps.cpp                                |     9 +-
 tests/parsekey.cpp                                 |    31 +-
 tests/rawldidxtest.cpp                             |     9 +-
 tests/refsystest.cpp                               |     9 +-
 tests/romantest.cpp                                |     9 +-
 tests/striptest.cpp                                |    30 +-
 tests/swaptest.cpp                                 |     9 +-
 tests/swbuftest.cpp                                |    34 +-
 tests/testblocks.cpp                               |     9 +-
 tests/testsuite/osis.good                          |   106 +
 tests/testsuite/osis.sh                            |    26 +
 tests/testsuite/osisReference.xml                  |   183 +
 tests/testsuite/sword.conf                         |     2 +
 tests/testsuite/versekeytest.good                  |    15 +
 tests/testsuite/verseparsing.good                  |    15 +-
 tests/testsuite/verseparsing.sh                    |    19 +-
 tests/tlitmgrtest.cpp                              |     9 +-
 tests/translittest.cpp                             |     9 +-
 tests/utf8norm.cpp                                 |    22 +
 tests/versekeytest.cpp                             |   108 +-
 tests/versemgrtest.cpp                             |    17 +-
 tests/vtreekeytest.cpp                             |    29 +-
 tests/webiftest.cpp                                |    13 +-
 tests/xmltest.cpp                                  |     9 +-
 usrinst.sh                                         |    19 +-
 utilities/CMakeLists.txt                           |     4 +-
 utilities/Makefile.am                              |    12 +-
 utilities/Makefile.in                              |   577 +-
 utilities/addcomment.cpp                           |     9 +-
 utilities/addgb.cpp                                |    12 +-
 utilities/addld.cpp                                |    33 +-
 utilities/addvs.cpp                                |    60 +-
 utilities/bcppmake/addgb.bpr                       |     2 +-
 utilities/bcppmake/addld.bpr                       |     2 +-
 utilities/bcppmake/addvs.bpr                       |     2 +-
 utilities/bcppmake/diatheke.bpr                    |    11 +-
 utilities/bcppmake/tei2mod.bpr                     |     2 +-
 utilities/bcppmake/treeidxutil.bpr                 |     2 +-
 utilities/bcppmake/utilities.bpg                   |     7 +-
 utilities/bcppmake/vs2osisreftxt.bpr               |     2 +-
 utilities/cipherraw.cpp                            |    35 +-
 utilities/diatheke/Makefile.in                     |   283 +-
 utilities/diatheke/README                          |    29 +-
 utilities/diatheke/cgi/dia-def.pl                  |    36 +-
 utilities/diatheke/cgi/diatheke.pl                 |    35 +-
 utilities/diatheke/corediatheke.cpp                |   216 +-
 utilities/diatheke/corediatheke.h                  |    56 +-
 utilities/diatheke/diafiltmgr.cpp                  |    46 +-
 utilities/diatheke/diafiltmgr.h                    |     7 +-
 utilities/diatheke/diatheke.cpp                    |    66 +-
 utilities/diatheke/diatheke.sln                    |    20 +
 utilities/diatheke/diatheke.vcproj                 |   709 --
 utilities/diatheke/diatheke.vcxproj                |   198 +
 utilities/diatheke/diathekemgr.cpp                 |    15 +-
 utilities/diatheke/diathekemgr.h                   |     9 +-
 utilities/diatheke/gbfcgi.cpp                      |    34 +-
 utilities/diatheke/gbfcgi.h                        |    17 +-
 utilities/diatheke/osiscgi.cpp                     |     9 +-
 utilities/diatheke/osiscgi.h                       |     9 +-
 utilities/diatheke/soap/sapouni.cgi                |     8 +-
 utilities/diatheke/soap/soapatheke.pl              |    38 +-
 utilities/diatheke/tcl/makebooklist.pl             |   223 +-
 utilities/diatheke/thmlcgi.cpp                     |    55 +-
 utilities/diatheke/thmlcgi.h                       |    17 +-
 utilities/emptyvss.cpp                             |    21 +-
 utilities/gbfidx.cpp                               |    36 +-
 {src/keys => utilities}/genarray.c                 |     9 +-
 utilities/genbookutil.cpp                          |    13 +-
 utilities/imp2gbs.cpp                              |    11 +-
 utilities/imp2ld.cpp                               |   193 +-
 utilities/imp2vs.cpp                               |    40 +-
 utilities/installmgr.cpp                           |    41 +-
 utilities/kylixmake/libsword.bpr                   |     3 +-
 utilities/lexdump.c                                |    11 +-
 utilities/mkfastmod.cpp                            |    13 +-
 utilities/mod2imp.cpp                              |    17 +-
 utilities/mod2osis.cpp                             |    73 +-
 utilities/mod2vpl.cpp                              |    17 +-
 utilities/mod2zmod.cpp                             |    34 +-
 utilities/modwrite.cpp                             |     9 +-
 utilities/no13.c                                   |     7 +-
 utilities/osis2mod.cpp                             |   287 +-
 utilities/perl/cipherkeygen.pl                     |    12 +-
 utilities/perl/linkvers.pl                         |     7 +-
 utilities/perl/localecap.pl                        |     6 +-
 utilities/perl/mkvsmod.pl                          |    38 +-
 utilities/step2vpl.cpp                             |     9 +-
 utilities/stepdump.cpp                             |     9 +-
 utilities/sub.c                                    |    12 +-
 utilities/tei2mod.cpp                              |    56 +-
 utilities/treeidxutil.cpp                          |    11 +-
 utilities/vcppmake/addgb.vcproj                    |   194 -
 utilities/vcppmake/addgb.vcxproj                   |   117 +
 utilities/vcppmake/addld.vcproj                    |   194 -
 utilities/vcppmake/addld.vcxproj                   |   117 +
 utilities/vcppmake/addvs.vcproj                    |   194 -
 utilities/vcppmake/addvs.vcxproj                   |   117 +
 utilities/vcppmake/cipherraw.vcproj                |   194 -
 utilities/vcppmake/cipherraw.vcxproj               |   117 +
 utilities/vcppmake/emptyvss.vcproj                 |   194 -
 utilities/vcppmake/emptyvss.vcxproj                |   117 +
 utilities/vcppmake/genbookutil.vcproj              |   194 -
 utilities/vcppmake/genbookutil.vcxproj             |   117 +
 utilities/vcppmake/imp2gbs.vcproj                  |   194 -
 utilities/vcppmake/imp2gbs.vcxproj                 |   117 +
 utilities/vcppmake/imp2ld.vcproj                   |   194 -
 utilities/vcppmake/imp2ld.vcxproj                  |   117 +
 utilities/vcppmake/imp2vs.vcproj                   |   194 -
 utilities/vcppmake/imp2vs.vcxproj                  |   117 +
 utilities/vcppmake/installmgr.vcproj               |   194 -
 utilities/vcppmake/installmgr.vcxproj              |   117 +
 utilities/vcppmake/lexdump.vcxproj                 |   117 +
 utilities/vcppmake/mkfastmod.vcproj                |   194 -
 utilities/vcppmake/mkfastmod.vcxproj               |   117 +
 utilities/vcppmake/mod2imp.vcproj                  |   194 -
 utilities/vcppmake/mod2imp.vcxproj                 |   117 +
 utilities/vcppmake/mod2osis.vcproj                 |   194 -
 utilities/vcppmake/mod2osis.vcxproj                |   117 +
 utilities/vcppmake/mod2vpl.vcproj                  |   194 -
 utilities/vcppmake/mod2vpl.vcxproj                 |   117 +
 utilities/vcppmake/mod2zmod.vcproj                 |   194 -
 utilities/vcppmake/mod2zmod.vcxproj                |   116 +
 utilities/vcppmake/modwrite.vcproj                 |   194 -
 utilities/vcppmake/modwrite.vcxproj                |   117 +
 utilities/vcppmake/osis2mod.vcproj                 |   199 -
 utilities/vcppmake/osis2mod.vcxproj                |   123 +
 utilities/vcppmake/step2vpl.vcproj                 |   194 -
 utilities/vcppmake/step2vpl.vcxproj                |   117 +
 utilities/vcppmake/stepdump.vcproj                 |   194 -
 utilities/vcppmake/stepdump.vcxproj                |   117 +
 utilities/vcppmake/tei2mod.vcproj                  |   194 -
 utilities/vcppmake/tei2mod.vcxproj                 |   117 +
 utilities/vcppmake/treeidxutil.vcproj              |   194 -
 utilities/vcppmake/treeidxutil.vcxproj             |   117 +
 utilities/vcppmake/utilities.sln                   |   426 +-
 utilities/vcppmake/vpl2mod.vcproj                  |   194 -
 utilities/vcppmake/vpl2mod.vcxproj                 |   117 +
 utilities/vcppmake/vs2osisref.vcproj               |   194 -
 utilities/vcppmake/vs2osisref.vcxproj              |   117 +
 utilities/vcppmake/vs2osisreftxt.vcproj            |   194 -
 utilities/vcppmake/vs2osisreftxt.vcxproj           |   117 +
 utilities/vcppmake/xml2gbs.vcproj                  |   194 -
 utilities/vcppmake/xml2gbs.vcxproj                 |   117 +
 utilities/vpl2mod.cpp                              |    38 +-
 utilities/vs2osisref.cpp                           |     9 +-
 utilities/vs2osisreftxt.cpp                        |    14 +-
 utilities/xml2gbs.cpp                              |    16 +-
 839 files changed, 52057 insertions(+), 59647 deletions(-)

diff --cc debian/changelog
index efbcf5c,0000000..958840d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,925 -1,0 +1,929 @@@
- sword (1.6.2+dfsg-7) UNRELEASED; urgency=low
++sword (1.7.2+dfsg-1) unstable; urgency=medium
 +
-   * Add Vcs-Browser and Vcs-Git fields to debian/control pointing to the
-     new repository location on Alioth.
++  * New upstream release.
++  * Rebase patches.
++  * icu translit files are no longer generated, don't install them.
++  * drop installing greek transliteration doc.
++  * bump abi to 10.
++  * switch to debhelper 9.
 +
-  -- Roberto C. Sanchez <roberto at connexer.com>  Sun, 30 Mar 2014 16:50:23 -0400
++ -- Dimitri John Ledkov <xnox at debian.org>  Sat, 19 Apr 2014 15:05:09 +0100
 +
 +sword (1.6.2+dfsg-6) unstable; urgency=low
 +
 +  [ Rene Engelhard ]
 +  * fix FTBFS: remove include/zconf.h and don't rely on it (closes: #707537)
 +  
 +  [ Dmitrijs Ledkovs ]
 +  * Add patch to build against clucene-core 2.
 +
 + -- Dmitrijs Ledkovs <xnox at debian.org>  Sun, 04 Aug 2013 19:20:31 +0100
 +
 +sword (1.6.2+dfsg-5ubuntu1) raring; urgency=low
 +
 +  * Build against clucene-core 2.
 +
 + -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>  Wed, 21 Nov 2012 01:45:59 +0000
 +
 +sword (1.6.2+dfsg-5) unstable; urgency=low
 +
 +  * Fix FTBFS due to icu changes (Closes: #676097).
 +
 + -- Dmitrijs Ledkovs <xnox at debian.org>  Thu, 07 Jun 2012 07:49:56 +0100
 +
 +sword (1.6.2+dfsg-4) unstable; urgency=low
 +
 +  [ Matthias Klose ]
 +  * Fix build failure in installed header file with GCC 4.7.
 +    Addresses: #667387.
 +
 +  [ Dmitrijs Ledkovs ]
 +  * Remove python-sword swig bindings. Loads of build-time warnings (4.6)
 +    and errors (4.7) and the resulting module was reported not to
 +    work. Should be readded if/when it can be build with gcc 4.7 without
 +    errors. (Closes: #667387)
 +
 + -- Dmitrijs Ledkovs <xnox at debian.org>  Tue, 17 Apr 2012 21:39:11 +0100
 +
 +sword (1.6.2+dfsg-3) unstable; urgency=low
 +
 +  * Fix FTBFS if running binary-arch target only.
 +
 + -- Dmitrijs Ledkovs <xnox at debian.org>  Mon, 09 Apr 2012 14:58:48 +0100
 +
 +sword (1.6.2+dfsg-2) unstable; urgency=low
 +
 +  [ Dmitrijs Ledkovs <xnox at debian.org> ]
 +  * Fix linking against CLucene
 +  * 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 <xnox at debian.org>  Sat, 07 Apr 2012 14:22:48 +0100
 +
 +sword (1.6.2+dfsg-1) unstable; urgency=low
 +  
 +  [ Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com> ]
 +  * Revamped debian/rules to use dh tiny rules style
 +  * Raised compat to debhelper 7 and change associated packaging files
 +  * 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
 +  * Use dpkg-buildflags
 +  * Make CMake honour environmental variables
 +  * Create python-sword package (LP: #49959) (Closes: 640357)
 +  * document vs2osisreftxt.1
 +  * 3.0 (quilt) format only (launchpad ppa supports it now)
 +  * fix gcc-4.6 warnings
 +  * Additional compiler error fix, thanks to
 +    "brian m. carlson" <sandals at crustytoothpaste.net> (Closes: 624962)
 +  * Updated debian/copyright to match the updated dep-5 spec
 +
 + -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>  Tue, 30 Nov 2010 23:06:43 +0000
 +
 +sword (1.6.1+dfsg-2) unstable; urgency=low
 +
 +  [ Dmitrijs Ledkovs ]
 +  * Fixed lintian warning about watch file.
 +  * debian/patches/13_curl - Upstream fix for curl 7.20 compatibility.
 +  * bumped standards version to 3.8.4 - no changes required.
 +  * Update email address.
 +  * Added upstream changelog.
 +  * debian/copyright:
 +    - Removed reference to unversioned GPL license
 +    - Two files do not explictly specify GPL version
 +    - Based on clause 9 GPL-2 & clause 14 GPL-3, GPL-2 is selected such
 +    that to be compatible with the rest of sword
 +
 + -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>  Mon, 22 Mar 2010 19:14:19 +0000
 +
 +sword (1.6.1+dfsg-1) unstable; urgency=low
 +
 +  [ Jonathan Marsden ]
 +  * debian/libsword8.examples: Add missing tcl eggdrop bot script.
 +
 +  [ Dmitrijs Ledkovs ]
 +  * Drop shipping .la file in favour of pkg-config (Debian release goal)
 +    - More info http://lists.debian.org/debian-devel/2009/08/msg00783.html
 +  * Drop backported patches, refreshed libver & compiler warnings.
 +  * Compiling with -Werror enabled. 
 +  * Bumped standards version to 3.8.3, no changes needed.
 +  * Added debian/README.source documentation quilt usage
 +  * Added configure option --without-internalregex
 +
 + -- Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com>  Thu, 21 Jan 2010 00:10:17 +0000
 +
 +sword (1.6.0+dfsg-1) unstable; urgency=low
 +
 +  [ Jonathan Marsden ]
 +  * New upstream release. (Closes: #507960) (LP: #320558)
 +  * debian/patches/02_libver.diff:
 +    - Bump SONAME to 8 -- SWORD 1.6 is not backward compatible with 1.5.11.
 +  * debian/patches/series:
 +    - Remove 10_diatheke.diff -- included in upstream source.
 +  * debian/patches/:
 +    - Remove several old unused .diff files.
 +    - Add 11_regex_only_when_needed.diff to conditionally include regex lib.
 +    - Add 12_fix_compiler_warnings.diff to remove all compiler warnings.
 +    - Add 13_fix_osis2mod_compression_default.diff from upstream svn.
 +    - Add 14_closing_section_not_chapter.diff from upstream svn.
 +  * debian/libsword7.*: 
 +    - Rename to libsword8.*
 +    - Change libsword7 to libsword8 within files.
 +  * debian/rules: 
 +    - SONAME bump to 8.
 +    - Set library version check to >= 1.6
 +  * debian/control:
 +    - Change libsword7 to libsword8.
 +    - Add libsword7 to Conflicts.
 +    - Fix case of sword to SWORD in package descriptions.
 +    - Bump Standards-Version to 3.8.1 (no changes needed).
 +    - Fix section for libsword-dbg to avoid lintian warning.
 +  * debian/rules:
 +    - Add DFSG get-orig-source target.
 +  * debian/copyright:
 +    - Fix various mistakes in initial attempt to document copyrights.
 +  
 +  [ Dmitrijs Ledkovs ]
 +  * debian/rules: Added utils.mk to use missing-files target and call it on
 +    each build.
 +  * debian/libsword-dev.install: Added libsword.la, previously missing.
 +  * debian/libsword7.install: Added missing libicu translit files.
 +  * debian/control:
 +    - Updated all uses of SWORD version to 1.6
 +    - Added libsword-dbg package
 +  * debian/watch: Fixed a small mistake which was resulting in extra "."
 +    in final version name.
 +  * debian/rules: simplified manpage processing.
 +  * debian/libsword8.lintian-overrides: added override for module
 +    installation directory.
 +  * debian/copyright: Updated with information about everyfile.
 +    Closes: #513448 LP: #322638
 +  * debian/diatheke.examples: moved examples here from the diatheke.install
 +  * debian/rules:
 +    - enabled shell script based testsuite
 +    - added commented out cppunit testsuite
 +  * debian/patches/40_missing_includes.diff: 
 +    - added several missing stdio.h includes to prevent FTBFS of testsuite.
 +  
 +  [ Closed Bugs ]
 +  * FTBFS on intrepid (LP: #305172)
 +
 + -- Jonathan Marsden <jmarsden at fastmail.fm>  Sat, 30 May 2009 11:55:55 -0700
 +
 +sword (1.5.11-1) experimental; urgency=low
 +
 +  [Jonathan Marsden]
 +  * New upstream release
 +  * debian/rules:
 +    - Switch to using more normal CDBS/autotools not tarball in tarball.
 +    - Build against libicu for better i18n support.
 +    - Use chrpath on installed binaries to get rid of lintian warnings.
 +    - Set DEB_DH_MAKESHLIBS_ARGS to (>= 1.5.11) not (>=1.5.11-1).
 +    - Add pod2man command to generate tei2mod man page.
 +    - Use -n option on pod2man commands to fix command names in man pages.
 +  * Bump SONAME to 7.
 +    - Rename debian/libsword6.* appropriately.
 +    - Change 6 to 7 in several scripts including debian/rules
 +      and debian/control
 +  * debian/patches:
 +    - Remove most patches as being unnecessary now.
 +    - Simplify debian/patches/02_libver.diff to only edit the version-info.
 +  * debian/control:
 +    - Bump Standards-Version to 3.8.0.
 +    - Update diatheke one-line description (cli tool not CGI script).
 +    - Removed recommends of a web server for diatheke.
 +    - Edit description of diatheke removing references to web/CGI.
 +    - Add ${misc:Depends} to Depends of binary packages.
 +    - Add Homepage tag
 +    - Update Conflicts: to libsword6.
 +    - Update Replaces: to include libsword6.
 +  * debian/*:
 +    - Move CGI scripts to install as examples, for security reasons.
 +    - Add debian/diatheke.README.Debian explaining move of CGI scripts.
 +    - Minimize unnecessary debian/*.dirs files and entries in them.
 +    - Remove unnecessary debian/libsword7.shlibs file.
 +  * debian/diatheke.1:
 +    - Escape all unescaped dashes.
 +    - Add trailing newline.
 +  * debian/diatheke.manpages:
 +    - Create file, add debian/diatheke.1 so this man page is included in
 +      the diatheke binary package.
 +  * debian/libsword7.install:
 +    - Add missing usr/bin/tei2mod entry so the tei2mod command is installed.
 +  * debian/libsword7.manpages:
 +    - Add an entry for tei2mod.1 man page.
 +  * debian/tei2mod.1.pod:
 +    - Add the tei2mod man page source.
 +
 +  [Dmitrijs Ledkovs]
 +  * debian/*.pod
 +    - Added manpages for all utilities.
 +  * debian/rules
 +    - Added rules to generate manpages from POD.
 +  * debian/libsword7.manpages
 +    - Created manpages list.
 +  * debian/control
 +    - Set maintainer to CrossWire Packaging team
 +    - Set uploaders: Daniel Glassey, Dmitrijs Ledkovs, Jonathan Marsden
 +    - Extended descriptions of the packages
 +  * debian/changelog
 +    - updated formatting, sorted by developer
 +  * debian/copyrights
 +    - updated to proposed copyright format
 +  * debian/patches
 +    - added patch descriptions
 +
 + -- Jonathan Marsden <jmarsden at fastmail.fm>  Sat, 04 Apr 2009 23:09:16 -0700
 +
 +sword (1.5.9-8.1ubuntu1) intrepid; urgency=low
 +
 +  * Fakesync with Debian unstable (LP: #234580)
 +  * Modify Maintainer value to match the DebianMaintainerField
 +    specification.
 +
 + -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Wed, 28 May 2008 15:38:08 +0200
 +
 +sword (1.5.9-8.1) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Amend 08_gcc_43.diff to fix GCC 4.3 FTBFS (Closes: #474824)
 +  * debian/control:
 +    - Build-Depend on cdbs >= 0.4.27 instead of 0.4.27-1.
 +    - Bump Standards-Version to 3.7.3.
 +    - Use ${binary:Version} instead of ${Source-Version}.
 +
 + -- Chris Lamb <chris at chris-lamb.co.uk>  Sat, 12 Apr 2008 00:00:29 +0100
 +
 +sword (1.5.9-8ubuntu1) hardy; urgency=low
 +
 +  * Fakesync from Debian unstable.
 +  * Fixes CVE-2008-0932. (LP: #195696)
 +
 + -- William Grant <william.grant at ubuntu.org.au>  Sun, 16 Mar 2008 20:59:00 +1100
 +
 +sword (1.5.9-8) unstable; urgency=high
 +
 +  * diatheke failed to use shell_escape for the range parameter 
 +    properly, Closes: #466449
 +
 + -- Daniel Glassey <wdg at debian.org>  Mon, 18 Feb 2008 22:57:25 +0000
 +
 +sword (1.5.9-7.1) unstable; urgency=medium
 +
 +  [ Luk Claes ]
 +  * Non-maintainer upload.
 +  * Don't ship the libsword.la file anymore (Closes: #444562).
 +  * Don't rely on libclucene.la anymore (Closes: #445776).
 +
 + -- root <luk at debian.org>  Sat, 02 Feb 2008 15:46:07 +0000
 +
 +sword (1.5.9-7) unstable; urgency=low
 +
 +  * libsword-dev should not depend on libclucene-dev
 +    or libc6-dev, libz-dev, libcurl4-gnutls-dev
 +  * patch 09_pcfile.diff don't link apps to all these libs
 +  * update patch 02_libver.diff link lib to clucene
 +
 + -- Daniel Glassey <wdg at debian.org>  Fri, 31 Aug 2007 16:33:10 +0100
 +
 +sword (1.5.9-6ubuntu1) gutsy; urgency=low
 +
 +  * Fakesync from Debian unstable
 +  * Modify Maintainer value to match Debian-Maintainer-Field Spec
 +
 + -- Lionel Porcheron <lionel.porcheron at ubuntu.com>  Sun, 08 Jul 2007 22:51:24 +0200
 +
 +sword (1.5.9-6) unstable; urgency=low
 +
 +  * debian/control: diatheke should recommend apache2 now
 +  * unmet Recommends on libapache-mod-perl | apache-perl (Closes:
 +    #429565)
 +
 + -- Daniel Glassey <wdg at debian.org>  Fri, 22 Jun 2007 10:45:24 +0100
 +
 +sword (1.5.9-5ubuntu2) gutsy; urgency=low
 +
 +  * Rebuild for the libcurl transition mess.
 +
 + -- Steve Kowalik <stevenk at ubuntu.com>  Thu,  5 Jul 2007 14:11:58 +1000
 +
 +sword (1.5.9-5ubuntu1) gutsy; urgency=low
 +
 +  * Merge from Debian unstable, remaining changes:
 +    - Modify Maintainer value to match Debian-Maintainer-Fied Spec
 +
 + -- Raphael Pinson <raphink at ubuntu.com>  Wed,  6 Jun 2007 15:53:55 +0200
 +
 +sword (1.5.9-5) unstable; urgency=low
 +
 +  * debian/control change libsword-dev dependency to 
 +      libcurl4-gnutls-dev, Closes: #423936
 +  * include patch to build with gcc 4.3, Closes: #417717
 +
 + -- Daniel Glassey <wdg at debian.org>  Sat, 19 May 2007 16:22:41 -0600
 +
 +sword (1.5.9-4ubuntu1) gutsy; urgency=low
 +
 +  * Merge from debian unstable, remaining changes:
 +  * Fakesync
 +  * Modify Maintainer value to match Debian-Maintainer-Field Spec
 +
 + -- Sarah Hobbs <hobbsee at ubuntu.com>  Sat, 19 May 2007 14:23:34 +1000
 +
 +sword (1.5.9-4) unstable; urgency=low
 +
 +  * debian/control curl transition, change build dep to 
 +      libcurl4-gnutls-dev, Closes: #423936, #423958
 +  * enable 06_warnings and 07_warn_tools patches 
 +
 + -- Daniel Glassey <wdg at debian.org>  Tue, 15 May 2007 07:56:16 -0600
 +
 +sword (1.5.9-3build1) feisty; urgency=low
 +
 +  * Fakesync due to mismatched orig.tar.gz (no Ubuntu changes).
 +
 + -- Michael Bienia <geser at ubuntu.com>  Fri, 12 Jan 2007 14:05:22 +0100
 +
 +sword (1.5.9-3) unstable; urgency=high
 +
 +  * patch 06_warnings.diff - modifications to fix some compiler warnings 
 +        (not enabled in this version)
 +  * patch 07_warnings_tools.diff - modifications to fix some compiler warnings 
 +        (not enabled in this version)
 +  * debian/control: diatheke to recommend not depend on webserver as
 +      the script can be used on its own, Closes: #358535
 +  * patch 04_ziplock.diff to fix error when uncompressing locked modules
 +      IMPORTANT - prevents a crash with bibletime and locked modules
 +      so urgency high
 +  * patch 05_getline.diff prevents potential use of uninitialised var
 +  * rename diffs to xx_name.diff
 +
 + -- Daniel Glassey <wdg at debian.org>  Fri, 24 Nov 2006 15:14:05 +0000
 +
 +sword (1.5.9-2) unstable; urgency=low
 +
 +  * Use CLUCENE_LIBS not LUCENE_LIBS in sword.pc.in
 +       so that frontends will just link to clucene
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu, 23 Nov 2006 11:37:17 +0000
 +
 +sword (1.5.9-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * debian/control:
 +      changes to API so new package libsword6, replaces libsword5c2a
 +      don't depend on libicu36-dev
 +			(would have depended on libicu36-dev instead of icu34)
 +  * debian/rules:
 +      shlibs for libsword6
 +      new upstream tarball
 +			use --with-clucene=/usr
 +			don't build with icu
 +  * remove debian/control.in
 +  * debian/libsword6.dirs: rename
 +  * debian/libsword6.docs: rename and refer to correct dir
 +  * debian/libsword6.install: rename and use new .so name
 +  * debian/libsword6.shlibs: rename and use new .so name
 +  * debian/patches: don't need utilities patch, update lib version patch
 +  * debian/diatheke*: refer to 1.5.9 directory
 +
 + -- Daniel Glassey <wdg at debian.org>  Mon, 25 Sep 2006 19:53:37 +0100
 +
 +sword (1.5.9-0ubuntu3) edgy; urgency=low
 +
 +  * Update debian/libsword6.shlibs with Ubuntu version of lib 
 +
 + -- Raphaël Pinson <raphink at ichthux.com>  Thu, 28 Sep 2006 11:04:42 +0200
 +
 +sword (1.5.9-0ubuntu2) edgy; urgency=low
 +
 +  * Shlibs created with libsword6 >= 1.5.9-0ubuntu1 in debian/rules
 +
 + -- Raphaël Pinson <raphink at ichthux.com>  Tue, 26 Sep 2006 08:18:34 +0200
 +
 +sword (1.5.9-0ubuntu1) edgy; urgency=low
 +
 +  [ Daniel Glassey ]
 +  * New upstream version
 +  * debian/control:
 +      changes to API so new package libsword6, replaces libsword5c2a
 +      don't depend on libicu36-dev
 +			(would have depended on libicu36-dev instead of icu34)
 +  * debian/rules:
 +      shlibs for libsword6
 +      new upstream tarball
 +			use --with-clucene=/usr
 +			don't build with icu
 +  * remove debian/control.in
 +  * debian/libsword6.dirs: rename
 +  * debian/libsword6.docs: rename and refer to correct dir
 +  * debian/libsword6.install: rename and use new .so name
 +  * debian/libsword6.shlibs: rename and use new .so name
 +  * debian/patches: don't need utilities patch, update lib version patch
 +  * debian/diatheke*: refer to 1.5.9 directory
 +
 +  [ Raphaël Pinson ]
 +  * Bump debhelper version to 5
 +
 + -- Raphaël Pinson <raphink at ichthux.com>  Tue, 26 Sep 2006 07:30:20 +0200
 +
 +sword (1.5.8-9) unstable; urgency=low
 +
 +  * build using clucene, build-deps on libclucene-dev
 +  * not released, but applies to 1.5.9
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed, 14 Dec 2005 19:46:26 +0000
 +
 +sword (1.5.8-8) unstable; urgency=low
 +
 +  * fix build depends wrt cdbs autogenerated version
 +  * debian/rules: fix shlibsdeps
 +
 + -- Daniel Glassey <wdg at debian.org>  Sat, 10 Dec 2005 20:25:24 +0000
 +
 +sword (1.5.8-7) unstable; urgency=medium
 +
 +  * ackknowledge NMU, thanks, Closes: #339269
 +  * don't autogenerate debian/control using cdbs
 +  * use gnutls version of curl since sword is GPLd
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu,  8 Dec 2005 10:42:17 +0000
 +
 +sword (1.5.8-6.1) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Medium-urgency upload for RC bugfix.
 +  * Rename libsword5 to libsword5c2a for the C++ mt allocator ABI transition,
 +    and conflict/replace libsword5 accordingly (closes: #339269).
 +
 + -- Steve Langasek <vorlon at debian.org>  Mon,  5 Dec 2005 00:10:19 -0800
 +
 +sword (1.5.8-6) unstable; urgency=low
 +
 +  * build dep on a version of libcurl3-openssl-dev that has the
 +       correct depends, Closes: #334667
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed, 19 Oct 2005 08:52:38 +0100
 +
 +sword (1.5.8-5) unstable; urgency=low
 +
 +  * rebuild against curl and openssl
 +  * build depend on libcurl3-openssl-dev instead of libcurl3-dev
 +  * libsword-dev depends on libcurl3-openssl-dev
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu, 13 Oct 2005 11:44:39 +0100
 +
 +sword (1.5.8-4) unstable; urgency=low
 +
 +  * debian/rules: shlibs should be for libsword5 >= 1.5.8-3
 +
 + -- Daniel Glassey <wdg at debian.org>  Fri,  9 Sep 2005 12:00:29 +0100
 +
 +sword (1.5.8-3) unstable; urgency=low
 +
 +  * debian/libsword5.shlibs: Fix shlibs problem for bug #323116
 +  * updated FSF address in copyright
 +  * remove libsword5.conffiles to stop duplication
 +  * change the lib soname to 5 rather than 1.5.8
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed,  7 Sep 2005 15:44:47 +0100
 +
 +sword (1.5.8-2) unstable; urgency=low
 +
 +  * Don't install libsword-1.5.8.so to both packages
 +  * html docs aren't in sword any more so remove libsword-dev.doc-base
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu, 11 Aug 2005 16:07:03 +0100
 +
 +sword (1.5.8-1) unstable; urgency=low
 +
 +  * New upstream release
 +     so new package libsword5, no need for libsword4c2 now
 +  * Thanks for the gcc4 fix, acknowledge NMU (Closes: #288586)
 +  * Change to using cdbs and quilt to manage patches
 +  * include imp2gbs and xml2gbs utilities
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed, 10 Aug 2005 15:44:34 +0100
 +
 +sword (1.5.7-7.1) unstable; urgency=low
 +
 +  * Non-Maintainer Upload
 +  * C++ transition: libsword4 -> libsword4c2
 +  * Fix gcc4 compile error: Use intptr_t as type for pointers, not 'int'
 +    (Closes: #288586)
 +  * Debhelper compat level 4, to fix calls to ldconfig properly, and drop a
 +    lot of manual stuff
 +  * Run dh_makeshlibs *before* dh_installdeb
 +  * Fix broken dh_shlibs invocation
 +
 + -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Sat,  6 Aug 2005 19:42:38 +0200
 +
 +sword (1.5.7-7) unstable; urgency=high
 +
 +  * Patch from security team, Closes: #291433
 +  * Added shell_escape() function to fix arbitrary command execution
 +    [apps/console/diatheke/cgi/diatheke.pl, CAN-2005-0015]
 +  * Improvements by Ulf Härnhammar
 +
 + -- Daniel Glassey <wdg at debian.org>  Mon, 17 Jan 2005 16:24:37 +0000
 +
 +sword (1.5.7-6) unstable; urgency=low
 +
 +  * libsword-dev should depend on libcurl3-dev
 +
 + -- Daniel Glassey <wdg at debian.org>  Mon, 13 Dec 2004 23:03:20 +0000
 +
 +sword (1.5.7-5) unstable; urgency=low
 +
 +  * Change from libcurl2-dev to libcurl3-dev, Closes: #279460
 +  * Move the pkgconfig file to the dev package, Closes: #281585
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu,  9 Dec 2004 14:26:45 +0000
 +
 +sword (1.5.7-4) unstable; urgency=low
 +
 +  * Use PassiveFtp for installmgr by default
 +      This avoids problems with the BibleTime installer, Closes: #235601
 +
 + -- Daniel Glassey <wdg at debian.org>  Fri, 16 Jul 2004 16:51:35 +0100
 +
 +sword (1.5.7-3) unstable; urgency=low
 +
 +  * src/utilfuns/utilstr.cpp - toupperstr *buf++ fix
 +      caused segfaults when compiled with -O2
 +  * fix to build with gcc 3.4 
 +      include/multimapwdef.h, Closes: #258768
 +  * build the diatheke package again, it is still there just in a 
 +      different place, Closes: #229444
 +  * fix documentation about modules, 
 +      README.Debian, Closes: #249020
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed, 14 Jul 2004 16:54:27 +0100
 +
 +sword (1.5.7-2) unstable; urgency=low
 +
 +  * Fix problem building with current libcurl2-dev - TRUE has
 +      been removed from the curl header, VERBOSE just needs to
 +      be 1 now, Closes: #227860
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu, 15 Jan 2004 15:50:07 +0000
 +
 +sword (1.5.7-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * set lib version to 4
 +  * remove diatheke as it has been removed from upstream source,
 +     hopefully it will be released separately soon
 +  * improve the copyright file because of post to debian-devel
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed,  7 Jan 2004 15:16:30 +0000
 +
 +sword (1.5.6-9) unstable; urgency=medium
 +
 +  * Build depend on libcurl2-dev
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu, 20 Nov 2003 10:20:11 +0000
 +
 +sword (1.5.6-8) unstable; urgency=low
 +
 +  * Remove the recommends of libsword-runtime from libsword-dev, Closes:
 +    #220411
 +  * That'd better be the last of the control file mistakes :/
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed, 12 Nov 2003 14:39:30 +0000
 +
 +sword (1.5.6-7) unstable; urgency=low
 +
 +  * Also Replaces libsword-runtime and libsword-config, Closes #220408
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed, 12 Nov 2003 14:00:34 +0000
 +
 +sword (1.5.6-6) unstable; urgency=low
 +
 +  * Rerun libtool/autoconf/automake, Closes: #220250
 +
 + -- Daniel Glassey <wdg at debian.org>  Tue, 11 Nov 2003 19:20:16 +0000
 +
 +sword (1.5.6-5) unstable; urgency=low
 +
 +  * libsword3 replaces libsword2c103, Closes: #219463
 +  * libsword3 replaces libsword1, Closes: #219463
 +  * no libsword-runtime package now so description is irrelevant, Closes: #209977
 +
 + -- Daniel Glassey <wdg at debian.org>  Fri,  7 Nov 2003 13:53:46 +0000
 +
 +sword (1.5.6-4) unstable; urgency=low
 +
 +  * The 'ok, forget about the config package' release
 +  * now at policy 3.6.1.0
 +  * add a build-dep for pkg-config
 +  * ready to upload to unstable
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed,  5 Nov 2003 17:04:44 +0000
 +
 +sword (1.5.6-3) experimental; urgency=low
 +
 +  * -runtime package is unnecessary so merge it into lib
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed,  3 Sep 2003 20:49:58 +0100
 +
 +sword (1.5.6-2) experimental; urgency=low
 +
 +  * Brown paper bug - get shlibs right
 +
 + -- Daniel Glassey <wdg at debian.org>  Fri, 29 Aug 2003 11:25:55 +0100
 +
 +sword (1.5.6-1) experimental; urgency=low
 +
 +  * Release is done now
 +  * Upload to experimental for now til gs and bt are ready
 +  * don't need the c102 suffix now
 +  * don't build with icu til we get 2.6 packaged and into experimental
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu, 28 Aug 2003 17:38:40 +0100
 +
 +sword (1.5.5.99-2) unstable; urgency=low
 +
 +  * Another prerelease build
 +  * split config files out into separate package so we can have different
 +    sword libs installed at the same time later on
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed, 16 Jul 2003 14:48:22 +0100
 +
 +sword (1.5.5.99-1) unstable; urgency=low
 +
 +  * Build a pre-release from a make dist from cvs
 +  * change lib version for imminent 1.5.6
 +  * depend on icu 2.6 to test that
 +  * api docs have been moved out into separate source
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu, 10 Jul 2003 12:45:18 +0100
 +
 +sword (1.5.5-4) unstable; urgency=low
 +
 +  * debian/control remove extra blank line that stops building on woody
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu,  1 May 2003 09:59:14 +0100
 +
 +sword (1.5.5-3) unstable; urgency=low
 +
 +  * libsword-dev now depends on icu stuff so apps that build with it don't
 +      have to
 +  * conflict with libsword1 since both include config files (may split these
 +      out into separate package for 1.5.6), Closes #189647
 +
 + -- Daniel Glassey <wdg at debian.org>  Sat, 19 Apr 2003 16:01:05 +0100
 +
 +sword (1.5.5-2) unstable; urgency=low
 +
 +  * Close the new upstream bug, Closes: #175322
 +  * uses autotools-dev to get the uptodate config.guess and
 +    config.sub, hopefully will sort out mips problem, Closes: #187703
 +  * Utilities are now really included - bug 157115 tagged for woody
 +  * debian/control - change section of libsword-dev to libdevel
 +  * debian/rules - 
 +      remove alpha compiler flags since it is ok with gcc3.2, Closes: #142703
 +      use confflags like autotools-dev says
 +      copy the config.guess and .sub from autotools-dev
 +
 + -- Daniel Glassey <wdg at debian.org>  Sat,  5 Apr 2003 12:53:06 +0100
 +
 +sword (1.5.5-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Rename library package to libsword2c102 since it is a new
 +     libver from 1.5.3 and it is part of the gcc3.2 transition
 +  * build with icu support now that icu has made the transition
 +     so build-depend on libicu21-dev and icu
 +  * build depend on debhelper >= 4.0.0
 +
 + -- Daniel Glassey <wdg at debian.org>  Tue, 26 Mar 2003 18:42:28 +0000
 +
 +sword (1.5.4+cvs20021008-1) unstable; urgency=low
 +
 +  * try and build a package from cvs
 +
 + -- Daniel Glassey <wdg at debian.org>  Tue,  8 Oct 2002 19:08:46 +0100
 +
 +sword (1.5.4-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * bump shlibs version since old version was released with woody
 +  * package now libsword2 instead of libsword1
 +
 + -- Daniel Glassey <wdg at debian.org>  Sat, 28 Sep 2002 13:31:47 +0100
 +
 +sword (1.5.3-3) unstable; urgency=high
 +
 +  * problem integrating hppa patch messed up rules, trying again
 +  * updating README.Debian to mention apt-gettable archive on
 +     crosswire
 +
 + -- Daniel Glassey <wdg at debian.org>  Sun, 14 Apr 2002 15:19:14 +0100
 +
 +sword (1.5.3-2) unstable; urgency=low
 +
 +  * make sure will build on gcc-3.0, sorry, Closes: #142617
 +  * alpha won't compile with -g flag so compiling without it
 +     see bug 142703
 +
 + -- Daniel Glassey <wdg at debian.org>  Sat, 13 Apr 2002 13:04:28 +0100
 +
 +sword (1.5.3-1) unstable; urgency=high
 +
 +  * New upstream release
 +
 + -- Daniel Glassey <wdg at debian.org>  Tue,  2 Apr 2002 21:38:58 +0100
 +
 +sword (1.5.2-10) unstable; urgency=low
 +
 +  * -9 failed on hppa, using namespace std needed in testblocks.cpp
 +     fix tested on sarti
 +
 + -- Daniel Glassey <wdg at debian.org>  Sat,  9 Feb 2002 18:20:40 +0000
 +
 +sword (1.5.2-9) unstable; urgency=low
 +
 +  * make the diatheke configure executable in debian/rules
 +        Closes: #132863
 +  * make diatheke description useful debian/control
 +  * bump shlibs version to 1.5.2-9
 +  * debian/rules dh_shlibdeps changed to -ldebian/tmp/usr/lib
 +  * compzip.cpp #include string.h and stdlib.h added for gcc 3.0 
 +  * README.Debian mention #sword irc channel
 +
 + -- Daniel Glassey <wdg at debian.org>  Fri,  8 Feb 2002 08:59:29 +0000
 +
 +sword (1.5.2-8) unstable; urgency=low
 +
 +  * rwphtml change greek_str to signed char
 +  * migrate to automake 1.5
 +  * move utilities to separate package libsword-runtime, Closes: #130909
 +  * new package containing diatheke from apps/console/diatheke, Closes: #130908
 +  * Bump standards version to 3.5.6.0
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu, 24 Jan 2002 20:01:16 +0000
 +
 +sword (1.5.2-7) unstable; urgency=low
 +
 +  * Rename roman.cpp to romanc.cpp, Closes #130038
 +  * Update README.Debian to mention apt-gettable module archive
 +     deb http://www.crosswire.org/~glasseyes/debian unstable main
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed, 23 Jan 2002 18:53:18 +0000
 +
 +sword (1.5.2-6) unstable; urgency=low
 +
 +  * remove -Werror, autobuilders not happy (fair enough, I can check
 +     through the build logs for warnings myself :) )
 +  * rawstr, rawstr4 more signed char in findoffset, Closes: #130038
 +  * c++ comments so roman.c -> roman.cpp, Closes: #129886
 +
 + -- Daniel Glassey <wdg at debian.org>  Mon, 21 Jan 2002 20:19:31 +0000
 +
 +sword (1.5.2-5) unstable; urgency=low
 +
 +  * char signedness fixes
 +     (in response to debian-devel-announce from Gerhard Tonn
 +     swkey: persist to signed char
 +     swmodule: createModule to signed char
 +               createSearchFramework to signed char
 +     versekey: book,testament to signed char
 +     swmgr: setCipherKey to signed char
 +     filemgr: trunc to signed char
 +     rawtext: createSearchFramework to signed char
 +     rawstr: findoffset to signed char
 +     rawstr4: findoffset to signed char
 +              in gettext make localsize to unsigned int      
 +  * use -Werror in Makefile.cfg to catch any more
 +  *  anything else is either already fixed or will be fixed in the
 +        imminent version 1.5.3
 +
 + -- Daniel Glassey <wdg at debian.org>  Thu, 17 Jan 2002 23:55:08 +0000
 +
 +sword (1.5.2-4) unstable; urgency=low
 +
 +  * Change maintainer to wdg at debian.org 
 +  * change shlibs to libsword1 >= 1.5.2-4 (gnomesword bug 123418)
 +      by dh_makeshlibs -V 'libsword1 (>= 1.5.2-4)' in debian/rules
 +  * remove reference to cheatah in package description
 +
 + -- Daniel Glassey <wdg at debian.org>  Tue, 11 Dec 2001 22:36:44 +0000
 +
 +sword (1.5.2-3) unstable; urgency=low
 +
 +  * oops, include gifs in html documentation as well 
 +  * chmod 755 before executing configure, closes #122658
 +  * remove autoconf from build-depends
 +
 + -- Daniel Glassey <wdg at debian.org>  Wed,  5 Dec 2001 00:25:07 +0000
 +
 +sword (1.5.2-2) unstable; urgency=low
 +
 +  * Backport endian solution from CVS, Closes: #103732
 +  * include some module utilities in the dev package
 +  * use the latest config.* from /usr/share/misc
 +
 + -- Daniel Glassey <wdg at debian.org>  Mon,  3 Dec 2001 19:11:08 +0000
 +
 +sword (1.5.2-1.1) unstable; urgency=low
 +
 +  * NMU to satisfy build-dependencies.
 +  * Fix gcc 3.0 compile failures.  Closes: #108707.
 +
 + -- LaMont Jones <lamont at debian.org>  Tue, 14 Aug 2001 09:25:42 -0600
 +
 +sword (1.5.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * final 1.5.2 release
 +
 + -- Daniel Glassey <wdg at debian.org>  Mon,  2 Jul 2001 22:53:50 +0000
 +
 +sword (1.5.1.99-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * prerelease of 1.5.2
 +  * change maintainer address to wdg at debian.org
 +  * add libsword-dev.manpages
 +
 + -- Daniel Glassey <wdg at debian.org>  Mon, 25 Jun 2001 18:32:04 +0000
 +
 +sword (1.5.1a-4) unstable; urgency=low
 +
 +  * Merged with Ivan Moore's latest package (1.5.1a-2 in Debian)
 +  * Now recommends frontend and doesn't depend on modules
 +
 + -- Daniel Glassey <danglassey at yahoo.com>  Mon, 22 Jan 2001 22:22:10 +0000
 +
 +sword (1.5.1a-3) unstable; urgency=low
 +
 +  * use autoconf to determine platform
 +  * add zlib to build-depends
 +  * up standards version to 3.2.1
 +  * module creation progs added to dev
 +
 + -- Daniel Glassey <danglassey at yahoo.com>  Mon, 15 Jan 2001 18:53:14 +0000
 +
 +sword (1.5.1a-2) unstable; urgency=low
 +
 +  * recommend text, suggest dict and comm. install locales.
 +
 + -- Daniel Glassey <danglassey at yahoo.com>  Mon,  4 Dec 2000 21:32:33 +0000
 +
 +sword (1.5.1a-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Daniel Glassey <danglassey at yahoo.com>  Thu, 23 Nov 2000 20:06:03 +0000
 +
 +sword (1.5.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Daniel Glassey <danglassey at yahoo.com>  Mon, 28 Aug 2000 21:34:49 +0100
 +
 +sword (1.4.6-2) unstable; urgency=low
 +
 +  * Change of maintainer
 +
 + -- Daniel Glassey <danglassey at yahoo.com>  Mon, 28 Aug 2000 19:14:22 +0100
 +
 +sword (1.4.6-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 20 Jan 2000 19:30:16 -0700
 +
 +sword (1.4.4-4) unstable; urgency=low
 +
 +  * Removing mods.conf file
 +
 + -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Oct 1999 07:30:16 -0400
 +
 +sword (1.4.4-3) unstable; urgency=low
 +
 +  * Fixing minor pathing bug with mods.conf files
 +
 + -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Oct 1999 04:45:16 -0400
 +
 +sword (1.4.4-2) unstable; urgency=low
 +
 +  * Fixing alot of things.
 +
 + -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Oct 1999 01:30:16 -0400
 +
 +sword (1.4.4-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 30 Sep 1999 08:30:16 -0400
 +
 +Local variables:
 +mode: debian-changelog
 +End:
 +
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index 35b9c52,0000000..983e778
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,110 -1,0 +1,106 @@@
 +Source: sword
- Build-Depends: debhelper (>= 7.0.50~),
++Build-Depends: debhelper (>= 9),
 +               cmake,
 +               libz-dev,
 +               pkg-config,
 +               libcurl4-gnutls-dev,
 +               libclucene-dev,
 +               libicu-dev,
 +               chrpath,
 +	       perl
 +Section: libs
 +Priority: optional
- Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
- XSBC-Original-Maintainer: CrossWire Packages <pkg-crosswire-devel at lists.alioth.debian.org>
++Maintainer: CrossWire Packages <pkg-crosswire-devel at lists.alioth.debian.org>
 +Uploaders: Daniel Glassey <wdg at debian.org>,
-  Dmitrijs Ledkovs <xnox at debian.org>,
-  Jonathan Marsden <jmarsden at fastmail.fm>,
-  Roberto C. Sanchez <roberto at connexer.com>
++ Dimitri John Ledkov <xnox at debian.org>,
++ Jonathan Marsden <jmarsden at fastmail.fm>
 +Standards-Version: 3.9.3
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-crosswire/sword.git
- Vcs-Git: git://anonscm.debian.org/pkg-crosswire/sword.git
 +Homepage: http://www.crosswire.org/sword/
 +
- Package: libsword9
++Package: libsword10
 +Architecture: any
 +Depends: libsword-common, ${shlibs:Depends}, ${misc:Depends}
 +Recommends: sword-frontend
 +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 
 + of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
 + text modules.
 + .
 + This package contains the core libraries for the project.
 + It also contains utilities for generating data modules.
 + .
 + Please read the README.Debian for more information on how to obtain other
 + modules for SWORD.
 +
 +Package: libsword-dev
 +Architecture: any
 +Section: libdevel
- Depends: libsword9 (= ${binary:Version}), ${misc:Depends}
++Depends: libsword10 (= ${binary:Version}), ${misc:Depends}
 +Recommends: libsword-utils
 +Description: Development files 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 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
 +Priority: extra
- Depends: libsword9 (= ${binary:Version}), ${misc:Depends}
++Depends: libsword10 (= ${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 
 + of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
 + text modules.
 + .
 + This package contains the debug symbols for the libsword library.
 +
 +Package: diatheke
 +Architecture: any
 +Section: text
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +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 
 + text modules.
 + .
 + This package contains a command line utility for SWORD, allowing
 + bible browsing and searching. This tool is used mostly only for
 + library testing. Nicer front-ends are Xiphos (Gtk), Bibletime (Qt)
 + and others.
 +
diff --cc debian/libsword10.docs
index e867332,0000000..546a37e
mode 100644,000000..100644
--- a/debian/libsword10.docs
+++ b/debian/libsword10.docs
@@@ -1,2 -1,0 +1,1 @@@
- doc/greektrans.txt
 +doc/translation-template.conf
diff --cc debian/libsword10.install
index 0000000,0000000..ad0b175
new file mode 100644
--- /dev/null
+++ b/debian/libsword10.install
@@@ -1,0 -1,0 +1,1 @@@
++usr/lib/libsword.so.10
diff --cc debian/patches/12_fix_compiler_warnings.diff
index 9822dcc,0000000..dbcf8b5
mode 100644,000000..100644
--- a/debian/patches/12_fix_compiler_warnings.diff
+++ b/debian/patches/12_fix_compiler_warnings.diff
@@@ -1,1187 -1,0 +1,1083 @@@
 +Remove compiler warnings so SWORD will compile with -Wall -Werror
- Index: debian/src/mgr/filemgr.cpp
- ===================================================================
- --- debian.orig/src/mgr/filemgr.cpp
- +++ debian/src/mgr/filemgr.cpp
- @@ -408,7 +408,7 @@ int FileMgr::createPathAndFile(const cha
++--- a/src/mgr/filemgr.cpp
+++++ b/src/mgr/filemgr.cpp
++@@ -409,7 +409,7 @@
 + 
 + 
 + int FileMgr::copyFile(const char *sourceFile, const char *targetFile) {
 +-	int sfd, dfd, len;
 ++  int sfd, dfd, len;
 + 	char buf[4096];
 + 
 + 	if ((sfd = ::open(sourceFile, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH)) < 1)
- Index: debian/src/utilfuns/zlib/untgz.c
- ===================================================================
- --- debian.orig/src/utilfuns/zlib/untgz.c
- +++ debian/src/utilfuns/zlib/untgz.c
- @@ -13,6 +13,8 @@
-  #include <fcntl.h>
-  #ifdef unix
-  # include <unistd.h>
- +# include <sys/stat.h>
- +# include <sys/types.h>
-  #else
-  # include <direct.h>
-  # include <io.h>
- @@ -80,7 +82,7 @@ union tar_buffer {
-  
-  enum { TGZ_EXTRACT = 0, TGZ_LIST };
-  
- -static char *TGZfname	OF((const char *));
- +// static char *TGZfname	OF((const char *));
-  void TGZnotfound	OF((const char *));
-  
-  int getoct		OF((char *, int));
- @@ -105,22 +107,23 @@ static char *TGZprefix[] = { "\0", ".tgz
-  /* 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;
- -}
- +// COMMENTED OUT 20090516 for SWORD
- +// 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 */
-  
- @@ -277,7 +280,7 @@ int untar (gzFile in, const char *dest)
++--- a/src/utilfuns/zlib/untgz.c
+++++ b/src/utilfuns/zlib/untgz.c
++@@ -262,7 +262,7 @@
 + 	int    remaining = 0;
 + 	FILE   *outfile = NULL;
 + 	char   fname[BLOCKSIZE];
 +-	time_t tartime;
 ++	time_t tartime = 0;
 +   
 + 	while (1) {
 + 		len = gzread(in, &buffer, BLOCKSIZE);
- Index: debian/tests/testblocks.cpp
- ===================================================================
- --- debian.orig/tests/testblocks.cpp
- +++ debian/tests/testblocks.cpp
- @@ -29,14 +29,18 @@ using namespace sword;
++--- a/tests/testblocks.cpp
+++++ b/tests/testblocks.cpp
++@@ -34,14 +34,18 @@
 + void addEntry(EntriesBlock *eb) {
 + 	string input;
 + 	string body;
 +-	char line[1024];
 ++	char line[1024], *c;
 + 	std::cout << "\nEnter new Entry's text. '.' on an empty line to finish:\n";
 + 	do {
 + 		std::cout << "> ";
 +-		fgets(line, 1000, stdin);
 +-		input = line;
 +-		if (input.compare("."))
 +-			body.append(input);
 ++		c = fgets(line, 1000, stdin);
 ++		if (c == NULL) {
 ++			std::cerr << "ERROR: fgets failed during addEntry\n";
 ++		} else {
 ++			input = line;
 ++			if (input.compare("."))
 ++				body.append(input);
 ++		}
 + 	}
 + 	while (input.compare("."));
 + 	std::cout << "Adding new entry.  Index is: " << eb->addEntry(body.c_str()) << "\n\n";
- @@ -72,29 +76,33 @@ int main(int argc, char **argv) {
++@@ -77,29 +81,33 @@
 + 
 + 	EntriesBlock *eb = new EntriesBlock();
 + 	string input;
 +-	char line[1024];
 ++	char line[1024], *c;
 + 
 + 	std::cout << "Initial entry count should be 0: " << eb->getCount() << "\n";
 + 
 + 	do {
 + 		std::cout << "[" << eb->getCount() << "] > ";
 +-		fgets(line, 1000, stdin);
 +-		input = line;
 +-		if (input.length() > 0) {
 +-			switch (input[0]) {
 +-				case 'a': addEntry(eb); break;
 +-				case 'p':	printEntry(eb, atoi(input.c_str()+1)); break;
 +-				case 'r':	removeEntry(eb, atoi(input.c_str()+1)); break;
 +-				case 's': printSize(eb); break;
 +-				case 'q': break;
 +-				case '?':
 +-				default:
 +-					std::cout << "\n a - add a new entry\n";
 +-					std::cout << " p <entry_index> - print entry\n";
 +-					std::cout << " r <entry_index> - remove entry\n";
 +-					std::cout << " s - print size of raw data\n";
 +-					std::cout << " q - quit\n\n";
 +-					break;
 ++		c = fgets(line, 1000, stdin);
 ++		if (c == NULL) {
 ++			std::cerr << "ERROR: fgets failed in main\n";
 ++		} else {
 ++			input = line;
 ++			if (input.length() > 0) {
 ++				switch (input[0]) {
 ++					case 'a': addEntry(eb); break;
 ++					case 'p':	printEntry(eb, atoi(input.c_str()+1)); break;
 ++					case 'r':	removeEntry(eb, atoi(input.c_str()+1)); break;
 ++					case 's': printSize(eb); break;
 ++					case 'q': break;
 ++					case '?':
 ++					default:
 ++						std::cout << "\n a - add a new entry\n";
 ++						std::cout << " p <entry_index> - print entry\n";
 ++						std::cout << " r <entry_index> - remove entry\n";
 ++						std::cout << " s - print size of raw data\n";
 ++						std::cout << " q - quit\n\n";
 ++						break;
 ++				}
 + 			}
 + 		}
 + 	}
- Index: debian/utilities/stepdump.cpp
- ===================================================================
- --- debian.orig/utilities/stepdump.cpp
- +++ debian/utilities/stepdump.cpp
- @@ -158,33 +158,56 @@ int main(int argc, char **argv) {
++--- a/utilities/stepdump.cpp
+++++ b/utilities/stepdump.cpp
++@@ -163,33 +163,56 @@
 + 
 + 
 + void readVersion(int fd, Version *versionRecord) {
 ++	int r;
 + 
 + 	cout << "\n\nReading Version Record (" << 16/*sizeof(struct Version)*/ << " bytes)\n\n";
 + // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
 + //	read(fd, &versionRecord, sizeof(struct Version));
 + 
 + 	cout << "Version Record Information\n";
 +-	read(fd, &(versionRecord->versionRecordSize), 2);
 ++	r = read(fd, &(versionRecord->versionRecordSize), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVersion");
 + 	cout << "\tversionRecordSize: " << versionRecord->versionRecordSize << "\n";
 +-	read(fd, &(versionRecord->publisherID), 2);
 ++	r = read(fd, &(versionRecord->publisherID), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVersion");
 + 	cout << "\tpublisherID: " << versionRecord->publisherID << "\n";
 +-	read(fd, &(versionRecord->bookID), 2);
 ++	r = read(fd, &(versionRecord->bookID), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVersion");
 + 	cout << "\tbookID: " << versionRecord->bookID << "\n";
 +-	read(fd, &(versionRecord->setID), 2);
 ++	r = read(fd, &(versionRecord->setID), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVersion");
 + 	cout << "\tsetID: " << versionRecord->setID << "\n";
 +-	read(fd, &(versionRecord->conversionProgramVerMajor), 1);
 ++	r = read(fd, &(versionRecord->conversionProgramVerMajor), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 + 	cout << "\tconversionProgramVerMajor: " << (int)versionRecord->conversionProgramVerMajor << "\n";
 +-	read(fd, &(versionRecord->conversionProgramVerMinor), 1);
 ++	r = read(fd, &(versionRecord->conversionProgramVerMinor), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 + 	cout << "\tconversionProgramVerMinor: " << (int)versionRecord->conversionProgramVerMinor << "\n";
 +-	read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
 ++	r = read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 + 	cout << "\tleastCompatSTEPVerMajor: " << (int)versionRecord->leastCompatSTEPVerMajor << "\n";
 +-	read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
 ++	r = read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 + 	cout << "\tleastCompatSTEPVerMinor: " << (int)versionRecord->leastCompatSTEPVerMinor << "\n";
 +-	read(fd, &(versionRecord->encryptionType), 1);
 ++	r = read(fd, &(versionRecord->encryptionType), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 + 	cout << "\tencryptionType: " << (int)versionRecord->encryptionType << "\n";
 +-	read(fd, &(versionRecord->editionID), 1);
 ++	r = read(fd, &(versionRecord->editionID), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 + 	cout << "\teditionID: " << (int)versionRecord->editionID << "\n";
 +-	read(fd, &(versionRecord->modifiedBy), 2);
 ++	r = read(fd, &(versionRecord->modifiedBy), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVersion");
 + 	cout << "\tmodifiedBy: " << versionRecord->modifiedBy << "\n";
 + 
 + 	int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/;
- @@ -192,33 +215,49 @@ void readVersion(int fd, Version *versio
++@@ -197,33 +220,49 @@
 + 	if (skip) {
 + 		cout << "\nSkipping " << skip << " unknown bytes.\n";
 + 		char *skipbuf = new char[skip];
 +-		read(fd, skipbuf, skip);
 ++		r = read(fd, skipbuf, skip);
 ++		if (r != skip)
 ++			perror("ERROR: read failed in readVersion");
 + 		delete [] skipbuf;
 + 	}
 + }
 + 
 + 
 + void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) {
 +-
 ++	int r;
 + 	cout << "\n\nReading Viewable Header Record (" << 16/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n";
 + 
 + // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
 + //	read(fd, &viewableHeaderRecord, sizeof(struct ViewableHeader));
 + 
 + 	cout << "Viewable Header Record Information\n";
 +-	read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
 ++	r = read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readViewableHeader");
 + 	cout << "\tviewableHeaderRecordSize: " << viewableHeaderRecord->viewableHeaderRecordSize << "\n";
 +-	read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
 ++	r = read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readViewableHeader");
 + 	cout << "\tviewableBlocksCount: " << viewableHeaderRecord->viewableBlocksCount << "\n";
 +-	read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
 ++	r = read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readViewableHeader");
 + 	cout << "\tglossBlocksCount: " << viewableHeaderRecord->glossBlocksCount << "\n";
 +-	read(fd, &(viewableHeaderRecord->compressionType), 1);
 ++	r = read(fd, &(viewableHeaderRecord->compressionType), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readViewableHeader");
 + 	cout << "\tcompressionType: " << (int)viewableHeaderRecord->compressionType << "(0 - none; 1 - LZSS)\n";
 +-	read(fd, &(viewableHeaderRecord->reserved1), 1);
 ++	r = read(fd, &(viewableHeaderRecord->reserved1), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readViewableHeader");
 + 	cout << "\treserved1: " << (int)viewableHeaderRecord->reserved1 << "\n";
 +-	read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
 ++	r = read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readViewableHeader");
 + 	cout << "\tblockEntriesSize: " << viewableHeaderRecord->blockEntriesSize << "\n";
 +-	read(fd, &(viewableHeaderRecord->reserved2), 2);
 ++	r = read(fd, &(viewableHeaderRecord->reserved2), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readViewableHeader");
 + 	cout << "\treserved2: " << viewableHeaderRecord->reserved2 << "\n";
 + 
 + 	int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
- @@ -226,18 +265,23 @@ void readViewableHeader(int fd, Viewable
++@@ -231,18 +270,23 @@
 + 	if (skip) {
 + 		cout << "\nSkipping " << skip << " unknown bytes.\n";
 + 		char *skipbuf = new char[skip];
 +-		read(fd, skipbuf, skip);
 ++		r = read(fd, skipbuf, skip);
 ++		if (r != skip)
 ++			perror("ERROR: read failed in readViewableHeader");
 + 		delete [] skipbuf;
 + 	}
 + }
 + 
 + 
 + void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) {
 ++	int r;
 + 	unsigned long size = vb->size;
 + 
 + 	*buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ];
 + 	lseek(fd, vb->offset, SEEK_SET);
 +-	read(fd, *buf, vb->size);
 ++	r = read(fd, *buf, vb->size);
 ++	if (r != vb->size)
 ++		perror("ERROR: read failed in readViewableBlocktext");
 + 
 + 	compress->zBuf(&size, *buf);
 + 	strcpy(*buf, compress->Buf());
- @@ -247,30 +291,41 @@ void readViewableBlockText(int fd, Viewa
++@@ -252,30 +296,41 @@
 + 
 + 
 + void readViewableBlock(int fd, ViewableBlock *vb) {
 +-
 ++	int r;
 + 	cout << "\n\nReading Viewable Block (" << 12/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n";
 + 
 + // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
 + //	read(fd, &vb, sizeof(struct ViewableBlock));
 + 
 + 	cout << "Viewable Block Information\n";
 +-	read(fd, &(vb->offset), 4);
 ++	r = read(fd, &(vb->offset), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readViewableBlock");
 + 	cout << "\toffset: " << vb->offset << "\n";
 +-	read(fd, &(vb->uncompressedSize), 4);
 ++	r = read(fd, &(vb->uncompressedSize), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readViewableBlock");
 + 	cout << "\tuncompressedSize: " << vb->uncompressedSize << "\n";
 +-	read(fd, &(vb->size), 4);
 ++	r = read(fd, &(vb->size), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readViewableBlock");
 + 	cout << "\tsize: " << vb->size << "\n";
 + }
 + 
 + 
 + void readHeaderControlWordAreaText(int fd, char **buf) {
 ++	int r;
 + 	long headerControlWordAreaSize;
 +-	read(fd, &headerControlWordAreaSize, 4);
 ++	r = read(fd, &headerControlWordAreaSize, 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readHeaderControlWordAreaText");
 + 	cout << "Reading Header Control Word Area (" << headerControlWordAreaSize << " bytes)\n\n";
 + 
 + 	*buf = new char [headerControlWordAreaSize + 1];
 + 
 +-	read(fd, *buf, headerControlWordAreaSize);
 ++	r = read(fd, *buf, headerControlWordAreaSize);
 ++	if (r != headerControlWordAreaSize)
 ++		perror("ERROR: read failed in readHeaderControlWordAreaText");
 + 	(*buf)[headerControlWordAreaSize] = 0;
 + 
 + 	cout << "headerControlWordArea:\n" << *buf << "\n";
- Index: debian/utilities/treeidxutil.cpp
- ===================================================================
- --- debian.orig/utilities/treeidxutil.cpp
- +++ debian/utilities/treeidxutil.cpp
- @@ -53,27 +53,33 @@ void printLocalName(TreeKeyIdx *treeKey)
++--- a/utilities/treeidxutil.cpp
+++++ b/utilities/treeidxutil.cpp
++@@ -58,27 +58,33 @@
 + 
 + 
 + void setLocalName(TreeKeyIdx *treeKey) {
 +-	char buf[1023];
 ++  char buf[1023], *c;
 + 	std::cout << "Enter New Node Name: ";
 +-	fgets(buf, 1000, stdin);
 ++	c = fgets(buf, 1000, stdin);
 ++	if (c == NULL)
 ++		std::cerr << "ERROR: fgets failed in setLocalName\n";
 + 	treeKey->setLocalName(buf);
 + 	treeKey->save();
 + }
 + 
 + 
 + void assurePath(TreeKeyIdx *treeKey) {
 +-	char buf[1023];
 ++  char buf[1023], *c;
 + 	std::cout << "Enter path: ";
 +-	fgets(buf, 1000, stdin);
 ++	c = fgets(buf, 1000, stdin);
 ++	if (c == NULL)
 ++		std::cerr << "ERROR: fgets failed in assurePath\n";
 + 	treeKey->assureKeyPath(buf);
 + }
 + 
 + 
 + void appendSibbling(TreeKeyIdx *treeKey) {
 + 	if (treeKey->getOffset()) {
 +-		char buf[1023];
 ++	  char buf[1023], *c;
 + 		std::cout << "Enter New Sibbling Name: ";
 +-		fgets(buf, 1000, stdin);
 ++		c = fgets(buf, 1000, stdin);
 ++		if (c == NULL)
 ++			std::cerr << "ERROR: fgets failed in appendSibbling\n";
 + 		treeKey->append();
 + 		treeKey->setLocalName(buf);
 + 		treeKey->save();
- @@ -83,9 +89,11 @@ void appendSibbling(TreeKeyIdx *treeKey)
++@@ -88,9 +94,11 @@
 + 
 + 
 + void appendChild(TreeKeyIdx *treeKey) {
 +-	char buf[1023];
 ++  char buf[1023], *c;
 + 	std::cout << "Enter New Child Name: ";
 +-	fgets(buf, 1000, stdin);
 ++	c = fgets(buf, 1000, stdin);
 ++	if (c == NULL)
 ++		std::cerr << "ERROR: fgets failed in appendChild\n";
 + 	treeKey->appendChild();
 + 	treeKey->setLocalName(buf);
 + 	treeKey->save();
- @@ -118,11 +126,13 @@ int main(int argc, char **argv) {
++@@ -123,11 +131,13 @@
 + 	TreeKeyIdx root = *treeKey;
 + 
 + 	std::string input;
 +-	char line[1024];
 ++	char line[1024], *c;
 + 
 + 	do {
 + 		std::cout << "[" << treeKey->getText() << "] > ";
 +-		fgets(line, 1000, stdin);
 ++		c = fgets(line, 1000, stdin);
 ++		if (c == NULL)
 ++			std::cerr << "ERROR: fgets failed in main\n";
 + 		input = line;
 + 		if (input.length() > 0) {
 + 			switch (input[0]) {
- Index: debian/utilities/gbfidx.cpp
- ===================================================================
- --- debian.orig/utilities/gbfidx.cpp
- +++ debian/utilities/gbfidx.cpp
- @@ -53,7 +53,7 @@ char testmnt;
++--- a/utilities/gbfidx.cpp
+++++ b/utilities/gbfidx.cpp
++@@ -55,7 +55,7 @@
 + int main(int argc, char **argv)
 + {
 + 	long pos, offset;
 +-	int num1, num2, rangemax;
 ++	int num1, num2, rangemax, w;
 + 	char startflag = 0;
 + 	short size;
 + 
- @@ -65,18 +65,30 @@ int main(int argc, char **argv)
-  	num1 = key1.Chapter();
-  	num2 = key1.Verse();
++@@ -67,18 +67,30 @@
++ 	num1 = key1.getChapter();
++ 	num2 = key1.getVerse();
 + 	pos  = 0;
 +-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
 ++	w = write(bfp, &pos, 4);  /* Book    offset for testament intros */
 ++	if (w != 4)
 ++		perror("ERROR: write failed in main");
 + 	pos = 4;
 +-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
 ++	w = write(cfp, &pos, 4);  /* Chapter offset for testament intro */
 ++	if (w != 4)
 ++		perror("ERROR: write failed in main");
 + 
 + 
 + /*	Right now just zero out intros until parsing correctly */
 + 	pos = 0;
 + 	size = 0;
 +-	write(vfp, &pos, 4);  /* Module intro */
 +-	write(vfp, &size, 2);
 +-	write(vfp, &pos, 4);  /* Testament intro */
 +-	write(vfp, &size, 2);
 ++	w = write(vfp, &pos, 4);  /* Module intro */
 ++	if (w != 4)
 ++		perror("ERROR: write failed in main");
 ++	w = write(vfp, &size, 2);
 ++	if (w != 2)
 ++		perror("ERROR: write failed in main");
 ++	w = write(vfp, &pos, 4);  /* Testament intro */
 ++	if (w != 4)
 ++		perror("ERROR: write failed in main");
 ++	w = write(vfp, &size, 2);
 ++	if (w != 2)
 ++		perror("ERROR: write failed in main");
 + 
 + 	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
 + 		if (!startflag) {
- @@ -120,6 +132,7 @@ int main(int argc, char **argv)
++@@ -122,6 +134,7 @@
 + 
 + void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
 + {
 ++	int w;
 + 	long pos;
 + 	short tmp;
 + 
- @@ -127,26 +140,48 @@ void writeidx(VerseKey &key1, VerseKey &
-  		if (key1.Verse() == 1) {	// new chapter
-  			if (key1.Chapter() == 1) {	// new book
++@@ -129,26 +142,48 @@
++ 		if (key1.getVerse() == 1) {	// new chapter
++ 			if (key1.getChapter() == 1) {	// new book
 + 				pos = lseek(cfp, 0, SEEK_CUR);
 +-				write(bfp, &pos, 4);
 ++				w = write(bfp, &pos, 4);
 ++				if (w != 2)
 ++					perror("ERROR: write failed in writeidx");
 + 				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
 +-				write(cfp, &pos, 4);
 +-				write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
 +-				write(vfp, &chapsize, 2);
 ++				w = write(cfp, &pos, 4);
 ++				if (w != 2)
 ++					perror("ERROR: write failed in writeidx");
 ++				w = write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
 ++				if (w != 2)
 ++					perror("ERROR: write failed in writeidx");
 ++				w = write(vfp, &chapsize, 2);
 ++				if (w != 2)
 ++					perror("ERROR: write failed in writeidx");
 + 			}
 + 			pos = lseek(vfp, 0, SEEK_CUR);
 +-			write(cfp, &pos, 4);
 +-			write(vfp, &chapoffset, 4);  /* Chapter intro */
 +-			write(vfp, &chapsize, 2);
 ++			w = write(cfp, &pos, 4);
 ++			if (w != 4)
 ++				perror("ERROR: write failed in writeidx");
 ++			w = write(vfp, &chapoffset, 4);  /* Chapter intro */
 ++			if (w != 4)
 ++				perror("ERROR: write failed in writeidx");
 ++			w = write(vfp, &chapsize, 2);
 ++			if (w != 2)
 ++				perror("ERROR: write failed in writeidx");
 + 		}
 + 		if (key1 >= key2) {
 +-			write(vfp, &offset, 4);
 +-			write(vfp, &size, 2);
 ++			w = write(vfp, &offset, 4);
 ++			if (w != 4)
 ++				perror("ERROR: write failed in writeidx");
 ++			w = write(vfp, &size, 2);
 ++			if (w != 2)
 ++				perror("ERROR: write failed in writeidx");
 + 		}
 + 		else	{
 + 			pos = 0;
 + 			tmp = 0;
 +-			write(vfp, &pos, 4);
 +-			write(vfp, &tmp, 2);
 ++			w = write(vfp, &pos, 4);
 ++			if (w != 4)
 ++				perror("ERROR: write failed in writeidx");
 ++			w = write(vfp, &tmp, 2);
 ++			if (w != 2)
 ++				perror("ERROR: write failed in writeidx");
 + 		}
 + 	}
 + }
- Index: debian/utilities/genbookutil.cpp
- ===================================================================
- --- debian.orig/utilities/genbookutil.cpp
- +++ debian/utilities/genbookutil.cpp
- @@ -53,9 +53,11 @@ void printLocalName(TreeKeyIdx *treeKey)
++--- a/utilities/genbookutil.cpp
+++++ b/utilities/genbookutil.cpp
++@@ -58,9 +58,11 @@
 + 
 + 
 + void setLocalName(TreeKeyIdx *treeKey) {
 +-	char buf[1023];
 ++  char buf[1023], *c;
 + 	std::cout << "Enter New Node Name: ";
 +-	fgets(buf, 1000, stdin);
 ++	c = fgets(buf, 1000, stdin);
 ++	if (c == NULL)
 ++		std::cerr << "ERROR: fgets failed in setLocalName\n";
 + 	SWBuf name = buf;
 + 	treeKey->setLocalName(name.trim());
 + 	treeKey->save();
- @@ -63,18 +65,22 @@ void setLocalName(TreeKeyIdx *treeKey) {
++@@ -68,18 +70,22 @@
 + 
 + 
 + void gotoPath(TreeKeyIdx *treeKey) {
 +-	char buf[1023];
 ++  char buf[1023], *c;
 + 	std::cout << "Enter Path: ";
 +-	fgets(buf, 1000, stdin);
 ++	c = fgets(buf, 1000, stdin);
 ++	if (c == NULL)
 ++		std::cerr << "ERROR: fgets failed in gotoPath\n";
 + 	SWBuf path = buf;
 + 	(*treeKey) = path.trim();
 + }
 + 
 + 
 + void assurePath(TreeKeyIdx *treeKey) {
 +-	char buf[1023];
 ++  char buf[1023], *c;
 + 	std::cout << "Enter Path: ";
 +-	fgets(buf, 1000, stdin);
 ++	c = fgets(buf, 1000, stdin);
 ++	if (c == NULL)
 ++		std::cerr << "ERROR: fgets failed in assurePath\n";
 + 	SWBuf path = buf;
 + 	treeKey->assureKeyPath(path.trim());
 + }
- @@ -91,10 +97,12 @@ void setEntryText(RawGenBook *book) {
++@@ -96,10 +102,12 @@
 + 	SWBuf body;
 + 	TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book);
 + 	if (treeKey->getOffset()) {
 +-		char buf[1023];
 ++	  char buf[1023], *c;
 + 		std::cout << "Enter New Entry Text ('.' on a line by itself to end): \n";
 + 		do {
 +-			fgets(buf, 1000, stdin);
 ++			c = fgets(buf, 1000, stdin);
 ++			if (c == NULL)
 ++				std::cerr << "ERROR: fgets failed in setEntryText\n";
 + 			SWBuf text = buf;
 + 			text.trim();
 + 			if ((text[0] == '.') && (text[1] == 0))
- @@ -111,9 +119,11 @@ void setEntryText(RawGenBook *book) {
++@@ -116,9 +124,11 @@
 + 
 + void appendSibbling(TreeKeyIdx *treeKey) {
 + 	if (treeKey->getOffset()) {
 +-		char buf[1023];
 ++	  char buf[1023], *c;
 + 		std::cout << "Enter New Sibbling Name: ";
 +-		fgets(buf, 1000, stdin);
 ++		c = fgets(buf, 1000, stdin);
 ++		if (c == NULL)
 ++			std::cerr << "ERROR: fgets failed in appendSibbling\n";
 + 		SWBuf name = buf;
 + 		treeKey->append();
 + 		treeKey->setLocalName(name.trim());
- @@ -124,9 +134,11 @@ void appendSibbling(TreeKeyIdx *treeKey)
++@@ -129,9 +139,11 @@
 + 
 + 
 + void appendChild(TreeKeyIdx *treeKey) {
 +-	char buf[1023];
 ++  char buf[1023], *c;
 + 	std::cout << "Enter New Child Name: ";
 +-	fgets(buf, 1000, stdin);
 ++	c = fgets(buf, 1000, stdin);
 ++	if (c == NULL)
 ++		std::cerr << "ERROR: fgets failed in appendChild\n";
 + 	SWBuf name = buf;
 + 	treeKey->appendChild();
 + 	treeKey->setLocalName(name.trim());
- @@ -168,11 +180,13 @@ int main(int argc, char **argv) {
++@@ -173,11 +185,13 @@
 + 	treeKey = (TreeKeyIdx *)(SWKey *)(*book);
 + 
 + 	SWBuf input;
 +-	char line[1024];
 ++	char line[1024], *c;
 + 
 + 	do {
 + 		std::cout << "[" << treeKey->getText() << "] > ";
 +-		fgets(line, 1000, stdin);
 ++		c = fgets(line, 1000, stdin);
 ++		if (c == NULL)
 ++			std::cerr << "ERROR: fgets failed in main\n";
 + 		input = line;
 + 		input.trim();
 + 		if (input.length() > 0) {
- Index: debian/utilities/vpl2mod.cpp
- ===================================================================
- --- debian.orig/utilities/vpl2mod.cpp
- +++ debian/utilities/vpl2mod.cpp
- @@ -72,14 +72,18 @@ char readline(int fd, char **buf) {
++--- a/utilities/vpl2mod.cpp
+++++ b/utilities/vpl2mod.cpp
++@@ -76,14 +76,18 @@
 + 			break;
 + 	}
 + 	
 +-	int size = (lseek(fd, 0, SEEK_CUR) - index) - 1;
 ++	int r, size = (lseek(fd, 0, SEEK_CUR) - index) - 1;
 + 
 + 	*buf = new char [ size + 1 ];
 + 
 + 	if (size > 0) {
 + 		lseek(fd, index, SEEK_SET);
 +-		read(fd, *buf, size);
 +-		read(fd, &ch, 1);   //pop terminating char
 ++		r = read(fd, *buf, size);
 ++		if (r != size)
 ++			std::cerr <<"ERROR: short read in readline\n";
 ++		r = read(fd, &ch, 1);   //pop terminating char
 ++		if (r != size)
 ++			std::cerr <<"ERROR: short read of terminating char in readline\n";
 + 		(*buf)[size] = 0;
 + 
 + 		// clean up any trailing junk on buf
- Index: debian/utilities/installmgr.cpp
- ===================================================================
- --- debian.orig/utilities/installmgr.cpp
- +++ debian/utilities/installmgr.cpp
- @@ -69,8 +69,10 @@ virtual bool isUserDisclaimerConfirmed()
++--- a/utilities/installmgr.cpp
+++++ b/utilities/installmgr.cpp
++@@ -74,8 +74,10 @@
 + 		cout << "then type yes at the prompt\n\n";
 + 		cout << "enable? [no] ";
 + 
 +-		char prompt[10];
 +-		fgets(prompt, 9, stdin);
 ++		char prompt[10], *c;
 ++		c = fgets(prompt, 9, stdin);
 ++		if (c == NULL)
 ++			std::cerr <<"ERROR: fgets failed in isUserDisclaimerConfirmed\n";
 + 		confirmed = (!strcmp(prompt, "yes\n"));
 + 		cout << "\n";
 + 	}
- Index: debian/utilities/step2vpl.cpp
- ===================================================================
- --- debian.orig/utilities/step2vpl.cpp
- +++ debian/utilities/step2vpl.cpp
- @@ -223,93 +223,169 @@ int main(int argc, char **argv) {
++--- a/utilities/step2vpl.cpp
+++++ b/utilities/step2vpl.cpp
++@@ -228,93 +228,169 @@
 + 
 + 
 + void readVersion(int fd, Version *versionRecord) {
 ++	int r;
 + 
 +-	read(fd, &(versionRecord->versionRecordSize), 2);
 +-	read(fd, &(versionRecord->publisherID), 2);
 +-	read(fd, &(versionRecord->bookID), 2);
 +-	read(fd, &(versionRecord->setID), 2);
 +-	read(fd, &(versionRecord->conversionProgramVerMajor), 1);
 +-	read(fd, &(versionRecord->conversionProgramVerMinor), 1);
 +-	read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
 +-	read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
 +-	read(fd, &(versionRecord->encryptionType), 1);
 +-	read(fd, &(versionRecord->editionID), 1);
 +-	read(fd, &(versionRecord->modifiedBy), 2);
 ++	r = read(fd, &(versionRecord->versionRecordSize), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVersion");
 ++
 ++	r = read(fd, &(versionRecord->publisherID), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVersion");
 ++	r = read(fd, &(versionRecord->bookID), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVersion");
 ++	r = read(fd, &(versionRecord->setID), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVersion");
 ++	r = read(fd, &(versionRecord->conversionProgramVerMajor), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 ++	r = read(fd, &(versionRecord->conversionProgramVerMinor), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 ++	r = read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 ++	r = read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 ++	r = read(fd, &(versionRecord->encryptionType), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 ++	r = read(fd, &(versionRecord->editionID), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readVersion");
 ++	r = read(fd, &(versionRecord->modifiedBy), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVersion");
 + 
 + 	int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/;
 + 
 + 	if (skip) {
 + 		char *skipbuf = new char[skip];
 +-		read(fd, skipbuf, skip);
 ++		r = read(fd, skipbuf, skip);
 ++		if (r != skip)
 ++			perror("ERROR: read failed in readVersion");
 + 		delete [] skipbuf;
 + 	}
 + }
 + 
 + 
 + void readSectionsHeader(int fd, SectionsHeader *sectionsHeaderRecord) {
 ++	int r;
 + 
 +-	read(fd, &(sectionsHeaderRecord->sectionsHeaderRecordSize), 2);
 +-	read(fd, &(sectionsHeaderRecord->levelEntriesCount), 4);
 +-	read(fd, &(sectionsHeaderRecord->glossEntriesCount), 4);
 +-	read(fd, &(sectionsHeaderRecord->levelEntriesSize), 2);
 +-	read(fd, &(sectionsHeaderRecord->reserved), 4);
 ++	r = read(fd, &(sectionsHeaderRecord->sectionsHeaderRecordSize), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readSectionsHeader");
 ++	r = read(fd, &(sectionsHeaderRecord->levelEntriesCount), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readSectionsHeader");
 ++	r = read(fd, &(sectionsHeaderRecord->glossEntriesCount), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readSectionsHeader");
 ++	r = read(fd, &(sectionsHeaderRecord->levelEntriesSize), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readSectionsHeader");
 ++	r = read(fd, &(sectionsHeaderRecord->reserved), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readSectionsHeader");
 + 
 + 	int skip = sectionsHeaderRecord->sectionsHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
 + 
 + 	if (skip) {
 + 		char *skipbuf = new char[skip];
 +-		read(fd, skipbuf, skip);
 ++		r = read(fd, skipbuf, skip);
 ++		if (r != skip)
 ++			perror("ERROR: read failed in readSectionsHeader");
 + 		delete [] skipbuf;
 + 	}
 + }
 + 
 + 
 + void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) {
 ++	int r;
 + 
 +-	read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
 +-	read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
 +-	read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
 +-	read(fd, &(viewableHeaderRecord->compressionType), 1);
 +-	read(fd, &(viewableHeaderRecord->reserved1), 1);
 +-	read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
 +-	read(fd, &(viewableHeaderRecord->reserved2), 2);
 ++	r = read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readViewableHeader");
 ++	r = read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readViewableHeader");
 ++	r = read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readViewableHeader");
 ++	r = read(fd, &(viewableHeaderRecord->compressionType), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readViewableHeader");
 ++	r = read(fd, &(viewableHeaderRecord->reserved1), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readViewableHeader");
 ++	r = read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readViewableHeader");
 ++	r = read(fd, &(viewableHeaderRecord->reserved2), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readViewableHeader");
 + 
 + 	int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
 + 
 + 	if (skip) {
 + 		char *skipbuf = new char[skip];
 +-		read(fd, skipbuf, skip);
 ++		r = read(fd, skipbuf, skip);
 ++		if (r != skip)
 ++			perror("ERROR: read failed in readViewableHeader");
 + 		delete [] skipbuf;
 + 	}
 + }
 + 
 + 
 + void readVSyncHeader(int fd, VSyncHeader *vSyncHeaderRecord) {
 ++	int r;
 + 
 +-	read(fd, &(vSyncHeaderRecord->vSyncHeaderRecordSize), 2);
 +-	read(fd, &(vSyncHeaderRecord->startBookNumber), 2);
 +-	read(fd, &(vSyncHeaderRecord->endBookNumber), 2);
 +-	read(fd, &(vSyncHeaderRecord->bookPointerEntriesSize), 2);
 +-	read(fd, &(vSyncHeaderRecord->syncPointEntriesSize), 2);
 +-	read(fd, &(vSyncHeaderRecord->reserved1_1), 4);
 +-	read(fd, &(vSyncHeaderRecord->reserved1_2), 2);
 ++	r = read(fd, &(vSyncHeaderRecord->vSyncHeaderRecordSize), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVSyncHeader");
 ++	r = read(fd, &(vSyncHeaderRecord->startBookNumber), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVSyncHeader");
 ++	r = read(fd, &(vSyncHeaderRecord->endBookNumber), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVSyncHeader");
 ++	r = read(fd, &(vSyncHeaderRecord->bookPointerEntriesSize), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVSyncHeader");
 ++	r = read(fd, &(vSyncHeaderRecord->syncPointEntriesSize), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVSyncHeader");
 ++	r = read(fd, &(vSyncHeaderRecord->reserved1_1), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readVSyncHeader");
 ++	r = read(fd, &(vSyncHeaderRecord->reserved1_2), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readVSyncHeader");
 + 
 + 	int skip = vSyncHeaderRecord->vSyncHeaderRecordSize - 16/*sizeof(VSyncHeader)*/;
 + 
 + 	if (skip) {
 + 		char *skipbuf = new char[skip];
 +-		read(fd, skipbuf, skip);
 ++		r = read(fd, skipbuf, skip);
 ++		if (r != skip)
 ++			perror("ERROR: read failed in readVSyncHeader");
 + 		delete [] skipbuf;
 + 	}
 + }
 + 
 + 
 + void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) {
 ++	int r;
 + 	unsigned long size = vb->size;
 + 
 + 	*buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ];
 + 	lseek(fd, vb->offset, SEEK_SET);
 +-	read(fd, *buf, vb->size);
 ++	r = read(fd, *buf, vb->size);
 ++	if (r != vb->size)
 ++		perror("ERROR: read failed in readViewableBlockText");
 + 
 + 	compress->zBuf(&size, *buf);
 + 	strcpy(*buf, compress->Buf());
- @@ -317,35 +393,53 @@ void readViewableBlockText(int fd, Viewa
++@@ -322,35 +398,53 @@
 + 
 + 
 + void readViewableBlock(int fd, ViewableBlock *vb) {
 ++	int r;
 + 
 +-	read(fd, &(vb->offset), 4);
 +-	read(fd, &(vb->uncompressedSize), 4);
 +-	read(fd, &(vb->size), 4);
 ++	r = read(fd, &(vb->offset), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readViewableBlock");
 ++	r = read(fd, &(vb->uncompressedSize), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readViewableBlock");
 ++	r = read(fd, &(vb->size), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readViewableBlock");
 + }
 + 
 + 
 + void readHeaderControlWordAreaText(int fd, char **buf) {
 ++	int r;
 + 	long headerControlWordAreaSize;
 +-	read(fd, &headerControlWordAreaSize, 4);
 ++	r = read(fd, &headerControlWordAreaSize, 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readHeaderControlWordAreaText");
 + 
 + 	*buf = new char [headerControlWordAreaSize + 1];
 + 
 +-	read(fd, *buf, headerControlWordAreaSize);
 ++	r = read(fd, *buf, headerControlWordAreaSize);
 ++	if (r != headerControlWordAreaSize)
 ++		perror("ERROR: read failed in readHeaderControlWordAreaText");
 + 	(*buf)[headerControlWordAreaSize] = 0;
 + 
 + }
 + 
 + void readVSyncBooksInfo(int fd, VSyncHeader *vSyncHeaderRecord, VSyncBooksInfo **vSyncBooksInfo) {
 + 
 ++	int r;
 + 	int bookCount = vSyncHeaderRecord->endBookNumber - vSyncHeaderRecord->startBookNumber;
 + 	*vSyncBooksInfo = new VSyncBooksInfo[bookCount];
 + 	for (int i = 0; i <= bookCount; i++) {
 +-		read(fd, &(*vSyncBooksInfo)[i].offset, 4);
 +-		read(fd, &(*vSyncBooksInfo)[i].count, 2);
 ++		r = read(fd, &(*vSyncBooksInfo)[i].offset, 4);
 ++		if (r != 4)
 ++			perror("ERROR: read failed in readVSyncBooksInfo");
 ++		r = read(fd, &(*vSyncBooksInfo)[i].count, 2);
 ++		if (r != 2)
 ++			perror("ERROR: read failed in readVSyncBooksInfo");
 + 	}
 + }
 + 
 + void displayBook(int fdbook, int fdviewable, int fdvsync, int fdsections, VSyncBooksInfo *vSyncBooksInfo) {
 ++	int r;
 + 	VSyncPoint vSyncPoint;
 + 
 + 	lseek(fdvsync, vSyncBooksInfo->offset, SEEK_SET);
- @@ -356,9 +450,15 @@ void displayBook(int fdbook, int fdviewa
++@@ -361,9 +455,15 @@
 + 		char *sectionName;
 + 		char *verseText;
 + 
 +-		read(fdvsync, &(vSyncPoint.chapter), 2);
 +-		read(fdvsync, &(vSyncPoint.verse), 2);
 +-		read(fdvsync, &(vSyncPoint.offset), 4);
 ++		r = read(fdvsync, &(vSyncPoint.chapter), 2);
 ++		if (r != 2)
 ++			perror("ERROR: read failed in displayBook");
 ++		r = read(fdvsync, &(vSyncPoint.verse), 2);
 ++		if (r != 2)
 ++			perror("ERROR: read failed in displayBook");
 ++		r = read(fdvsync, &(vSyncPoint.offset), 4);
 ++		if (r != 4)
 ++			perror("ERROR: read failed in displayBook");
 + 		vSyncPoint.offset = SECTIONSLEVELSTART + (vSyncPoint.offset * SECTIONSLEVELSIZE);
 + 		lseek(fdsections, vSyncPoint.offset, SEEK_SET);
 + 		readSectionLevelInfo(fdsections, &sectionLevelInfo);
- @@ -413,26 +513,50 @@ void extractVerseText(int fdviewable, in
++@@ -418,26 +518,50 @@
 + 
 + 
 + void readSectionName(int fd, SectionLevelInfo *sli, char **name) {
 ++	int r;
 + 	short size;
 + 	lseek(fd, sli->nameOffset, SEEK_SET);
 +-	read(fd, &size, 2);
 ++	r = read(fd, &size, 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readSectionName");
 + 	*name = new char [ size + 1 ];
 +-	read(fd, *name, size);
 ++	r = read(fd, *name, size);
 ++	if (r != size)
 ++		perror("ERROR: read failed in readSectionName");
 + 	(*name)[size] = 0;
 + }
 + 
 + void readSectionLevelInfo(int fd, SectionLevelInfo *sli) {
 ++	int r;
 + 
 +-	read(fd, &(sli->parentOffset), 4);
 +-	read(fd, &(sli->previousOffset), 4);
 +-	read(fd, &(sli->nextOffset), 4);
 +-	read(fd, &(sli->viewableOffset), 4);
 ++	r = read(fd, &(sli->parentOffset), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readSectionLevelInfo");
 ++	r = read(fd, &(sli->previousOffset), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readSectionLevelInfo");
 ++	r = read(fd, &(sli->nextOffset), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readSectionLevelInfo");
 ++	r = read(fd, &(sli->viewableOffset), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readSectionLevelInfo");
 + 	sli->viewableOffset = VIEWABLEBLOCKSTART + (VIEWABLEBLOCKSIZE * sli->viewableOffset);
 +-	read(fd, &(sli->startLevel), 2);
 +-	read(fd, &(sli->level), 1);
 +-	read(fd, &(sli->nameOffset), 4);
 +-	read(fd, &(sli->outSync_1), 4);
 +-	read(fd, &(sli->outSync_2), 2);
 ++	r = read(fd, &(sli->startLevel), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readSectionLevelInfo");
 ++	r = read(fd, &(sli->level), 1);
 ++	if (r != 1)
 ++		perror("ERROR: read failed in readSectionLevelInfo");
 ++	r = read(fd, &(sli->nameOffset), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readSectionLevelInfo");
 ++	r = read(fd, &(sli->outSync_1), 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in readSectionLevelInfo");
 ++	r = read(fd, &(sli->outSync_2), 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in readSectionLevelInfo");
 + }
 + 
 + void cleanBuf(char *buf) {
- Index: debian/utilities/cipherraw.cpp
- ===================================================================
- --- debian.orig/utilities/cipherraw.cpp
- +++ debian/utilities/cipherraw.cpp
- @@ -48,7 +48,7 @@ int main(int argc, char **argv) {
++--- a/utilities/cipherraw.cpp
+++++ b/utilities/cipherraw.cpp
++@@ -53,7 +53,7 @@
 + 	SWCipher *zobj;
 + 	VerseKey key;
 + 	RawVerse *rawdrv;
 +-	int ofd[2], oxfd[2];
 ++	int ofd[2], oxfd[2], w;
 + 	long tmpoff = 0, offset, loffset = 0, lzoffset = 0;
 + 	unsigned short size, lsize = 0, lzsize;
 + 	char *tmpbuf;
- @@ -74,10 +74,18 @@ int main(int argc, char **argv) {
++@@ -79,10 +79,18 @@
 + 	delete [] tmpbuf;
 + 
 + 	printf("\n");
 +-	write(oxfd[0], &lzoffset, 4);
 +-	write(oxfd[0], &lzsize, 2);
 +-	write(oxfd[1], &lzoffset, 4);
 +-	write(oxfd[1], &lzsize, 2);
 ++	w = write(oxfd[0], &lzoffset, 4);
 ++	if (w < 0)
 ++		perror("ERROR: write failed in main");
 ++	w = write(oxfd[0], &lzsize, 2);
 ++	if (w < 0)
 ++		perror("ERROR: write failed in main");
 ++	w = write(oxfd[1], &lzoffset, 4);
 ++	if (w < 0)
 ++		perror("ERROR: write failed in main");
 ++	w = write(oxfd[1], &lzsize, 2);
 ++	if (w < 0)
 ++		perror("ERROR: write failed in main");
 + 
-  	key.AutoNormalize(0);
-  	key.Headings(1);
- @@ -89,8 +97,13 @@ int main(int argc, char **argv) {
++ 	key.setAutoNormalize(false);
++ 	key.setIntros(true);
++@@ -94,8 +102,10 @@
 + 			printf("using previous offset,size %d\n", size);
-  			offset = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR);
++ 			offset = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR);
 + 			printf("%ld %ld %d \n", offset, lzoffset, lzsize);
- -			write(oxfd[key.Testament() - 1], &lzoffset, 4);
- -			write(oxfd[key.Testament() - 1], &lzsize, 2);
- +			w = write(oxfd[key.Testament() - 1], &lzoffset, 4);
- +			if (w < 0)
- +				perror("ERROR: write failed in main");
- +
- +			w = write(oxfd[key.Testament() - 1], &lzsize, 2);
- +			if (w < 0)
- +				perror("ERROR: write failed in main");
++-			write(oxfd[key.getTestament() - 1], &lzoffset, 4);
++-			write(oxfd[key.getTestament() - 1], &lzsize, 2);
+++			if (write(oxfd[key.getTestament() - 1], &lzoffset, 4) < 0)
+++                            perror("ERROR: write failed in main");
+++			if (write(oxfd[key.getTestament() - 1], &lzsize, 2) < 0)
+++                            perror("ERROR: write failed in main");
 + 		}
 + 		else {
 + 			lsize   = size;
- @@ -107,13 +120,23 @@ int main(int argc, char **argv) {
-  			offset = lseek(ofd[key.Testament() - 1], 0, SEEK_CUR);
-  			tmpoff = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR);
++@@ -112,13 +122,17 @@
++ 			offset = lseek(ofd[key.getTestament() - 1], 0, SEEK_CUR);
++ 			tmpoff = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR);
 + 			printf("%s: (%ld) NEW offset: %ld; size: %d\n", (const char *)key, tmpoff, offset, size);
- -			write(oxfd[key.Testament() - 1], &offset, 4);
- +			w = write(oxfd[key.Testament() - 1], &offset, 4);
- +			if (w < 0)
- +				perror("ERROR: write failed in main");
- +
++-			write(oxfd[key.getTestament() - 1], &offset, 4);
+++			if (write(oxfd[key.getTestament() - 1], &offset, 4) < 0)
+++                            perror("ERROR: write failed in main");
 + 			unsigned long ulSize = size;
 +-			if (size) 
- -				write(ofd[key.Testament() - 1], zobj->cipherBuf(&ulSize), size);
++-				write(ofd[key.getTestament() - 1], zobj->cipherBuf(&ulSize), size);
 ++			if (size) {
- +				w = write(ofd[key.Testament() - 1], zobj->cipherBuf(&ulSize), size);
- +				if (w < 0)
- +					perror("ERROR: write failed in main");
- +			}
- +
+++                            if (write(ofd[key.getTestament() - 1], zobj->cipherBuf(&ulSize), size) < 0)
+++                            perror("ERROR: write failed in main");
+++                        }
 + 			size = (unsigned int)ulSize;
 + 			lzoffset = offset;
- -			write(oxfd[key.Testament() - 1], &size, 2);
- +			w = write(oxfd[key.Testament() - 1], &size, 2);
- +			if (w < 0)
- +				perror("ERROR: write failed in main");
- +
++-			write(oxfd[key.getTestament() - 1], &size, 2);
+++			if (write(oxfd[key.getTestament() - 1], &size, 2) < 0)
+++                            perror("ERROR: write failed in main");
 + 			lzsize = size;
 + 		}
 + 	}
- Index: debian/utilities/lexdump.c
- ===================================================================
- --- debian.orig/utilities/lexdump.c
- +++ debian/utilities/lexdump.c
- @@ -40,7 +40,7 @@
++--- a/utilities/lexdump.c
+++++ b/utilities/lexdump.c
++@@ -45,7 +45,7 @@
 + 
 + int main(int argc, char **argv) {
 + 	char *tmpbuf;
 +-	int idxfd, datfd;
 ++	int idxfd, datfd, r;
 + 	long offset;
 + 	unsigned int size;
 + 	char datbuf[255];
- @@ -59,11 +59,17 @@ int main(int argc, char **argv) {
++@@ -64,11 +64,17 @@
 + 
 + 	offset = atoi(argv[2]) * 6;
 + 	lseek(idxfd, offset, SEEK_SET);
 +-	read(idxfd, &offset, 4);
 +-	read(idxfd, &size, 2);
 ++	r = read(idxfd, &offset, 4);
 ++	if (r != 4)
 ++		perror("ERROR: read failed in main");
 ++	r = read(idxfd, &size, 2);
 ++	if (r != 2)
 ++		perror("ERROR: read failed in main");
 + 	printf("offset: %ld; size: %d\n", offset, size);
 + 	lseek(datfd, offset, SEEK_SET);
 +-	read(datfd, datbuf, 40);
 ++	r = read(datfd, datbuf, 40);
 ++	if (r != 40)
 ++		perror("ERROR: read failed in main");
 + 	datbuf[40] = 0;
 + 	printf("%s\n", datbuf);
 + 	close(datfd);
- Index: debian/tests/ciphertest.cpp
- ===================================================================
- --- debian.orig/tests/ciphertest.cpp
- +++ debian/tests/ciphertest.cpp
- @@ -30,7 +30,7 @@ int main(int argc, char **argv) {
-  	}
-  
-  	
- -	int encipher = atoi(argv[2]);
- +	long encipher = atoi(argv[2]);
-  
-  	SWFilter *filter = new CipherFilter(argv[1]);
-  
diff --cc debian/patches/13_curl.diff
index 2d3fc68,0000000..8cd9df8
mode 100644,000000..100644
--- a/debian/patches/13_curl.diff
+++ b/debian/patches/13_curl.diff
@@@ -1,19 -1,0 +1,19 @@@
 +revno: 2452
 +svn revno: 2506 (on /trunk)
 +committer: scribe
 +timestamp: Sat 2010-03-20 11:49:54 +0000
 +message:
 +  applied Karl's patch to fix libcurl problem with status reporter data.
 +
 +--- a/src/mgr/curlftpt.cpp
 ++++ b/src/mgr/curlftpt.cpp
- @@ -180,6 +180,9 @@
++@@ -186,6 +186,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);
 ++
 + 		if(CURLE_OK != res) {
 + 			retVal = -1;
 + 		}
diff --cc debian/patches/dso-missing-shared.patch
index 94b540b,0000000..1b9c1b4
mode 100644,000000..100644
--- a/debian/patches/dso-missing-shared.patch
+++ b/debian/patches/dso-missing-shared.patch
@@@ -1,15 -1,0 +1,15 @@@
 +Description: clucene-shared is missing
 +Author: Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>
 +Bug-Debian: http://bugs.debian.org/707537
 +
- --- sword-1.6.2+dfsg.orig/CMakeLists.txt
- +++ sword-1.6.2+dfsg/CMakeLists.txt
- @@ -162,7 +162,7 @@ IF(WITH_CURL)
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -190,7 +190,7 @@
 + ENDIF(WITH_CURL)
 + IF(WITH_CLUCENE)
 + 	INCLUDE_DIRECTORIES(${CLUCENE_INCLUDE_DIR})
 +-	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CLUCENE_LIBRARY})
 ++	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CLUCENE_LIBRARY} -lclucene-shared)
 + 	LINK_DIRECTORIES(${CLUCENE_LIBRARY_DIR})
 + 	ADD_DEFINITIONS(-DUSELUCENE)
 + 	IF(CLUCENE2)
diff --cc debian/patches/no-included-zconf.h.diff
index 8286ead,0000000..5205051
mode 100644,000000..100644
--- a/debian/patches/no-included-zconf.h.diff
+++ b/debian/patches/no-included-zconf.h.diff
@@@ -1,292 -1,0 +1,292 @@@
- --- a/include/zconf.h	2005-01-01 05:42:26.000000000 +0100
- +++ /dev/null	2012-07-03 16:36:49.000000000 +0200
++--- a/include/zconf.h
+++++ /dev/null
 +@@ -1,279 +0,0 @@
 +-/* zconf.h -- configuration of the zlib compression library
 +- * Copyright (C) 1995-2002 Jean-loup Gailly.
 +- * For conditions of distribution and use, see copyright notice in zlib.h 
 +- */
 +-
 +-/* @(#) $Id: zconf.h 1688 2005-01-01 04:42:26Z scribe $ */
 +-
 +-#ifndef _ZCONF_H
 +-#define _ZCONF_H
 +-
 +-/*
 +- * If you *really* need a unique prefix for all types and library functions,
 +- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
 +- */
 +-#ifdef Z_PREFIX
 +-#  define deflateInit_	z_deflateInit_
 +-#  define deflate	z_deflate
 +-#  define deflateEnd	z_deflateEnd
 +-#  define inflateInit_ 	z_inflateInit_
 +-#  define inflate	z_inflate
 +-#  define inflateEnd	z_inflateEnd
 +-#  define deflateInit2_	z_deflateInit2_
 +-#  define deflateSetDictionary z_deflateSetDictionary
 +-#  define deflateCopy	z_deflateCopy
 +-#  define deflateReset	z_deflateReset
 +-#  define deflateParams	z_deflateParams
 +-#  define inflateInit2_	z_inflateInit2_
 +-#  define inflateSetDictionary z_inflateSetDictionary
 +-#  define inflateSync	z_inflateSync
 +-#  define inflateSyncPoint z_inflateSyncPoint
 +-#  define inflateReset	z_inflateReset
 +-#  define compress	z_compress
 +-#  define compress2	z_compress2
 +-#  define uncompress	z_uncompress
 +-#  define adler32	z_adler32
 +-#  define crc32		z_crc32
 +-#  define get_crc_table z_get_crc_table
 +-
 +-#  define Byte		z_Byte
 +-#  define uInt		z_uInt
 +-#  define uLong		z_uLong
 +-#  define Bytef	        z_Bytef
 +-#  define charf		z_charf
 +-#  define intf		z_intf
 +-#  define uIntf		z_uIntf
 +-#  define uLongf	z_uLongf
 +-#  define voidpf	z_voidpf
 +-#  define voidp		z_voidp
 +-#endif
 +-
 +-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
 +-#  define WIN32
 +-#endif
 +-#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
 +-#  ifndef __32BIT__
 +-#    define __32BIT__
 +-#  endif
 +-#endif
 +-#if defined(__MSDOS__) && !defined(MSDOS)
 +-#  define MSDOS
 +-#endif
 +-
 +-/*
 +- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
 +- * than 64k bytes at a time (needed on systems with 16-bit int).
 +- */
 +-#if defined(MSDOS) && !defined(__32BIT__)
 +-#  define MAXSEG_64K
 +-#endif
 +-#ifdef MSDOS
 +-#  define UNALIGNED_OK
 +-#endif
 +-
 +-#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
 +-#  define STDC
 +-#endif
 +-#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
 +-#  ifndef STDC
 +-#    define STDC
 +-#  endif
 +-#endif
 +-
 +-#ifndef STDC
 +-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
 +-#    define const
 +-#  endif
 +-#endif
 +-
 +-/* Some Mac compilers merge all .h files incorrectly: */
 +-#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
 +-#  define NO_DUMMY_DECL
 +-#endif
 +-
 +-/* Old Borland C incorrectly complains about missing returns: */
 +-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
 +-#  define NEED_DUMMY_RETURN
 +-#endif
 +-
 +-
 +-/* Maximum value for memLevel in deflateInit2 */
 +-#ifndef MAX_MEM_LEVEL
 +-#  ifdef MAXSEG_64K
 +-#    define MAX_MEM_LEVEL 8
 +-#  else
 +-#    define MAX_MEM_LEVEL 9
 +-#  endif
 +-#endif
 +-
 +-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
 +- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
 +- * created by gzip. (Files created by minigzip can still be extracted by
 +- * gzip.)
 +- */
 +-#ifndef MAX_WBITS
 +-#  define MAX_WBITS   15 /* 32K LZ77 window */
 +-#endif
 +-
 +-/* The memory requirements for deflate are (in bytes):
 +-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
 +- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
 +- plus a few kilobytes for small objects. For example, if you want to reduce
 +- the default memory requirements from 256K to 128K, compile with
 +-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
 +- Of course this will generally degrade compression (there's no free lunch).
 +-
 +-   The memory requirements for inflate are (in bytes) 1 << windowBits
 +- that is, 32K for windowBits=15 (default value) plus a few kilobytes
 +- for small objects.
 +-*/
 +-
 +-                        /* Type declarations */
 +-
 +-#ifndef OF /* function prototypes */
 +-#  ifdef STDC
 +-#    define OF(args)  args
 +-#  else
 +-#    define OF(args)  ()
 +-#  endif
 +-#endif
 +-
 +-/* The following definitions for FAR are needed only for MSDOS mixed
 +- * model programming (small or medium model with some far allocations).
 +- * This was tested only with MSC; for other MSDOS compilers you may have
 +- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
 +- * just define FAR to be empty.
 +- */
 +-#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
 +-   /* MSC small or medium model */
 +-#  define SMALL_MEDIUM
 +-#  ifdef _MSC_VER
 +-#    define FAR _far
 +-#  else
 +-#    define FAR far
 +-#  endif
 +-#endif
 +-#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
 +-#  ifndef __32BIT__
 +-#    define SMALL_MEDIUM
 +-#    define FAR _far
 +-#  endif
 +-#endif
 +-
 +-/* Compile with -DZLIB_DLL for Windows DLL support */
 +-#if defined(ZLIB_DLL)
 +-#  if defined(_WINDOWS) || defined(WINDOWS)
 +-#    ifdef FAR
 +-#      undef FAR
 +-#    endif
 +-#    include <windows.h>
 +-#    define ZEXPORT  WINAPI
 +-#    ifdef WIN32
 +-#      define ZEXPORTVA  WINAPIV
 +-#    else
 +-#      define ZEXPORTVA  FAR _cdecl _export
 +-#    endif
 +-#  endif
 +-#  if defined (__BORLANDC__)
 +-#    if (__BORLANDC__ >= 0x0500) && defined (WIN32)
 +-#      include <windows.h>
 +-#      define ZEXPORT __declspec(dllexport) WINAPI
 +-#      define ZEXPORTRVA __declspec(dllexport) WINAPIV
 +-#    else
 +-#      if defined (_Windows) && defined (__DLL__)
 +-#        define ZEXPORT _export
 +-#        define ZEXPORTVA _export
 +-#      endif
 +-#    endif
 +-#  endif
 +-#endif
 +-
 +-#if defined (__BEOS__)
 +-#  if defined (ZLIB_DLL)
 +-#    define ZEXTERN extern __declspec(dllexport)
 +-#  else
 +-#    define ZEXTERN extern __declspec(dllimport)
 +-#  endif
 +-#endif
 +-
 +-#ifndef ZEXPORT
 +-#  define ZEXPORT
 +-#endif
 +-#ifndef ZEXPORTVA
 +-#  define ZEXPORTVA
 +-#endif
 +-#ifndef ZEXTERN
 +-#  define ZEXTERN extern
 +-#endif
 +-
 +-#ifndef FAR
 +-#   define FAR
 +-#endif
 +-
 +-#if !defined(MACOS) && !defined(TARGET_OS_MAC) && !defined(VCL)
 +-typedef unsigned char  Byte;  /* 8 bits */
 +-#endif
 +-typedef unsigned int   uInt;  /* 16 bits or more */
 +-typedef unsigned long  uLong; /* 32 bits or more */
 +-
 +-#ifdef SMALL_MEDIUM
 +-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
 +-#  define Bytef Byte FAR
 +-#else
 +-   typedef unsigned char FAR Bytef;
 +-#endif
 +-typedef char  FAR charf;
 +-typedef int   FAR intf;
 +-typedef uInt  FAR uIntf;
 +-typedef uLong FAR uLongf;
 +-
 +-#ifdef STDC
 +-   typedef void FAR *voidpf;
 +-   typedef void     *voidp;
 +-#else
 +-   typedef Byte FAR *voidpf;
 +-   typedef Byte     *voidp;
 +-#endif
 +-
 +-#ifdef HAVE_UNISTD_H
 +-#  include <sys/types.h> /* for off_t */
 +-#  include <unistd.h>    /* for SEEK_* and off_t */
 +-#  define z_off_t  off_t
 +-#endif
 +-#ifndef SEEK_SET
 +-#  define SEEK_SET        0       /* Seek from beginning of file.  */
 +-#  define SEEK_CUR        1       /* Seek from current position.  */
 +-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
 +-#endif
 +-#ifndef z_off_t
 +-#  define  z_off_t long
 +-#endif
 +-
 +-/* MVS linker does not support external names larger than 8 bytes */
 +-#if defined(__MVS__)
 +-#   pragma map(deflateInit_,"DEIN")
 +-#   pragma map(deflateInit2_,"DEIN2")
 +-#   pragma map(deflateEnd,"DEEND")
 +-#   pragma map(inflateInit_,"ININ")
 +-#   pragma map(inflateInit2_,"ININ2")
 +-#   pragma map(inflateEnd,"INEND")
 +-#   pragma map(inflateSync,"INSY")
 +-#   pragma map(inflateSetDictionary,"INSEDI")
 +-#   pragma map(inflate_blocks,"INBL")
 +-#   pragma map(inflate_blocks_new,"INBLNE")
 +-#   pragma map(inflate_blocks_free,"INBLFR")
 +-#   pragma map(inflate_blocks_reset,"INBLRE")
 +-#   pragma map(inflate_codes_free,"INCOFR")
 +-#   pragma map(inflate_codes,"INCO")
 +-#   pragma map(inflate_fast,"INFA")
 +-#   pragma map(inflate_flush,"INFLU")
 +-#   pragma map(inflate_mask,"INMA")
 +-#   pragma map(inflate_set_dictionary,"INSEDI2")
 +-#   pragma map(inflate_copyright,"INCOPY")
 +-#   pragma map(inflate_trees_bits,"INTRBI")
 +-#   pragma map(inflate_trees_dynamic,"INTRDY")
 +-#   pragma map(inflate_trees_fixed,"INTRFI")
 +-#   pragma map(inflate_trees_free,"INTRFR")
 +-#endif
 +-
 +-#endif /* _ZCONF_H */
- --- a/cmake/sources.cmake-old	2013-08-04 17:07:19.448157271 +0200
- +++ b/cmake/sources.cmake	2013-08-04 17:07:29.192157017 +0200
- @@ -383,7 +383,6 @@
++--- a/cmake/sources.cmake
+++++ b/cmake/sources.cmake
++@@ -394,7 +394,6 @@
 + 	include/versekey.h
 + 	include/versetreekey.h
 + 	include/zcom.h
 +-	include/zconf.h
 + 	include/zipcomprs.h
 + 	include/zld.h
 + 	include/zstr.h
diff --cc debian/patches/series
index 0b77828,0000000..f081236
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,12 -1,0 +1,12 @@@
 +12_fix_compiler_warnings.diff
 +13_curl.diff
- 16_gcc4.6_sword.patch
- 2631_fix_curl.patch
- cmake_backport.patch
- icu_in_soname.patch
- fix-ftbfs-gcc4.7.diff
- fix-ftbfs-icu.patch
- 2661.patch
++#16_gcc4.6_sword.patch
++#2631_fix_curl.patch
++#cmake_backport.patch
++#icu_in_soname.patch
++#fix-ftbfs-gcc4.7.diff
++#fix-ftbfs-icu.patch
++#2661.patch
 +multiarch-clucene.patch
 +no-included-zconf.h.diff
 +dso-missing-shared.patch
diff --cc debian/rules
index 89b2761,0000000..122ff73
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,48 -1,0 +1,48 @@@
 +#!/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")
 +bd :=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 +
 +WFLAGS   := -Wall -Werror
 +CFLAGS    = $(shell dpkg-buildflags --get CFLAGS) $(WFLAGS)
 +CXXFLAGS  = $(shell dpkg-buildflags --get CXXFLAGS) $(WFLAGS)
 +
 +%:
 +	dh $@
 +override_dh_auto_configure:
 +	dh_auto_configure -Scmake -- \
 +	-DLIBSWORD_LIBRARY_TYPE="Shared Static" \
- 	-DLIBSWORD_SOVERSION=9 \
++	-DLIBSWORD_SOVERSION=10 \
 +	-DSWORD_GLOBAL_CONF_DIR='/etc' \
 +	-DCMAKE_BUILD_TYPE=NONE \
 +	-DSWORD_BUILD_TESTS="Yes" \
 +	-DCLucene_FIND_REQUIRED="Yes"
 +debian/man/%.1: debian/man/%.1.pod
 +	pod2man --release="SWORD $(ver)" --center "Sword Module Utilities" $< > $@
 +override_dh_auto_build: $(basename $(wildcard debian/man/*.pod))
 +	dh_auto_build -Scmake --parallel
 +override_dh_auto_test:
 +	$(shell cd tests/testsuite && ./runall.sh 1>&2)
 +override_dh_auto_install:
 +	dh_auto_install -Scmake
 +override_dh_install:
 +	chrpath -d debian/tmp/usr/bin/* debian/tmp/usr/lib/*so*
 +	dh_install --list-missing
 +	# Fixes FTBFS if running binary-arch target only
 +	-chmod -x debian/libsword-common/usr/share/sword/locales.d/*
 +override_dh_strip:
 +	dh_strip --dbg-package=libsword-dbg
 +override_dh_makeshlibs:
 +	dh_makeshlibs -V
 +override_dh_clean:
 +	dh_clean $(patsubst %.pod, %, $(wildcard debian/man/*.pod))
 +
 +MAKEFILE = $(firstword $(MAKEFILE_LIST))
 +SOURCE_DIR = $(dir $(MAKEFILE))/..
 +get-orig-source:
 +	chmod +x $(SOURCE_DIR)/debian/dfsg.sh
 +	cd $(SOURCE_DIR) && uscan --force-download --rename --destdir .
 +
 +override_dh_builddeb:
 +	dh_builddeb $(if $(ppa),-- -Zlzma)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-crosswire/sword.git



More information about the Pkg-crosswire-commits mailing list