debian/0000775000000000000000000000000012257206433007174 5ustar debian/README.Debian0000664000000000000000000000144111721266073011236 0ustar You can download extra modules from: http://www.crosswire.org/sword/modules/ then install modules in /usr/local/share/sword # cd /usr/local/share/sword # unzip ~/SwordMod.zip That method of install is not supported. Alternatively, for use on a user by user basis install them to ~/.sword Another alternative is to use the new commandline installmgr application, or use BibleTime's install functionality. To use installmgr - by default it will install to ~/.sword the default remoteSrcName is crosswire: $ installmgr -init $ installmgr -r $ installmgr -rl list available modules from remote source $ installmgr -ri install module from remote source Also, feel free to join us on IRC at irc.freenode.net #sword :) Daniel debian/libsword-dev.links0000664000000000000000000000005211737633260012640 0ustar usr/lib/libsword.so.9 usr/lib/libsword.so debian/source/0000775000000000000000000000000012177515622010500 5ustar debian/source/format0000664000000000000000000000001411721266073011703 0ustar 3.0 (quilt) debian/libsword9.docs0000664000000000000000000000006111721266073011762 0ustar doc/greektrans.txt doc/translation-template.conf debian/libsword-dev.install0000664000000000000000000000006111721266073013163 0ustar usr/include usr/lib/libsword.a usr/lib/pkgconfig debian/copyright0000664000000000000000000000777011733671326011147 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: The SWORD Project Upstream-Contact: Members of the SWORD Project team The CrossWire Bible Society P. O. Box 2528 Tempe, AZ 85280-2528 Source: http://www.crosswire.org/sword/software/swordapi.jsp Comment: Note that the original source tarball was repackaged to remove some non-free files, and other convenience copies of libraries. There is a get-orig-source rule in debian/rules which does this repacking. The files removed are: . src/utilfuns/zlib/[a-tv-z]* # an old copy of the zlib library src/utilfuns/zlib/uncompr.c # more of zlib include/zlib.h # zlib header file src/utilfuns/regex.c # modified GNU C library include/regex.h # modified GNU C library header file src/utilfuns/win32/* # a non-free dirent for Windows bindings/gsoap/include/stdsoap.h # non-free header file Files: * Copyright: 1996-2009 CrossWire Bible Society License: GPL-2 Files: include/installmgr.h include/rawverse.h include/defs.h include/rawverse.h include/rawverse4.h include/sysdata.h include/ftpparse.h include/nullim.h include/multimapwdef.h include/entriesblk.h bindings/swig/searcher.h bindings/swig/rendercallback.h bindings/swig/markupcallback.h bindings/swig/package/searcher.h bindings/swig/package/rendercallback.h bindings/swig/package/autogen.sh bindings/swig/package/markupcallback.h bindings/bcppmake/MainCLXTest.h bindings/bcppmake/MainTest.h bindings/autogen.sh Copyright: Unknown License: Unknown Probable copyright holder CrossWire Bible Society. Probable intended license GPL-2 . include/ftpparse.h - C++ wrapper Files: include/untgz.h src/utilfuns/zlib/untgz.c Copyright: Pedro A. Aranda Guti\irrez Jean-loup Gailly Comment: The author of zlib has made changes to untgz.c, it is shipped in the zlib Debian tarball, but is not installed/compiled. So I think we can assume the zlib/libpng license. License: ZLIB Files: include/sapphire.h src/modules/common/sapphire.cpp Copyright: Michael Paul Johnson License: Public Domain Files: bindings/corba/java/src/org/crosswire/util/Base64.java Copyright: Robert Harder License: Public Domain - Base64 Files: debian/* Copyright: 2009 CrossWire Packaging Team -2008 Daniel Glassey License: GPL-2+ License: GPL-2+ On Debian systems, the complete text of the GNU General Public License, version 2, can be found in /usr/share/common-licenses/GPL-2. License: GPL-2 On Debian systems, the complete text of the GNU General Public License, version 2, can be found in /usr/share/common-licenses/GPL-2. License: Public Domain Dedicated to the Public Domain the author and inventor (Michael Paul Johnson). This code comes with no warranty. Use it at your own risk. License: Public Domain - Base64 I am placing this code in the Public Domain. Do with it as you will. This software comes with no guarantees or warranties but with plenty of well-wishing instead! License: ZLIB This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. . Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: . 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. debian/python-sword.install0000664000000000000000000000002011721266073013232 0ustar usr/lib/python* debian/libsword9.install0000664000000000000000000000004411737650523012505 0ustar usr/lib/sword usr/lib/libsword.so.9 debian/libsword-utils.install0000664000000000000000000000041511737576213013557 0ustar usr/bin/addld usr/bin/imp2ld usr/bin/imp2gbs usr/bin/imp2vs usr/bin/installmgr usr/bin/mkfastmod usr/bin/mod2imp usr/bin/mod2osis usr/bin/mod2vpl usr/bin/mod2zmod usr/bin/osis2mod usr/bin/tei2mod usr/bin/vpl2mod usr/bin/vs2osisref usr/bin/vs2osisreftxt usr/bin/xml2gbs debian/changelog0000664000000000000000000007545612257206433011067 0ustar sword (1.6.2+dfsg-6build1) trusty; urgency=medium * No change rebuild against libicu52 -- Dimitri John Ledkov Fri, 27 Dec 2013 05:16:11 +0000 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 Sun, 04 Aug 2013 19:20:31 +0100 sword (1.6.2+dfsg-5ubuntu1) raring; urgency=low * Build against clucene-core 2. -- Dmitrijs Ledkovs 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 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 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 Mon, 09 Apr 2012 14:58:48 +0100 sword (1.6.2+dfsg-2) unstable; urgency=low [ Dmitrijs Ledkovs ] * 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 Sat, 07 Apr 2012 14:22:48 +0100 sword (1.6.2+dfsg-1) unstable; urgency=low [ Dmitrijs Ledkovs ] * 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" (Closes: 624962) * Updated debian/copyright to match the updated dep-5 spec -- Dmitrijs Ledkovs 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 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 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 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 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 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 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 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 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 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 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 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 Fri, 22 Jun 2007 10:45:24 +0100 sword (1.5.9-5ubuntu2) gutsy; urgency=low * Rebuild for the libcurl transition mess. -- Steve Kowalik 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Wed, 7 Jan 2004 15:16:30 +0000 sword (1.5.6-9) unstable; urgency=medium * Build depend on libcurl2-dev -- Daniel Glassey 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 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 Wed, 12 Nov 2003 14:00:34 +0000 sword (1.5.6-6) unstable; urgency=low * Rerun libtool/autoconf/automake, Closes: #220250 -- Daniel Glassey 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 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 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 Wed, 3 Sep 2003 20:49:58 +0100 sword (1.5.6-2) experimental; urgency=low * Brown paper bug - get shlibs right -- Daniel Glassey 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 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 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 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 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 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 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 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 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 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 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 Sat, 13 Apr 2002 13:04:28 +0100 sword (1.5.3-1) unstable; urgency=high * New upstream release -- Daniel Glassey 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 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 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 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 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 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 Thu, 17 Jan 2002 23:55:08 +0000 sword (1.5.2-4) unstable; urgency=low * Change maintainer to wdg@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 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 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 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 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 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@debian.org * add libsword-dev.manpages -- Daniel Glassey 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 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 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 Mon, 4 Dec 2000 21:32:33 +0000 sword (1.5.1a-1) unstable; urgency=low * New upstream release -- Daniel Glassey Thu, 23 Nov 2000 20:06:03 +0000 sword (1.5.0-1) unstable; urgency=low * New upstream release -- Daniel Glassey Mon, 28 Aug 2000 21:34:49 +0100 sword (1.4.6-2) unstable; urgency=low * Change of maintainer -- Daniel Glassey Mon, 28 Aug 2000 19:14:22 +0100 sword (1.4.6-1) unstable; urgency=low * New upstream version -- Ivan E. Moore II Thu, 20 Jan 2000 19:30:16 -0700 sword (1.4.4-4) unstable; urgency=low * Removing mods.conf file -- Ivan E. Moore II 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 Fri, 01 Oct 1999 04:45:16 -0400 sword (1.4.4-2) unstable; urgency=low * Fixing alot of things. -- Ivan E. Moore II Fri, 01 Oct 1999 01:30:16 -0400 sword (1.4.4-1) unstable; urgency=low * Initial Release. -- Ivan E. Moore II Thu, 30 Sep 1999 08:30:16 -0400 Local variables: mode: debian-changelog End: debian/control0000664000000000000000000001007712053031200010562 0ustar Source: sword Build-Depends: debhelper (>= 7.0.50~), cmake, libz-dev, pkg-config, libcurl4-gnutls-dev, libclucene-dev, libicu-dev, chrpath, perl Section: libs Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: CrossWire Packages Uploaders: Daniel Glassey , Dmitrijs Ledkovs , Jonathan Marsden Standards-Version: 3.9.3 Homepage: http://www.crosswire.org/sword/ Package: libsword9 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} 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} 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. debian/diatheke.examples0000664000000000000000000000013111721266073012506 0ustar utilities/diatheke/cgi/*.pl utilities/diatheke/cgi/*.html utilities/diatheke/tcl/*.tcl debian/diatheke.install0000664000000000000000000000002111721266073012334 0ustar usr/bin/diatheke debian/diatheke.manpages0000664000000000000000000000002611721266073012466 0ustar debian/man/diatheke.1 debian/rules0000775000000000000000000000311112053032304010234 0ustar #!/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 \ -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) debian/watch0000664000000000000000000000023511721266073010226 0ustar version=3 opts=dversionmangle=s/\+dfsg\d*// \ http://www.crosswire.org/ftpmirror/pub/sword/source/v([\d\.]+)/sword-(.*)\.tar\.gz \ debian ./debian/dfsg.sh debian/man/0000775000000000000000000000000012177515622007753 5ustar debian/man/installmgr.1.pod0000664000000000000000000000354611721266073012777 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME installmgr - install, list, update and remove SWORD modules =head1 SYNOPSIS B -init B -l B -u [ModuleName] B -s B [-r | -rl | -rd] [RemoteSrcName] B -ri [RemoteSrcName] [ModuleName] B -ll [PATH] B -li [PATH] [ModuleName] =head1 DESCRIPTION A command line utility to manipulate SWORD modules. It can be used to install, remove, list and update SWORD modules, from local and network locations. Please note modules will be installed into /usr/share/sword without using APT. If you use this utility you will not be able to uninstall these modules using apt-get, aptitude, synaptic and similar tools. =head1 OPTIONS =over =item B<-init> Creates basic user configuration file. This will overwrite existing one. =item B<-l> Lists currently installed SWORD modules. =item B<-u [ModuleName]> Uninstalls module. =item B<-s> Lists available remote sources =item B<[-r | -rl | -rd] [RemoteSrcName]> These are used to manipulate remote sources. =over =item -r Refreshes remote source. =item -rl Lists available modules from the remote source. =item -rd Lists new/updated modules from the remote source. =back =item B<-ri [RemoteSrcName] [ModuleName]> Install module from remote source. =item B<-ll [PATH]> List available modules at a specified local path. =item B<-li [PATH] [ModuleName]> Install module from local path. =back =head1 Authors This manual page was written by Dmitrijs Ledkovs for Debian project but may be used by others. =head1 SEE ALSO =cut debian/man/addld.1.pod0000664000000000000000000000253111721266073011664 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME addld - Lexicon & Dictionary module creation tool for SWORD Project =head1 SYNOPSIS B -a FILE key [PATH] B -d FILE key B -l FILE target_key link_name B -c FILE =head1 DESCRIPTION A command line utility to create and manipule Lexicon & Dictionary SWORD modules. It can be used to add, delete and link L&D keys within module. It can also be used to create new L&D modules. =over =item B<-a FILE key [PATH]> The form is used to add a key to a L&D module. Optionaly path can be used to the file with the entry. =item B<-d FILE key> This form is used to delete a key from a file. =item B<-l FILE target_key link_name> This form is used to link two keys in the module. =item B<-c FILE> This is used to create a new module =back =head1 OPTIONS To use 4-byte L&D instead of 2-byte, insert a 4 immediately after the '-'. To use zLD instead of 2-byte, insert a z immediately after the '-'. =head1 Authors This manual page was written by Dmitrijs Ledkovs for Debian project but may be used by others. =head1 SEE ALSO =cut debian/man/vpl2mod.1.pod0000664000000000000000000000306111721266073012176 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME vpl2mod - tool to convert verse per line source to SWORD module =head1 SYNOPSIS B SOURCE PATH [0|1] [0|1] =head1 DESCRIPTION This utility is used to create SWORD module from the verse per line formated source. The resulting module will be saved in the path specified. =head1 OPTIONS =over =item B<[0|1] [0|1]> The first option indicates whether to prepend verse references or not. The second option is to indicate whether module is NT only or not. =back =head1 NOTE With no verse references source file must contain exactly 31102 lines. This is KJV verse count plus heading for the module, testament, book and chapter. An example snippet follows: MODULE HEADER OLD TESTAMENT HEADER GENESIS HEADER CHAPTER 1 HEADER In the beginning... This example implies there must also be a chapter 2 header, Exodus header, New Testament header, etc. If there is no text for the header, a black line must, at least, hold place. With verse references, source file must simply contain any number of lines, that begin with the verse reference for which it is an entry, e.g.: gen 1:0 CHPATER 1 HEADER get 1:1 In the beginning... =head1 Authors This manual page was written by Dmitrijs Ledkovs for Debian project but may be used by others. =head1 SEE ALSO =cut debian/man/imp2vs.1.pod0000664000000000000000000000136211721266073012035 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME imp2vs - Bible/Commentary module creation tool =head1 SYNOPSIS B [PATH] =head1 DESCRIPTION A command line utility to convert imp formatted file Bible/Commentary SWORD module. =head1 OPTIONS =over =item B<[PATH]> Specify path for the output module if different from the input file. =back =head1 Authors This manual page was written by Dmitrijs Ledkovs for Debian project but may be used by others. =head1 SEE ALSO =cut debian/man/imp2ld.1.pod0000664000000000000000000000156011721266073012004 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME imp2ld - Lexicon, Dictionary, Daily Devotional and Glossary module creation tool =head1 SYNOPSIS B [modulename] [4 | 2 | z] =head1 DESCRIPTION A command line utility to convert imp formatted file into lexicon, dictionary, daily devotional or glossary SWORD module. =head1 OPTIONS =over =item B<[modulename]> Specify the output modulename. =item B<[4 | 2 | z> Specify output module driver. Default is 4. =back =head1 Authors This manual page was written by Dmitrijs Ledkovs for Debian project but may be used by others. =head1 SEE ALSO =cut debian/man/tei2mod.1.pod0000664000000000000000000000342211721266073012157 0ustar # This is a man page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME tei2mod - tool to convert TEI P5 source into a SWORD module =head1 SYNOPSIS B outputpath teisource [OPTIONS] =head1 DESCRIPTION This utility is used to create SWORD module from a slightly modified TEI (Text Encoding Initiative) P5 formatted XML source document. The resulting module will be saved in the outputpath specified. =head1 OPTIONS =over =item B<-z> Specifies use of ZIP compression. The default is no compression. =item B<-Z> Specifies use of LZSS compression. The default is no compression. =item B<-s [2|4]> Specifies maximum text size per entry. The default is 4. =item B<-c cipher_key> Specifies that the output will be enciphered with the supplied cipher_key. The default is plain text output (no encipherment). =item B<-N> Disables conversion to UTF-8 and normalization of UTF-8 to NFC. The default is to convert to UTF-8, if needed, and then normalize to NFC. Note that all UTF-8 texts should be normalized to NFC. =back =head1 NOTE The input format is a subset of TEI P5 with added elements borrowed from OSIS for verse references. The resulting custom TEI schema is available at http://www.crosswire.org/osis/teiP5osis.1.4.xsd =head1 AUTHORS This man page was written by Jonathan Marsden for the Debian project but may be used by others. =head1 SEE ALSO =over =item http://www.crosswire.org/wiki/TEI_Dictionaries =item http://www.crosswire.org/osis/teiP5osis.1.4.xsd =item http://www.tei-c.org/release/doc/tei-p5-doc/html/index.html =back =cut debian/man/mkfastmod.1.pod0000664000000000000000000000073511721266073012605 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME mkfastmod - creates a search index for a module =head1 SYNOPSIS B module =head1 DESCRIPTION A command line utility which creates a search index for a module. =head1 SEE ALSO =cut debian/man/diatheke.10000664000000000000000000001327011721266073011613 0ustar .\" diatheke man page .\" (C)2006 Eeli Kaikkonen .\" You may do whatever you wish with this file. .\" Version 0.8 .TH DIATHEKE 1 "2009-02-01" "diatheke 4.2.1" "Diatheke man page" .SH NAME diatheke \- a command line Bible reader .SH SYNOPSIS .\" for synopsis format see man man .B diatheke .B \-b .I module_name [\fB\-o \fIoption_filters\fR] [\fB\-m \fImaximum_verses\fR] [\fB\-f \fIoutput_format\fR] [\fB\-e \fIoutput_encoding\fR] [\fB\-t \fIscript\fR] [\fB\-v \fIvariant_number\fR] [\fB\-l \fIlocale\fR] .B \-k .I query_key .B diatheke .B \-b .I module_name \fB\-s regex\fR|\fBmultiword\fR|\fBphrase\fR [\fB\-r \fIsearch_range\fR] [\fB\-l \fIlocale\fR] .B \-k .I search_string .B diatheke .B \-b system .B \-k modulelist\fR|\fBmodulelistnames\fR|\fBlocalelist .B diatheke .B \-b info .B \-k .I module_name .SH DESCRIPTION .I diatheke prints Bible verses or other text from the modules which the Sword library uses. .SH OPTIONS .TP .B \-b Module name. May be "system" or "info" (see QUERY KEYS) or one of the names obtained by using "diatheke \-b system \-k modulelist". .TP .B \-s Search type. One of regex (regular expression, see regex(7)), multiword (like "word [AND word]..."), phrase (exact text). .TP .B \-r Search range. A valid Bible key range value (see \-k). For example: Matt-John, Rom, gen-psalms, 1Thess 1:5-2:6. .TP .B \-o Module option filters. A combination of "fmhcvalsrbx". See MODULE OPTIONS. .TP .B \-m Maximum number of verses returned. Any integer value. .TP .B \-f Output format. One of GBF, ThML, RTF, HTML, OSIS, CGI, plain (default). This currently works only if there is a Sword library filter from the original format to the specified output format. HTML and CGI are for generating text for a webpage. .TP .B \-e Output character encoding. One of Latin1, UTF16, HTML, RTF, UTF8 (default). This currently works only for module contents, not for system key contents or key texts. .TP .B \-t .\" TODO Script. (This seems to be broken in version 4.2.1, it should allow e.g. Greek->Latin1 character transliteration with "\-t Latin".) .TP .B \-v Variant. The text may contain variant readings. One of \-1 (all), 0, 1. .TP .B \-l Locale. Sword may have different locales installed. Default is en. Localization affects input and output keys. .TP .B \-k Query key. It must be the last argument because all following arguments are added to the key. See QUERY KEYS for different kinds of keys. .SH MODULE OPTIONS By default the optional features of modules are not shown in the returned text. These options make them visible if the module supports them. .TP .B n Strong's numbers. These numbers refer to the Strong's dictionaries of the New and Old Testaments. Some Bible texts attach these numbers to words. .TP .B f Footnotes. .TP .B m Morphology of the Greek/Hebrew words. Morphology is shown as a code which refers to an entry in some dictionary-type module. .TP .B h Section headings. .TP .B c Hebrew cantillation. .TP .B v Hebrew vowels. .TP .B a Greek accents. .TP .B l Lemmas (the base forms of the words). .TP .B s Scripture cross-references. .TP .B r Arabic shaping. .TP .B b Bi-directional reordering. .TP .B x Red Words of Christ. .SH QUERY KEYS .TP .B Bible texts and Commentaries use verse keys. Examples: john 1:1, j1:1 jh1 (the first chapter of John), jh (the whole book of Gospel of John), joh 1:1-3 ( a verse range), joh 1:0 (one verse backwards from 1:1, which is the last verse of the previous book or possibly an introduction to John), joh 1:100 (which is 100 verses forward from the first verse of John 1:1), 1234 (which is the 1234th verse from the beginning of the Bible). .TP .B Lexicons and Dictionaries use word keys. Any word can be used and similar or next entry alphabetically is returned. Some dictionaries like Strong's use numbered entries. .TP .B system is not a module but when used with \-b allows one of these keys: modulelist (list of the available modules with short descriptions), modulelistnames (list of the names of the available modules), localelist (list of the available Sword locales). .TP .B info is not a module but when used with \-b allows a module name as a key and gives some information about that module. .SH EXAMPLES .TP diatheke \-b KJV \-k joh1:1 Shows John 1:1 in King James Version. .TP diatheke \-b RWP \-k Matthew 2:2 Shows Matthew 2:2 in Robertson's Word Pictures commentary. .TP diatheke \-b WebstersDict \-k bible Show entry "bible" in Websters Dictionary. .TP diatheke \-b system \-k modulelist Shows the list of available modules. .TP diatheke \-b KJV \-o fmslx \-f OSIS \-e Latin1 \-k john 1:1-3 Shows John 1:1-3 from KJV in OSIS XML format in iso8859-1 encoding with footnotes, morphology, cross-references, lemmas and words of Christ in red. (The module may not support all options and those have no effect. KJV includes only ASCII characters so encoding has no effect.) .TP diatheke \-b GerLut \-l de \-m 10 \-k Offenbarung Shows the first 10 verses of Revelation in German GerLut version, both input and output keys are localized. .TP diatheke \-b KJV \-s phrase \-r Mt \-k love Shows those verse keys which include phrase "love" in Gospel of Matthew in KJV module. .SH DIAGNOSTICS Currently diatheke exits always with status 0. If only Bible verse key and module name are shown it means that the module did not have any content in that range. If only module name is shown the key may have been bad. If nothing is shown the book name may have been bad. If Segmentation fault is shown diatheke has been bad. .SH SEE ALSO .I http://www.crosswire.org/sword/ .SH COPYRIGHT Sword library: \(co 1994-2006 Crosswire Bible Society, released under GPL licence. Diatheke: written by Chris Little, \(co 1999-2006 Crosswire Bible Society, released under GPL licence. This manpage was written by Eeli Kaikkonen and may be used freely. debian/man/xml2gbs.1.pod0000664000000000000000000000167311721266073012200 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME xml2gbs - OSIS/ThML General Book module creation tool =head1 SYNOPSIS B [OPTIONS] SOURCE [MODULENAME] =head1 DESCRIPTION This is a tool to create SWORD general book modules from OSIS/ThML sourse. A module name can be optionally specified. =head1 OPTIONS =over =item B<-l> Use long div names in the ThML files. =item B<-i> exports to IMP formal instead of creating a module. =item B<-fT|-fO> Set the importer to ThML or OSIS format respectively. By default it attempts to autodetect. =back =head1 Authors This manual page was written by Dmitrijs Ledkovs for Debian project but may be used by others. =head1 SEE ALSO =cut debian/man/vs2osisref.1.pod0000664000000000000000000000120711721266073012720 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME vs2osisref - a tool to convert verse references from English to OSIS =head1 SYNOPSIS vs2osisref VERSEREF [verse_context] =head1 DESCRIPTION Returns the osisRef of a given (text form) verse reference. =head1 Authors This manual page was written by Dmitrijs Ledkovs for Debian project but may be used by others. =head1 SEE ALSO =cut debian/man/imp2gbs.1.pod0000664000000000000000000000217311721266073012161 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME imp2gbs - general book module creation tool =head1 SYNOPSIS B [input file] [OPTIONS] =head1 DESCRIPTION A command line utility to convert imp (import) formatted general book into SWORD module. =head1 OPTIONS =over =item B<-o [PATH]> Specify the output path, if different from the input file's. =item B<-a> Create augment module. Default is to create new module. =item B<-O> Overwrite entries of same key. Default is to append. =item B<-U> A key filter which converts toUpper. =item B<-g> A key filter which strips greek diacritics. =item B<-l [levels]> A key filter which uses Pseudo-Lexicon n-level generation using first character, e.g. -l 2 "Abbey" -> "A/AB/Abbey". =back =head1 Authors This manual page was written by Dmitrijs Ledkovs for Debian project but may be used by others. =head1 SEE ALSO =cut debian/man/vs2osisreftxt.1.pod0000664000000000000000000000155711721266073013470 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME vs2osisreftxt - a tool that probably does something with OSIS refs =head1 SYNOPSIS vs2osisreftxt STRING [local_name] [test-in-set-verse] =head1 DESCRIPTION Apart from synopsis, little is know what this does. Probably something to do with parsing verses or verse references to/from string to/from OSIS in a given locale or something along the lines. Email me if you can give better description of what this util does. =head1 Authors This manual page was written by Dmitrijs Ledkovs for Debian project but may be used by others. =head1 SEE ALSO L =cut debian/man/mod2imp.1.pod0000664000000000000000000000273611721266073012172 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME mod2imp, mod2osis, mod2vpl, mod2zmod - export SWORD modules =head1 SYNOPSIS B [modulename] B [modulename] B [modulename] [0 |1] B [modulename] [PATH] [blocktype [compressiontype [cipherkey]]] =head1 DESCRIPTION These utilities export SWORD modules into various formats. B exports a module into SWORD imp (import) format. B exports a module into OSIS format. B exports into verse per line format. B produces compressed SWORD modules. =head1 OPTIONS =over =item B<[modulename]> Specify the modulename to export. =item B<[0 | 1]> Only applies to B. 1 - prepends verse reference to each line, 0 - doesn't. =item B<[PATH]> Only applies to B. Path where to create compressed module. =item B<[blocktype [compressiontype [cipherkey]]]> Only applies to B. Valid blocktypes are (default 4): =over =item 2 - verses =item 3 - chapters =item 4 -books =back Compression types are (default 1): =over =item 1 - LZSS =item 2 - Zip =back =back =head1 Authors This manual page was written by Dmitrijs Ledkovs for Debian project but may be used by others. =head1 SEE ALSO =cut debian/man/osis2mod.1.pod0000664000000000000000000000236111721266073012354 0ustar # This is manual page in Perl POD format. Read more at # http://perldoc.perl.org/perlpod.html or run command: # # perldoc perlpod | less # # To check the syntax: # # podchecker *.pod # # Create manual page with command: # # pod2man PAGE.N.pod > PAGE.N =head1 NAME osis2mod - create SWORD module from OSIS =head1 SYNOPSIS B PATH OSISDOC [OPTIONS] =head1 DESCRIPTION This utility will create a SWORD module in the specified path from the OSIS formated input. =head1 OPTIONS =over =item B<-a> Augment module if exists (default is to create a new one). =item B<-z | -Z> Use compression. z - for ZIP; Z - for LZSS. By default no compression is used. =item B<-b N> Specify block size. Valid values are (default 4): =over =item 2 - verses =item 3 - chapters =item 4 -books =back =item B<-c CIPHER_KEY> Encipher module using supplied key. By default no enciphering is used. =item B<-N> Do not convert UFT-8 no normalize UTF-8 to NFC. Default is to convert to UTF-8, if needed, and then normalize to NFC. Note: all UTF-8 texts should be normalized to NFC. =back =head1 Authors This manual page was written by Dmitrijs Ledkovs for Debian project but may be used by others. =head1 SEE ALSO =cut debian/diatheke.docs0000664000000000000000000000003211721266073011620 0ustar utilities/diatheke/README debian/dfsg.sh0000775000000000000000000000060411721266073010457 0ustar #!/bin/sh format=`echo $3 | sed "s/\(.*\.\)\(.*\)/\2/"` newname=`echo $3 | sed "s/\(\.orig\)/\+dfsg\1/"` case $format in gz) compr=gzip ;; bz2) compr=bzip2 ;; lzma) compr=lzma ;; xz) compr=xz ;; esac $compr -d -c $3 | tar --wildcards --delete `cat debian/files.non-dfsg` | \ $compr -9 -f > $newname rm -f $3 debian/files.non-dfsg0000664000000000000000000000027511721266073011740 0ustar */src/utilfuns/zlib/[a-tv-z]* */src/utilfuns/zlib/uncompr.c */include/zlib.h */src/utilfuns/regex.c */include/internal/regex/regex.h */src/utilfuns/win32 */bindings/gsoap/include/stdsoap.h debian/patches/0000775000000000000000000000000012177515622010627 5ustar debian/patches/no-included-zconf.h.diff0000664000000000000000000002056712177513463015240 0ustar --- a/include/zconf.h 2005-01-01 05:42:26.000000000 +0100 +++ /dev/null 2012-07-03 16:36:49.000000000 +0200 @@ -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 -# 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 -# 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 /* for off_t */ -# include /* 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 @@ include/versekey.h include/versetreekey.h include/zcom.h - include/zconf.h include/zipcomprs.h include/zld.h include/zstr.h debian/patches/cmake_backport.patch0000664000000000000000000005034011732742305014613 0ustar Description: Backport of latest cmake Origin: commit, revision id: dmitrij.ledkov@ubuntu.com-20120322235020-h7adn8axsyjujaj3 Author: Dmitrijs Ledkovs Last-Update: 2012-03-22 X-Bzr-Revision-Id: dmitrij.ledkov@ubuntu.com-20120322235020-h7adn8axsyjujaj3 === modified file 'CMakeLists.txt' Index: sword/CMakeLists.txt =================================================================== --- sword.orig/CMakeLists.txt 2012-03-23 00:14:16.541890418 +0000 +++ sword/CMakeLists.txt 2012-03-23 00:32:45.377920112 +0000 @@ -38,6 +38,7 @@ # This will look for various libraries that libsword builds against. There is no REQUIRED # attribute added here, since all of the libraries here are not, in actuality, required. # +MESSAGE(STATUS "\n-- SEARCHING FOR SYTEM PACKAGES") # Find our packages FIND_PACKAGE(ZLIB QUIET) FIND_PACKAGE(ICU QUIET) @@ -77,30 +78,18 @@ IF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*") SET_TARGET_PROPERTIES(sword_static PROPERTIES OUTPUT_NAME "sword") - MESSAGE(STATUS "Building Static library with name sword") + #MESSAGE(STATUS "Building Static library with name sword") ELSE(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*") - MESSAGE(STATUS "Building Static library with name - sword_static") + #MESSAGE(STATUS "Building Static library with name + #sword_static") ENDIF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*") + MESSAGE(STATUS "Building Static library.") ENDIF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE) ################################################################################################ # Some random user settings # -IF(SWORD_ENABLE_PROFILE STREQUAL "Yes") - SET_TARGET_PROPERTIES(sword - PROPERTIES COMPILE_FLAGS "-pg" - ) -ENDIF(SWORD_ENABLE_PROFILE STREQUAL "Yes") - -IF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") - SET_TARGET_PROPERTIES(sword - PROPERTIES COMPILE_FLAGS "-g -finstrument-functions" - ) - TARGET_LINK_LIBRARIES(libsword fnccheck) -ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") - IF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "") ADD_DEFINITIONS(-DGLOBCONFPATH="${SWORD_GLOBAL_CONF_DIR}/sword.conf") ENDIF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "") @@ -123,33 +112,41 @@ ENDIF(BUILDING_SHARED) ############################################################################################### -# Some options are only needed if we're going to be building a debug option into the library -# These are generally only for developer building and testing +# The buildflags depend on the CMAKE_BUILD_TYPE supplied at the command line. +# For a full lists of different flags see http://cmake.org/Wiki/CMake_Useful_Variables +# +# Cmake has sane defaults for None aka '', DEBUG, RELEASE, RELWITHDEBINFO for known compilers. +# +# You can override these variables on the command-line or here. +# We provide our own defaults below # -# Debug testing -IF(CMAKE_BUILD_TYPE STREQUAL "Debug") - SET(SWORD_CFLAGS "-g3 -Wall -Werror -O0") -ELSE(CMAKE_BUILD_TYPE STREQUAL "Debug") - SET(SWORD_CFLAGS "-O3") -ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug") +# Note the below two initialisations done for us by cmake: +# +#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}" or "$ENV{CFLAGS}" or "" ) +#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" or "$ENV{CXXFLAGS}" or "" ) IF(SWORD_ENABLE_WARNINGS STREQUAL "Yes") - SET(SWORD_CFLAGS "${SWORD_CFLAGS} -Werror") + SET(CMAKE_C_FLAGS "-Werror ${CMAKE_C_FLAGS}") + SET(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}") ENDIF(SWORD_ENABLE_WARNINGS STREQUAL "Yes") -IF(BUILDING_SHARED) - SET_TARGET_PROPERTIES(sword - PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS} - ) -ENDIF(BUILDING_SHARED) +IF(SWORD_ENABLE_PROFILE STREQUAL "Yes") + SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}") + SET(CMAKE_CXX_FLAGS "-pg ${CMAKE_CXX_FLAGS}") +ENDIF(SWORD_ENABLE_PROFILE STREQUAL "Yes") -IF(BUILDING_STATIC) - SET_TARGET_PROPERTIES(sword_static - PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS} - ) -ENDIF(BUILDING_STATIC) +IF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") + SET(CMAKE_C_FLAGS "-g -finstrument-functions ${CMAKE_C_FLAGS}") + SET(CMAKE_CXX_FLAGS "-g -finstrument-functions ${CMAKE_CXX_FLAGS}") + TARGET_LINK_LIBRARIES(libsword fnccheck) +ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") -MESSAGE(STATUS "Setting CFlags for compile to ${SWORD_CFLAGS}") +SET(CMAKE_C_FLAGS_DEBUG "-g3 -Wall -O0 ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_C_FLAGS}") +SET(CMAKE_CXX_FLAGS_DEBUG "-g3 -Wall -O0 ${CMAKE_CXX_FLAGS}") +SET(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS}") +SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_CXX_FLAGS}") ############################################################################################## # Setting libraries and includes @@ -167,11 +164,19 @@ INCLUDE_DIRECTORIES(${CLUCENE_INCLUDE_DIR}) SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CLUCENE_LIBRARY}) LINK_DIRECTORIES(${CLUCENE_LIBRARY_DIR}) + ADD_DEFINITIONS(-DUSELUCENE) + IF(CLUCENE2) + ADD_DEFINITIONS(-DCLUCENE2) + ENDIF(CLUCENE2) ENDIF(WITH_CLUCENE) IF(WITH_ICU) INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS}) + ADD_DEFINITIONS(${ICU_DEFINITIONS}) SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}) ENDIF(WITH_ICU) +IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32) + SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY}) +ENDIF(REGEX_FOUND AND CROSS_COMPILE_MINGW32) IF(BUILDING_SHARED) TARGET_LINK_LIBRARIES(sword ${SWORD_LINK_LIBRARIES}) @@ -219,9 +224,9 @@ # Bindings are good, right? # -IF(NOT SWORD_BINDINGS STREQUAL "") +IF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS) INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/bindings.cmake") -ENDIF(NOT SWORD_BINDINGS STREQUAL "") +ENDIF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS) ############################################################################################## # Utilities are hawt Index: sword/cmake/FindCLucene.cmake =================================================================== --- sword.orig/cmake/FindCLucene.cmake 2012-03-23 00:14:16.485890416 +0000 +++ sword/cmake/FindCLucene.cmake 2012-03-23 00:32:45.381920113 +0000 @@ -63,7 +63,7 @@ NAMES clucene clucene-core PATHS ${TRIAL_LIBRARY_PATHS}) IF (CLUCENE_LIBRARY) - MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}") + #MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}") ENDIF (CLUCENE_LIBRARY) FIND_PATH(CLUCENE_INCLUDE_DIR NAMES CLucene.h @@ -71,7 +71,7 @@ ONLY_CMAKE_FIND_ROOT_PATH) IF (CLUCENE_INCLUDE_DIR) - MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}") + #MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}") ENDIF (CLUCENE_INCLUDE_DIR) IF(WIN32) @@ -83,22 +83,29 @@ FIND_PATH(CLUCENE_LIBRARY_DIR NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH) IF (CLUCENE_LIBRARY_DIR) - MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}") + SET(CLUCENE_INCLUDE_DIR ${CLUCENE_INCLUDE_DIR} ${CLUCENE_LIBRARY_DIR}) + #MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}") FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT) STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT}) IF (CLMATCH) STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH}) - IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}") - MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}") + IF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}") + MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}") SET(CLUCENE_GOOD_VERSION FALSE) - ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}") - IF (CLUCENE_VERSION STREQUAL "0.9.17") - MESSAGE(ERROR "CLucene version 0.9.17 is not supported.") + ENDIF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}") + IF (CLUCENE_VERSION STREQUAL "0.9.17") + MESSAGE(ERROR "CLucene version 0.9.17 is not supported.") SET(CLUCENE_GOOD_VERSION FALSE) - ENDIF (CLUCENE_VERSION STREQUAL "0.9.17") + ENDIF (CLUCENE_VERSION STREQUAL "0.9.17") + IF (CLUCENE_VERSION VERSION_GREATER "2.0") + MESSAGE (STATUS "Found CLucene 2, enabling compatibility mode") + SET(CLUCENE2 TRUE) + ELSE (CLUCENE_VERSION VERSION_GREATER "2.0") + SET(CLUCENE2 FALSE) + ENDIF (CLUCENE_VERSION VERSION_GREATER "2.0") ENDIF (CLMATCH) ELSE (CLUCENE_LIBRARY_DIR) - MESSAGE(STATUS "CLucene library dir not found.") + #MESSAGE(STATUS "CLucene library dir not found.") ENDIF (CLUCENE_LIBRARY_DIR) IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION) @@ -107,11 +114,11 @@ IF(CLucene_FOUND) IF(NOT CLucene_FIND_QUIETLY) - MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARY}") + MESSAGE(STATUS "CLucene: Yes ${CLUCENE_LIBRARY}") ENDIF(NOT CLucene_FIND_QUIETLY) ELSE(CLucene_FOUND) IF(CLucene_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find CLucene.") + MESSAGE(FATAL_ERROR "CLucene: No") ENDIF(CLucene_FIND_REQUIRED) ENDIF(CLucene_FOUND) Index: sword/cmake/FindICU.cmake =================================================================== --- sword.orig/cmake/FindICU.cmake 2012-03-23 00:14:16.473890416 +0000 +++ sword/cmake/FindICU.cmake 2012-03-23 00:32:45.381920113 +0000 @@ -5,6 +5,7 @@ # ICU_INCLUDE_DIRS - Directory to include to get ICU headers # Note: always include ICU headers as, e.g., # unicode/utypes.h +# ICU_DEFINITIONS - Definitions # ICU_LIBRARIES - Libraries to link against for the common ICU # ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation # (note: in addition to ICU_LIBRARIES) @@ -13,6 +14,7 @@ find_program( ICU_CONFIG_BIN icu-config + HINTS "${ICU_CONFIG_BIN_PATH}" ) find_program( ICU_GENRB @@ -20,25 +22,26 @@ ) if(ICU_CONFIG_BIN) - MESSAGE(STATUS "icu-config found at ${ICU_CONFIG_BIN}: Using that for configuration") - MESSAGE(STATUS "genrb found at ${ICU_GENRB}: Using that for generating transliteration data") + MESSAGE(STATUS "[ICU] icu-config: Yes ${ICU_CONFIG_BIN}") + MESSAGE(STATUS "[ICU] genrb: Yes ${ICU_GENRB}") # Get include directories - execute_process(COMMAND "${ICU_CONFIG_BIN}" "--cppflags" - OUTPUT_VARIABLE ICU_INCLUDE_DIR + execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--cppflags" + OUTPUT_VARIABLE ICU_CPPFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ) # Sanitize output + string(REGEX MATCHALL "-I[^ ]*\ |-I[^ ]*$" ICU_INCLUDE_DIR ${ICU_CPPFLAGS}) + string(REGEX MATCHALL "-D[^ ]*\ |-D[^ ]*$" ICU_DEFINITIONS ${ICU_CPPFLAGS}) string(REPLACE "-I" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR}) - string(REGEX REPLACE "^[ ]+" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR}) - # Try to get the Libraries we need - execute_process(COMMAND "${ICU_CONFIG_BIN}" "--ldflags" + # Try to get the Libraries we need + execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags" OUTPUT_VARIABLE ICU_LIBRARY_RAW OUTPUT_STRIP_TRAILING_WHITESPACE ) - execute_process(COMMAND "${ICU_CONFIG_BIN}" "--ldflags-icuio" + execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags-icuio" OUTPUT_VARIABLE ICU_LIBRARY_IO_RAW OUTPUT_STRIP_TRAILING_WHITESPACE ) @@ -49,7 +52,7 @@ set(ICU_LIBRARY "${ICU_LIBRARY} ${ICU_LIBRARY_IO_RAW}") # Get the version - execute_process(COMMAND "${ICU_CONFIG_BIN}" "--version" + execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--version" OUTPUT_VARIABLE ICU_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) @@ -95,4 +98,5 @@ set(ICU_LIBRARIES) set(ICU_I18N_LIBRARIES) set(ICU_INCLUDE_DIRS) + MESSAGE(STATUS "ICU: No") endif(ICU_INCLUDE_DIR AND ICU_LIBRARY) Index: sword/cmake/FindRegex.cmake =================================================================== --- sword.orig/cmake/FindRegex.cmake 2012-03-23 00:14:16.509890417 +0000 +++ sword/cmake/FindRegex.cmake 2012-03-23 00:32:45.381920113 +0000 @@ -27,8 +27,14 @@ ) ENDIF(NOT REGEX_INCLUDE_DIR) +FIND_LIBRARY(REGEX_LIBRARY + NAMES regex gnurx) + IF(REGEX_INCLUDE_DIR) SET(REGEX_FOUND 1) + MESSAGE(STATUS "System regex.h: Yes") +ELSE(REGEX_INCLUDE_DIR) + MESSAGE(STATUS "System regex.h: No") ENDIF(REGEX_INCLUDE_DIR) MARK_AS_ADVANCED( Index: sword/cmake/bindings.cmake =================================================================== --- sword.orig/cmake/bindings.cmake 2012-03-23 00:14:16.497890418 +0000 +++ sword/cmake/bindings.cmake 2012-03-23 00:32:45.381920113 +0000 @@ -5,15 +5,16 @@ # I will try to get them integrated into the system if I can. If there are bindings that you need # other than the Python|Perl/Swig bindings, then you should probably speak up now. +MESSAGE(STATUS "\n-- CONFIGURING SWIG BINDINGS") ##################################################################################################### # SWIG # We need to find the SWIG executable in order to be able to do this, right? FIND_PACKAGE(SWIG) IF(NOT SWIG_FOUND) - MESSAGE(FATAL_ERROR "Swig not found. Bindings will not be built.") + MESSAGE(FATAL_ERROR "Swig: no") ELSE(NOT SWIG_FOUND) - MESSAGE(STATUS "Swig found at ${SWIG_EXECUTABLE}") + MESSAGE(STATUS "Swig: yes") SET(SWORD_SWIG_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/bindings/swig") SET(SWORD_SWIG_BINARY "${CMAKE_CURRENT_BINARY_DIR}/bindings/swig") @@ -72,7 +73,7 @@ VERBATIM ) - MESSAGE(STATUS "Configured for building Python bindings.") + MESSAGE(STATUS "Python: yes") ENDIF(SWORD_BINDINGS MATCHES ".*Python.*") IF(SWORD_BINDINGS MATCHES ".*Perl.*") @@ -127,9 +128,9 @@ VERBATIM ) - MESSAGE(STATUS "Configured for building Perl bindings.") + MESSAGE(STATUS "Perl: yes") ELSE(PERL_FOUND) - MESSAGE(FATAL_ERROR "Perl not found. Can't create perl bindings without Perl to bind") + MESSAGE(FATAL_ERROR "Perl: not found") ENDIF(PERL_FOUND) ENDIF(SWORD_BINDINGS MATCHES ".*Perl.*") ENDIF(NOT SWIG_FOUND) Index: sword/cmake/install.cmake =================================================================== --- sword.orig/cmake/install.cmake 2012-03-23 00:14:16.461890416 +0000 +++ sword/cmake/install.cmake 2012-03-23 00:32:45.381920113 +0000 @@ -1,6 +1,7 @@ ##################################################################### # First, install the library itself # +MESSAGE(STATUS "\n-- CONFIGURING INSTALLATION DESTINATIONS") IF(NOT CMAKE_INSTALL_PREFIX) IF(APPLE) SET(SWORD_INSTALL_DIR "/opt/local") @@ -22,6 +23,9 @@ INSTALL(TARGETS sword_static DESTINATION ${SWORD_INSTALL_DIR}/lib) ENDIF(BUILDING_STATIC) +# Install the locales +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/locales.d + DESTINATION ${SWORD_INSTALL_DIR}/share/sword) # Install the headers INSTALL(FILES ${SWORD_INSTALL_HEADERS} @@ -32,7 +36,7 @@ DESTINATION "${SWORD_INSTALL_DIR}/include/sword") ENDIF(SWORD_INTERNAL_REGEX) -MESSAGE(STATUS "Installation destination: ${SWORD_INSTALL_DIR}") +MESSAGE(STATUS "Destination: ${SWORD_INSTALL_DIR}") # Configuration files, of course SET(prefix ${SWORD_INSTALL_DIR}) @@ -62,7 +66,7 @@ # Need to build/install the IF(WITH_ICU AND ICU_GENRB) - ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}") + ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}") FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu") FOREACH(translit ${translit_SOURCES}) STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit}) @@ -86,6 +90,6 @@ ENDIF(BUILDING_SHARED) INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}" - DESTINATION "${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}") + DESTINATION "${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}") ENDFOREACH(translit ${translit_SOURCES}) -ENDIF(WITH_ICU AND ICU_GENRB) \ No newline at end of file +ENDIF(WITH_ICU AND ICU_GENRB) Index: sword/cmake/muxsources.cmake =================================================================== --- sword.orig/cmake/muxsources.cmake 2012-03-23 00:14:16.529890418 +0000 +++ sword/cmake/muxsources.cmake 2012-03-23 00:32:45.385920113 +0000 @@ -10,73 +10,74 @@ # a ZLIB at all, and allowing a user to disable it does not bring about use # of some internal fall-back but just leaves the ability to read ZLIB files # out of the library altogether +MESSAGE(STATUS "\n-- CONFIGURING SOURCE LIST") IF(SWORD_NO_ZLIB STREQUAL "Yes") - MESSAGE(STATUS "ZLib support excluded") + MESSAGE(STATUS "ZLib: excluded by use option") ADD_DEFINITIONS(-DEXCLUDEZLIB) SET(WITH_ZLIB 0) ELSE(SWORD_NO_ZLIB STREQUAL "Yes") SET(sword_SOURCES ${sword_SOURCES} ${sword_zlib_used_SOURCES}) IF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes") - MESSAGE(STATUS "No system ZLib found or user forcing internal") + MESSAGE(STATUS "ZLib: internal") SET(sword_SOURCES ${sword_SOURCES} ${sword_zlib_nofound_SOURCES}) SET(WITH_INTERNAL_ZLIB 1) ELSE(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes") - MESSAGE(STATUS "Using system ZLib: ${ZLIB_LIBRARY}") + MESSAGE(STATUS "ZLib: system ${ZLIB_LIBRARY}") SET(WITH_ZLIB 1) ENDIF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes") ENDIF(SWORD_NO_ZLIB STREQUAL "Yes") # Check for if we've found ICU IF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes") - MESSAGE(STATUS "cURL found , using ${CURL_LIBRARY} and ${CURL_INCLUDE_DIRS}") + MESSAGE(STATUS "cURL: system ${CURL_LIBRARY} and ${CURL_INCLUDE_DIRS}") ADD_DEFINITIONS(-DCURLAVAILABLE) SET(sword_SOURCES ${sword_SOURCES} ${sword_curl_found_SOURCES}) SET(WITH_CURL 1) ELSE(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes") - MESSAGE(STATUS "cURL not found or being ignored") + MESSAGE(STATUS "cURL: no") SET(sword_SOURCES ${sword_SOURCES} ${sword_curl_nofound_SOURCES}) SET(WITH_CURL 0) ENDIF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes") # And for CLucene IF(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes") - MESSAGE(STATUS "CLucene found, using ${CLUCENE_LIBRARY} in ${CLUCENE_LIBRARY_DIR} and ${CLUCENE_INCLUDE_DIR}") + MESSAGE(STATUS "CLucene: yes ${CLUCENE_LIBRARY} in ${CLUCENE_LIBRARY_DIR} and ${CLUCENE_INCLUDE_DIR}") SET(sword_SOURCES ${sword_SOURCES} ${sword_clucene_found_SOURCES}) SET(WITH_CLUCENE 1) ELSE(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes") - MESSAGE(STATUS "CLucene not found or being ignored") + MESSAGE(STATUS "CLucene: no") SET(sword_SOURCES ${sword_SOURCES} ${sword_clucene_nofound_SOURCES}) SET(WITH_CLUCENE 0) ENDIF(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes") # Alert the user if PkgConfig is unavailalbe IF(NOT PKG_CONFIG_FOUND) - MESSAGE(STATUS "PkgConfig not found on the system. Proceeding without it.") + MESSAGE(STATUS "PkgConfig: no") SET(WITH_PKG_CONFIG 1) ELSE(NOT PKG_CONFIG_FOUND) - MESSAGE(STATUS "PkgConfig found. Using.") + MESSAGE(STATUS "PkgConfig: yes") SET(WITH_PKG_CONFIG 0) ENDIF(NOT PKG_CONFIG_FOUND) # ICU needs some lovin' too IF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No") - MESSAGE(STATUS "ICU Found, using ${ICU_LIBRARY} and ${ICU_INCLUDE_DIRS}") + MESSAGE(STATUS "ICU: yes ${ICU_LIBRARY} and ${ICU_INCLUDE_DIRS}") ADD_DEFINITIONS(-D_ICU_) SET(sword_SOURCES ${sword_SOURCES} ${sword_icu_found_SOURCES}) SET(WITH_ICU 1) ELSE(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No") - MESSAGE(STATUS "ICU not found or ignored.") + MESSAGE(STATUS "ICU: no") SET(WITH_ICU 0) ENDIF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No") # Internal or external regex.h IF(REGEX_FOUND) - MESSAGE(STATUS "System Regex found: ${REGEX_INCLUDE_DIR}") + MESSAGE(STATUS "Regex.h: system ${REGEX_INCLUDE_DIR}") INCLUDE_DIRECTORIES(${REGEX_INCLUDE_DIR}) SET(sword_SOURCES ${sword_SOURCES} ${sword_external_regex_SOURCES}) SET(WITH_REGEX 1) ELSE(REGEX_FOUND) - MESSAGE(STATUS "Using internal regex") + MESSAGE(STATUS "Regex.h: internal") INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include/internal/regex) SET(sword_SOURCES ${sword_SOURCES} ${sword_internal_regex_SOURCES}) SET(WITH_REGEX 0) Index: sword/cmake/sources.cmake =================================================================== --- sword.orig/cmake/sources.cmake 2012-03-23 00:14:16.449890415 +0000 +++ sword/cmake/sources.cmake 2012-03-23 00:33:05.417920649 +0000 @@ -417,4 +417,4 @@ translit_Latin_Gothic.txt translit_Latin_Ugaritic.txt translit_swordindex.txt -) \ No newline at end of file +) debian/patches/2631_fix_curl.patch0000664000000000000000000000147611721266073014143 0ustar Description: types.h is no longer part of cURL stable Origin: commit, revision id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2631 Author: chrislit Last-Update: 2011-07-03 X-Bzr-Revision-Id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2631 === modified file 'src/mgr/curlftpt.cpp' --- old/src/mgr/curlftpt.cpp 2010-03-20 11:49:54 +0000 +++ new/src/mgr/curlftpt.cpp 2011-07-03 09:40:30 +0000 @@ -26,7 +26,6 @@ #include #include -#include #include #include === modified file 'src/mgr/curlhttpt.cpp' --- old/src/mgr/curlhttpt.cpp 2009-10-21 23:46:40 +0000 +++ new/src/mgr/curlhttpt.cpp 2011-07-03 09:40:30 +0000 @@ -25,7 +25,6 @@ #include #include -#include #include #include debian/patches/16_gcc4.6_sword.patch0000664000000000000000000002451511721266073014364 0ustar Description: gcc-4.6 -Wunused-but-set-variable fixes Origin: commit, revision id: dmitrijs.ledkovs@credativ.co.uk-20110805200647-l3i6n1uwjuyjv525 Author: Dmitrijs Ledkovs Last-Update: 2011-08-05 X-Bzr-Revision-Id: dmitrijs.ledkovs@credativ.co.uk-20110805200647-l3i6n1uwjuyjv525 === modified file 'src/mgr/swmgr.cpp' Index: debian/src/mgr/swmgr.cpp =================================================================== --- debian.orig/src/mgr/swmgr.cpp +++ debian/src/mgr/swmgr.cpp @@ -889,7 +889,6 @@ SWModule *SWMgr::CreateMod(const char *n if ((!stricmp(driver, "zText")) || (!stricmp(driver, "zCom"))) { SWCompress *compress = 0; int blockType = CHAPTERBLOCKS; - int blockNum = 1; misc1 = ((entry = section.find("BlockType")) != section.end()) ? (*entry).second : (SWBuf)"CHAPTER"; if (!stricmp(misc1.c_str(), "VERSE")) blockType = VERSEBLOCKS; @@ -898,9 +897,6 @@ SWModule *SWMgr::CreateMod(const char *n else if (!stricmp(misc1.c_str(), "BOOK")) blockType = BOOKBLOCKS; - misc1 = ((entry = section.find("BlockNumber")) != section.end()) ? (*entry).second : (SWBuf)"1"; - blockNum = atoi(misc1.c_str()); - misc1 = ((entry = section.find("CompressType")) != section.end()) ? (*entry).second : (SWBuf)"LZSS"; #ifndef EXCLUDEZLIB if (!stricmp(misc1.c_str(), "ZIP")) Index: debian/src/modules/filters/gbfrtf.cpp =================================================================== --- debian.orig/src/modules/filters/gbfrtf.cpp +++ debian/src/modules/filters/gbfrtf.cpp @@ -42,7 +42,6 @@ char GBFRTF::processText(SWBuf &text, co SWBuf strongnum; SWBuf strongtense; bool hideText = false; - int wordLen = 0; int wordCount = 0; const char *from; @@ -50,7 +49,6 @@ char GBFRTF::processText(SWBuf &text, co from = orig.c_str(); for (text = ""; *from; from++) { if (*from == '<') { - wordLen = wordCount; wordCount = 0; intoken = true; tokpos = 0; Index: debian/src/modules/filters/gbfwordjs.cpp =================================================================== --- debian.orig/src/modules/filters/gbfwordjs.cpp +++ debian/src/modules/filters/gbfwordjs.cpp @@ -57,7 +57,6 @@ char GBFWordJS::processText(SWBuf &text, char token[2112]; // cheese. Fix. int tokpos = 0; bool intoken = false; - bool lastspace = false; int word = 1; char val[128]; char wordstr[5]; @@ -152,14 +151,11 @@ char GBFWordJS::processText(SWBuf &text, else strong << 1; SWModule *sLex = 0; - SWModule *sMorph = 0; if (gh == 'G') { sLex = defaultGreekLex; - sMorph = defaultGreekParse; } if (gh == 'H') { sLex = defaultHebLex; - sMorph = defaultHebParse; } SWBuf lexName = ""; if (sLex) { @@ -223,7 +219,6 @@ char GBFWordJS::processText(SWBuf &text, } else { text += *from; - lastspace = (*from == ' '); } } Index: debian/src/modules/filters/osislemma.cpp =================================================================== --- debian.orig/src/modules/filters/osislemma.cpp +++ debian/src/modules/filters/osislemma.cpp @@ -44,7 +44,6 @@ OSISLemma::~OSISLemma() { char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) { SWBuf token; bool intoken = false; - bool lastspace = false; const SWBuf orig = text; const char * from = orig.c_str(); @@ -90,7 +89,6 @@ char OSISLemma::processText(SWBuf &text, } else { text.append(*from); - lastspace = (*from == ' '); } } } Index: debian/src/modules/filters/osismorph.cpp =================================================================== --- debian.orig/src/modules/filters/osismorph.cpp +++ debian/src/modules/filters/osismorph.cpp @@ -45,7 +45,6 @@ char OSISMorph::processText(SWBuf &text, char token[2048]; // cheese. Fix. int tokpos = 0; bool intoken = false; - bool lastspace = false; SWBuf orig = text; const char *from = orig.c_str(); @@ -90,7 +89,6 @@ char OSISMorph::processText(SWBuf &text, } else { text.append(*from); - lastspace = (*from == ' '); } } } Index: debian/src/modules/filters/osisruby.cpp =================================================================== --- debian.orig/src/modules/filters/osisruby.cpp +++ debian/src/modules/filters/osisruby.cpp @@ -44,7 +44,6 @@ OSISRuby::~OSISRuby() { char OSISRuby::processText(SWBuf &text, const SWKey *key, const SWModule *module) { SWBuf token; bool intoken = false; - bool lastspace = false; const SWBuf orig = text; const char * from = orig.c_str(); @@ -83,7 +82,6 @@ char OSISRuby::processText(SWBuf &text, } else { text.append(*from); - lastspace = (*from == ' '); } } } Index: debian/src/modules/filters/osisstrongs.cpp =================================================================== --- debian.orig/src/modules/filters/osisstrongs.cpp +++ debian/src/modules/filters/osisstrongs.cpp @@ -49,7 +49,6 @@ OSISStrongs::~OSISStrongs() { char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) { SWBuf token; bool intoken = false; - bool lastspace = false; int wordNum = 1; char wordstr[5]; const char *wordStart = 0; @@ -280,7 +279,6 @@ char OSISStrongs::processText(SWBuf &tex } else { text.append(*from); - lastspace = (*from == ' '); } } return 0; Index: debian/src/modules/filters/osiswordjs.cpp =================================================================== --- debian.orig/src/modules/filters/osiswordjs.cpp +++ debian/src/modules/filters/osiswordjs.cpp @@ -59,7 +59,6 @@ char OSISWordJS::processText(SWBuf &text char token[2112]; // cheese. Fix. int tokpos = 0; bool intoken = false; - bool lastspace = false; int wordNum = 1; char wordstr[5]; SWBuf modName = (module)?module->Name():""; @@ -186,7 +185,6 @@ char OSISWordJS::processText(SWBuf &text } else { text.append(*from); - lastspace = (*from == ' '); } } } Index: debian/src/modules/filters/thmlwordjs.cpp =================================================================== --- debian.orig/src/modules/filters/thmlwordjs.cpp +++ debian/src/modules/filters/thmlwordjs.cpp @@ -58,7 +58,6 @@ char ThMLWordJS::processText(SWBuf &text char token[2112]; // cheese. Fix. int tokpos = 0; bool intoken = false; - bool lastspace = false; int word = 1; char val[128]; char *valto; @@ -166,14 +165,11 @@ char ThMLWordJS::processText(SWBuf &text else strong << 1; SWModule *sLex = 0; - SWModule *sMorph = 0; if (gh == 'G') { sLex = defaultGreekLex; - sMorph = defaultGreekParse; } if (gh == 'H') { sLex = defaultHebLex; - sMorph = defaultHebParse; } SWBuf lexName = ""; if (sLex) { @@ -204,16 +200,6 @@ char ThMLWordJS::processText(SWBuf &text textStr += lastAppendLen; SWBuf spanStart = ""; - - -/* - if (sMorph) { - SWBuf popMorph = "%s", sMorph->Name(), morph.c_str(), wordID.c_str(), morph.c_str()); - morph = popMorph; - } -*/ - // 'p' = 'fillpop' to save bandwidth const char *m = strchr(morph.c_str(), ':'); if (m) m++; @@ -237,7 +223,6 @@ char ThMLWordJS::processText(SWBuf &text } else { text += *from; - lastspace = (*from == ' '); } } Index: debian/src/modules/filters/utf8html.cpp =================================================================== --- debian.orig/src/modules/filters/utf8html.cpp +++ debian/src/modules/filters/utf8html.cpp @@ -34,14 +34,11 @@ UTF8HTML::UTF8HTML() { char UTF8HTML::processText(SWBuf &text, const SWKey *key, const SWModule *module) { unsigned char *from; - int len; char digit[10]; unsigned long ch; if ((unsigned long)key < 2) // hack, we're en(1)/de(0)ciphering return (char)-1; - len = strlen(text.c_str()) + 2; // shift string to right of buffer - SWBuf orig = text; from = (unsigned char *)orig.c_str(); Index: debian/src/modules/filters/utf8latin1.cpp =================================================================== --- debian.orig/src/modules/filters/utf8latin1.cpp +++ debian/src/modules/filters/utf8latin1.cpp @@ -36,14 +36,12 @@ char UTF8Latin1::processText(SWBuf &text { unsigned char *from; - int len; unsigned long uchar; unsigned char significantFirstBits, subsequent; if ((unsigned long)key < 2) {// hack, we're en(1)/de(0)ciphering return (char)-1; } - len = strlen(text.c_str()) + 1; // shift string to right of buffer SWBuf orig = text; from = (unsigned char*)orig.c_str(); Index: debian/src/utilfuns/url.cpp =================================================================== --- debian.orig/src/utilfuns/url.cpp +++ debian/src/utilfuns/url.cpp @@ -133,7 +133,6 @@ void URL::parse () { //3.Get the hostname part. This is the part from pos up to the first slash bool checkPath = true; bool checkParams = true; - bool checkAnchor = true; end = strchr(urlPtr, '/'); if (!end) { @@ -145,7 +144,6 @@ void URL::parse () { end = strchr(urlPtr, '#'); } if (!end) { - checkAnchor = false; end = urlPtr+strlen(urlPtr); } @@ -160,7 +158,6 @@ void URL::parse () { end = strchr(urlPtr, '#'); } if (!end) { - checkAnchor = false; end = urlPtr+strlen(urlPtr); } @@ -174,14 +171,6 @@ void URL::parse () { SWBuf paramName; SWBuf paramValue; -/* - end = strchr(urlPtr, '#'); - if (!end) { - checkAnchor = false; - end = urlPtr+strlen(urlPtr); - } -*/ - //end = (start && strchr(start, '?')) ? strchr(start, '?')+1 :0; end = urlPtr; while (end) { paramName = ""; Index: debian/utilities/osis2mod.cpp =================================================================== --- debian.orig/utilities/osis2mod.cpp +++ debian/utilities/osis2mod.cpp @@ -1416,7 +1416,6 @@ int main(int argc, char **argv) { const char* osisDoc = argv[2]; int append = 0; SWBuf compType = ""; - bool isCommentary = false; int iType = 4; int entrySize = 0; SWBuf cipherKey = ""; @@ -1464,9 +1463,6 @@ int main(int argc, char **argv) { } usage(*argv, "-s requires one of <2|4>"); } - else if (!strcmp(argv[i], "-C")) { - isCommentary = true; - } else if (!strcmp(argv[i], "-d")) { if (i+1 < argc) debug |= atoi(argv[++i]); else usage(*argv, "-d requires "); debian/patches/12_fix_compiler_warnings.diff0000664000000000000000000011531512053030606016344 0ustar 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 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 #ifdef unix # include +# include +# include #else # include # include @@ -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) 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; 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) { 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 - print entry\n"; - std::cout << " r - 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 - print entry\n"; + std::cout << " r - 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) { 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 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 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 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) 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) 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) { 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; 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(); 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) 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 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) 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) { 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) { 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) { 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) 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) { 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) { 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() 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) { 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 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 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, §ionLevelInfo); @@ -413,26 +513,50 @@ void extractVerseText(int fdviewable, in 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) { 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) { 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) { printf("using previous offset,size %d\n", size); offset = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR); printf("%ld %ld %d \n", offset, lzoffset, lzsize); - 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"); } 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); 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"); + unsigned long ulSize = size; - if (size) - write(ofd[key.Testament() - 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"); + } + 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"); + lzsize = size; } } Index: debian/utilities/lexdump.c =================================================================== --- debian.orig/utilities/lexdump.c +++ debian/utilities/lexdump.c @@ -40,7 +40,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) { 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]); debian/patches/fix-ftbfs-icu.patch0000664000000000000000000000130111764050752014310 0ustar Description: Fix FTBFS by requesting libraries only from icu-config Author: Dmitrijs Ledkovs , Daniel Glassey Bug-Debian: http://bugs.debian.org/676097 Index: b/cmake/FindICU.cmake =================================================================== --- a/cmake/FindICU.cmake +++ b/cmake/FindICU.cmake @@ -36,7 +36,7 @@ string(REPLACE "-I" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR}) # Try to get the Libraries we need - execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags" + execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags-libsonly" OUTPUT_VARIABLE ICU_LIBRARY_RAW OUTPUT_STRIP_TRAILING_WHITESPACE ) debian/patches/fix-ftbfs-gcc4.7.diff0000664000000000000000000000204211743333514014326 0ustar Partially fix ftbfs with gcc-4.7 Index: sword-1.6.2+dfsg/include/multimapwdef.h =================================================================== --- sword-1.6.2+dfsg.orig/include/multimapwdef.h 2004-05-04 21:01:39.000000000 +0000 +++ sword-1.6.2+dfsg/include/multimapwdef.h 2012-04-16 20:07:17.256834065 +0000 @@ -19,14 +19,14 @@ } T& operator[](const Key& k) { - if (find(k) == this->end()) { - insert(value_type(k, T())); + if (this->find(k) == this->end()) { + this->insert(value_type(k, T())); } - return (*(find(k))).second; + return (*(this->find(k))).second; } bool has(const Key& k, const T &val) const { - typename std::multimap::const_iterator start = lower_bound(k); - typename std::multimap::const_iterator end = upper_bound(k); + typename std::multimap::const_iterator start = this->lower_bound(k); + typename std::multimap::const_iterator end = this->upper_bound(k); for (; start!=end; start++) { if (start->second == val) return true; debian/patches/2661.patch0000664000000000000000000000653212053124456012246 0ustar Description: Commiting patch from GHellings to support both CLucene 0.9x and 2.x Leaving the CMake stuff for Greg to commit himself so CMake blame stays with him ;) Origin: commit, revision id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2661, http://thread.gmane.org/gmane.comp.literature.sword.devel/21816 Author: scribe, Tom Callaway, Deji Akingunola Last-Update: 2011-10-29 X-Bzr-Revision-Id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2661 === modified file 'src/modules/swmodule.cpp' --- a/src/modules/swmodule.cpp +++ b/src/modules/swmodule.cpp @@ -40,7 +40,6 @@ #ifdef USELUCENE #include -#include //Lucence includes //#include "CLucene.h" @@ -59,6 +58,9 @@ using std::vector; +extern size_t lucene_utf8towcs(wchar_t *, const char *, size_t maxslen); +extern size_t lucene_wcstoutf8 (char *, const wchar_t *, size_t maxslen); + SWORD_NAMESPACE_START SWDisplay SWModule::rawdisp; @@ -1144,7 +1146,7 @@ lucene_utf8towcs(wcharBuffer, keyText, MAX_CONV_SIZE); //keyText must be utf8 // doc->add( *(new Field("key", wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED))); - doc->add( *Field::Text(_T("key"), wcharBuffer ) ); + doc->add(*_CLNEW Field(_T("key"), wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED) ); if (includeKeyInSearch) { @@ -1155,11 +1157,11 @@ } lucene_utf8towcs(wcharBuffer, content, MAX_CONV_SIZE); //content must be utf8 - doc->add( *Field::UnStored(_T("content"), wcharBuffer) ); + doc->add(*_CLNEW Field(_T("content"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED)); if (strong.length() > 0) { lucene_utf8towcs(wcharBuffer, strong, MAX_CONV_SIZE); - doc->add( *Field::UnStored(_T("lemma"), wcharBuffer) ); + doc->add(*_CLNEW Field(_T("lemma"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) ); //printf("setting fields (%s).\ncontent: %s\nlemma: %s\n", (const char *)*key, content, strong.c_str()); } @@ -1280,12 +1282,12 @@ //printf("proxBuf after (%s).\nprox: %s\nproxLem: %s\n", (const char *)*key, proxBuf.c_str(), proxLem.c_str()); - doc->add( *Field::UnStored(_T("prox"), wcharBuffer) ); + doc->add(*_CLNEW Field(_T("prox"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) ); good = true; } if (proxLem.length() > 0) { lucene_utf8towcs(wcharBuffer, proxLem, MAX_CONV_SIZE); //keyText must be utf8 - doc->add( *Field::UnStored(_T("proxlem"), wcharBuffer) ); + doc->add(*_CLNEW Field(_T("proxlem"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) ); good = true; } if (good) { @@ -1303,20 +1305,32 @@ //coreWriter->optimize(); coreWriter->close(); +#ifdef CLUCENE2 + d = FSDirectory::getDirectory(target.c_str()); +#endif if (IndexReader::indexExists(target.c_str())) { +#ifndef CLUCENE2 d = FSDirectory::getDirectory(target.c_str(), false); +#endif if (IndexReader::isLocked(d)) { IndexReader::unlock(d); } - fsWriter = new IndexWriter( d, an, false); - } else { + } + else { +#ifndef CLUCENE2 d = FSDirectory::getDirectory(target.c_str(), true); +#endif fsWriter = new IndexWriter(d, an, true); } Directory *dirs[] = { ramDir, 0 }; +#ifdef CLUCENE2 + lucene::util::ConstValueArray< lucene::store::Directory *>dirsa(dirs, 1); + fsWriter->addIndexes(dirsa); +#else fsWriter->addIndexes(dirs); +#endif fsWriter->close(); delete ramDir; debian/patches/multiarch-clucene.patch0000664000000000000000000000063712053036675015261 0ustar Description: add multiarch location Author: Dmitrijs Ledkovs --- sword-1.6.2+dfsg.orig/cmake/FindCLucene.cmake +++ sword-1.6.2+dfsg/cmake/FindCLucene.cmake @@ -46,6 +46,7 @@ SET(TRIAL_LIBRARY_PATHS /opt/local/lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX} /usr/lib64 + /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} /sw/lib${LIB_SUFFIX} /usr/pkg/lib${LIB_SUFFIX} ${WIN_CLUCENE_SEARCH_PATH} debian/patches/dso-missing-shared.patch0000664000000000000000000000110012177515301015332 0ustar Description: clucene-shared is missing Author: Dmitrijs Ledkovs 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) 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) debian/patches/13_curl.diff0000664000000000000000000000115111721266073012724 0ustar 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 @@ // 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; } debian/patches/icu_in_soname.patch0000664000000000000000000000217311740036526014457 0ustar Description: Set icu folder name using SONAME instead of upstream version string Author: Dmitrijs Ledkovs Index: sword/cmake/install.cmake =================================================================== --- sword.orig/cmake/install.cmake 2012-04-03 08:12:47.999839147 +0100 +++ sword/cmake/install.cmake 2012-04-07 14:12:20.241257963 +0100 @@ -66,7 +66,7 @@ # Need to build/install the IF(WITH_ICU AND ICU_GENRB) - ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}") + ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_SOVERSION}_icu_${ICU_VERSION}") FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu") FOREACH(translit ${translit_SOURCES}) STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit}) @@ -90,6 +90,6 @@ ENDIF(BUILDING_SHARED) INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}" - DESTINATION "${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}") + DESTINATION "${libdir}/sword/${SWORD_SOVERSION}_icu_${ICU_VERSION}") ENDFOREACH(translit ${translit_SOURCES}) ENDIF(WITH_ICU AND ICU_GENRB) debian/patches/series0000664000000000000000000000037512177515263012052 0ustar 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 multiarch-clucene.patch no-included-zconf.h.diff dso-missing-shared.patch debian/bzr-builddeb.conf0000664000000000000000000000014411733713166012413 0ustar [BUILDDEB] commit-message-from-changelog=True quilt-tree-policy=applied quilt-commit-policy=applied debian/libsword-common.dirs0000664000000000000000000000005711737140774013203 0ustar usr/share/sword/mods.d usr/share/sword/modules debian/README.source0000664000000000000000000000027411721266073011357 0ustar This package is using quilt for patching upstream source. Please see /usr/share/doc/quilt/README.source. -- Dmitrijs Ledkovs , Mon, 4 Jan 2010 01:05:24 +0200 debian/libsword-common.lintian-overrides0000664000000000000000000000022411737653461015676 0ustar # This directory is to install SWORD modules by the administrator libsword-common binary: package-contains-empty-directory usr/share/sword/modules/ debian/compat0000664000000000000000000000000211721266073010373 0ustar 7 debian/libsword-utils.manpages0000664000000000000000000000043511721266073013677 0ustar debian/man/imp2gbs.1 debian/man/imp2ld.1 debian/man/imp2vs.1 debian/man/installmgr.1 debian/man/mod2imp.1 debian/man/addld.1 debian/man/mkfastmod.1 debian/man/osis2mod.1 debian/man/tei2mod.1 debian/man/vpl2mod.1 debian/man/vs2osisref.1 debian/man/vs2osisreftxt.1 debian/man/xml2gbs.1 debian/libsword-common.install0000664000000000000000000000015111737663025013702 0ustar usr/share/sword/ samples/recommended/sword.conf etc/ samples/mods.d/globals.conf usr/share/sword/mods.d/ debian/libsword-utils.links0000664000000000000000000000030211721266073013215 0ustar usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2osis.1.gz usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2vpl.1.gz usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2zmod.1.gz