--- sword-1.6.1+dfsg.orig/configure +++ sword-1.6.1+dfsg/configure @@ -21258,14 +21258,14 @@ if test x$enable_debug = xyes; then GCJFLAGS="-g -O0" if test x$ac_cv_prog_cc_g = xyes; then - AM_CFLAGS="-g3 -O0 -Wall -Werror" + AM_CFLAGS="-g3 -O0 -Wall" else - AM_CFLAGS="-O0 -Wall -Werror" + AM_CFLAGS="-O0 -Wall" fi if test x$ac_cv_prog_cxx_g = xyes; then - AM_CXXFLAGS="-g3 -O0 -Wall -Werror" + AM_CXXFLAGS="-g3 -O0 -Wall" else - AM_CXXFLAGS="-O0 -Wall -Werror" + AM_CXXFLAGS="-O0 -Wall" fi else AM_CFLAGS="-O3" --- sword-1.6.1+dfsg.orig/configure.ac +++ sword-1.6.1+dfsg/configure.ac @@ -89,14 +89,14 @@ if test x$enable_debug = xyes; then GCJFLAGS="-g -O0" if test x$ac_cv_prog_cc_g = xyes; then - AM_CFLAGS="-g3 -O0 -Wall -Werror" + AM_CFLAGS="-g3 -O0 -Wall" else AM_CFLAGS="-O0 -Wall -Werror" fi if test x$ac_cv_prog_cxx_g = xyes; then - AM_CXXFLAGS="-g3 -O0 -Wall -Werror" + AM_CXXFLAGS="-g3 -O0 -Wall" else - AM_CXXFLAGS="-O0 -Wall -Werror" + AM_CXXFLAGS="-O0 -Wall" fi else AM_CFLAGS="-O3" --- sword-1.6.1+dfsg.orig/debian/xml2gbs.1.pod +++ sword-1.6.1+dfsg/debian/xml2gbs.1.pod @@ -0,0 +1,54 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/libsword8.install +++ sword-1.6.1+dfsg/debian/libsword8.install @@ -0,0 +1,20 @@ +etc/sword.conf +usr/lib/libsword.so.8.0.0 +usr/lib/libsword.so.8 +usr/lib/sword +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/xml2gbs +usr/share/sword --- sword-1.6.1+dfsg.orig/debian/diatheke.1 +++ sword-1.6.1+dfsg/debian/diatheke.1 @@ -0,0 +1,201 @@ +.\" 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. --- sword-1.6.1+dfsg.orig/debian/compat +++ sword-1.6.1+dfsg/debian/compat @@ -0,0 +1 @@ +5 --- sword-1.6.1+dfsg.orig/debian/diatheke.manpages +++ sword-1.6.1+dfsg/debian/diatheke.manpages @@ -0,0 +1 @@ +debian/diatheke.1 --- sword-1.6.1+dfsg.orig/debian/README.Debian +++ sword-1.6.1+dfsg/debian/README.Debian @@ -0,0 +1,29 @@ +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 + --- sword-1.6.1+dfsg.orig/debian/imp2vs.1.pod +++ sword-1.6.1+dfsg/debian/imp2vs.1.pod @@ -0,0 +1,44 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/vs2osisref.1.pod +++ sword-1.6.1+dfsg/debian/vs2osisref.1.pod @@ -0,0 +1,33 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/libsword-dev.install +++ sword-1.6.1+dfsg/debian/libsword-dev.install @@ -0,0 +1,4 @@ +usr/include +usr/lib/libsword.so +usr/lib/libsword.a +usr/lib/pkgconfig --- sword-1.6.1+dfsg.orig/debian/libsword8.lintian-overrides +++ sword-1.6.1+dfsg/debian/libsword8.lintian-overrides @@ -0,0 +1,2 @@ +# This directory is to install SWORD modules by the administrator +libsword8 binary: package-contains-empty-directory usr/share/sword/modules/ --- sword-1.6.1+dfsg.orig/debian/installmgr.1.pod +++ sword-1.6.1+dfsg/debian/installmgr.1.pod @@ -0,0 +1,106 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/imp2gbs.1.pod +++ sword-1.6.1+dfsg/debian/imp2gbs.1.pod @@ -0,0 +1,65 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/addld.1.pod +++ sword-1.6.1+dfsg/debian/addld.1.pod @@ -0,0 +1,66 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/diatheke.install +++ sword-1.6.1+dfsg/debian/diatheke.install @@ -0,0 +1 @@ +usr/bin/diatheke --- sword-1.6.1+dfsg.orig/debian/imp2ld.1.pod +++ sword-1.6.1+dfsg/debian/imp2ld.1.pod @@ -0,0 +1,49 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/osis2mod.1.pod +++ sword-1.6.1+dfsg/debian/osis2mod.1.pod @@ -0,0 +1,74 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/rules +++ sword-1.6.1+dfsg/debian/rules @@ -0,0 +1,74 @@ +#!/usr/bin/make -f +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_DH_INSTALL_SOURCEDIR := debian/tmp +DEB_CONFIGURE_EXTRA_FLAGS := --with-zlib --with-clucene=/usr --with-icu --enable-tests --enable-debug --without-internalregex +DEB_DH_MAKESHLIBS_ARGS_libsword8 := -V"libsword8 (>= 1.6)" +DEB_SHLIBDEPS_INCLUDE_libsword8 := debian/tmp/usr/lib +DEB_SHLIBDEPS_INCLUDE_diatheke := debian/libsword8/usr/lib +DEB_DBG_PACKAGE_libsword8 := libsword-dbg +#CppUnitTestSuite - currently broken +#DEB_MAKE_CHECK_TARGET := check +DEB_OPT_FLAG := -g -O3 -Wall # -Werror +DEB_INSTALL_CHANGELOGS_ALL = ChangeLog + +build/libsword8:: + #Running Shell based Testsuite + $(shell cd tests/testsuite && ./runall.sh 1>&2) + # The next three rules use chrpath to remove unwanted rpath info + # from the compiled binaries when they are built on amd64. + chrpath -d $(CURDIR)/lib/.libs/libsword.so* + chrpath -d $(CURDIR)/utilities/.libs/* + chrpath -d $(CURDIR)/utilities/diatheke/.libs/diatheke + + for file in `ls debian/*.pod`;\ + do\ + base=`basename $$file .pod`;\ + name=`basename $$base .1 | tr '[a-z]' '[A-Z]'`;\ + pod2man --release=$$VERSION --center "" -n $$name $$file > $$base;\ + done + +binary: list-missing + #checking for missing files +clean/:: + rm -f *.1 + +# Makefile arcanery warning: +# $(dir $(_)) gives us the path containing this rules file. +# This magic care of Emmet Hickory: +# (http://lists.debian.org/debian-devel-games/2008/02/msg00135.html) + +TEMP_DIR := $(shell mktemp -d) +SOURCE_DIR = $(shell ls $(TEMP_DIR) | grep sword- | grep .tar.gz | sed s/.tar.gz//) +SOURCE_VER = $(shell echo $(notdir $(SOURCE_DIR)) | sed s/sword-//) + +download-tarball: + uscan --download --package sword --destdir=$(TEMP_DIR) \ + --no-symlink --upstream-version 0 --watchfile=$(dir $(_))/watch + cd $(TEMP_DIR) && tar zxf sword-*.tar.gz + +remove-unwanted-files: download-tarball + # zlib is (mostly) an old copy of the zlib library + # Leave only untgz.c which is needed and not part of zlib + rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/zlib/[a-tv-z]* + rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/zlib/uncompr.c + rm $(TEMP_DIR)/$(SOURCE_DIR)/include/zlib.h + # regex.c and regex.h are GNU C library files + rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/regex.c + rm $(TEMP_DIR)/$(SOURCE_DIR)/include/internal/regex/regex.h + # src/utilfuns/win32/* are a non-free dirent for Windows + rm -r $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/win32 + # stdsoap.h is non-free + rm $(TEMP_DIR)/$(SOURCE_DIR)/bindings/gsoap/include/stdsoap.h + +repack-source: remove-unwanted-files + cd $(TEMP_DIR) && mv $(SOURCE_DIR) $(SOURCE_DIR)+dfsg && \ + tar zcf sword_$(SOURCE_VER)+dfsg.orig.tar.gz \ + $(notdir $(SOURCE_DIR)+dfsg) + +get-orig-source: repack-source + mv $(TEMP_DIR)/sword_$(SOURCE_VER)+dfsg.orig.tar.gz $(CURDIR) + rm -r $(TEMP_DIR) --- sword-1.6.1+dfsg.orig/debian/README.source +++ sword-1.6.1+dfsg/debian/README.source @@ -0,0 +1,5 @@ +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 --- sword-1.6.1+dfsg.orig/debian/diatheke.docs +++ sword-1.6.1+dfsg/debian/diatheke.docs @@ -0,0 +1 @@ +utilities/diatheke/README --- sword-1.6.1+dfsg.orig/debian/diatheke.examples +++ sword-1.6.1+dfsg/debian/diatheke.examples @@ -0,0 +1,3 @@ +utilities/diatheke/cgi/*.pl +utilities/diatheke/cgi/*.html +utilities/diatheke/tcl/*.tcl --- sword-1.6.1+dfsg.orig/debian/tei2mod.1.pod +++ sword-1.6.1+dfsg/debian/tei2mod.1.pod @@ -0,0 +1,81 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/vpl2mod.1.pod +++ sword-1.6.1+dfsg/debian/vpl2mod.1.pod @@ -0,0 +1,68 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/control +++ sword-1.6.1+dfsg/debian/control @@ -0,0 +1,82 @@ +Source: sword +Build-Depends: autotools-dev, + quilt, + patchutils (>= 0.2.31), + cdbs (>= 0.4.34), + debhelper (>= 5.0.7), + libz-dev, + pkg-config, + libcurl4-gnutls-dev, + libclucene-dev, + libicu-dev, + chrpath, + perl +Section: libs +Priority: optional +Maintainer: CrossWire Packages +Uploaders: Daniel Glassey , + Dmitrijs Ledkovs , + Jonathan Marsden +Standards-Version: 3.8.4 +Homepage: http://www.crosswire.org/sword/ + +Package: libsword8 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: sword-frontend +Conflicts: libsword6, libsword7 +Replaces: libsword1, libsword4, libsword4c2, libsword5, libsword5c2a, + libsword6, libsword-runtime, libsword-config, libsword7 +Description: API/library for bible software + The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris, + MacOSX etc.) API/library for Bible software with a constantly growing list + 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: libsword8 (= ${binary:Version}), ${misc:Depends} +Provides: sword-dev +Description: Development files for libsword + The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris, + 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-dbg +Architecture: any +Section: debug +Priority: extra +Depends: libsword8 (= ${binary:Version}), ${misc:Depends} +Description: API/library for bible software - Debug Files + The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris, + MacOSX etc.) API/library for Bible software with a constantly growing list + 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. --- sword-1.6.1+dfsg.orig/debian/mod2imp.1.pod +++ sword-1.6.1+dfsg/debian/mod2imp.1.pod @@ -0,0 +1,85 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/libsword8.dirs +++ sword-1.6.1+dfsg/debian/libsword8.dirs @@ -0,0 +1,3 @@ +usr/share/sword/mods.d +usr/share/sword/modules + --- sword-1.6.1+dfsg.orig/debian/copyright +++ sword-1.6.1+dfsg/debian/copyright @@ -0,0 +1,102 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=53 +Name: The SWORD Project +Maintainer: 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 + +X-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 +X-Comment: 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 +X-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: 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. --- sword-1.6.1+dfsg.orig/debian/libsword8.links +++ sword-1.6.1+dfsg/debian/libsword8.links @@ -0,0 +1,3 @@ +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 --- sword-1.6.1+dfsg.orig/debian/libsword8.manpages +++ sword-1.6.1+dfsg/debian/libsword8.manpages @@ -0,0 +1,13 @@ +imp2gbs.1 +imp2ld.1 +imp2vs.1 +installmgr.1 +mod2imp.1 +addld.1 +mkfastmod.1 +osis2mod.1 +tei2mod.1 +vpl2mod.1 +vs2osisref.1 +xml2gbs.1 + --- sword-1.6.1+dfsg.orig/debian/libsword8.docs +++ sword-1.6.1+dfsg/debian/libsword8.docs @@ -0,0 +1,2 @@ +doc/greektrans.txt +doc/translation-template.conf --- sword-1.6.1+dfsg.orig/debian/mkfastmod.1.pod +++ sword-1.6.1+dfsg/debian/mkfastmod.1.pod @@ -0,0 +1,28 @@ +# 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 --- sword-1.6.1+dfsg.orig/debian/changelog +++ sword-1.6.1+dfsg/debian/changelog @@ -0,0 +1,855 @@ +sword (1.6.1+dfsg-2ubuntu1) oneiric; urgency=low + + * Don't build with -Werror. LP: #832787. + + -- Matthias Klose Tue, 13 Sep 2011 11:58:45 +0200 + +sword (1.6.1+dfsg-2build1) natty; urgency=low + + * No change rebuild for libicu transition + + -- Scott Kitterman Fri, 17 Dec 2010 22:43:26 -0500 + +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: + --- sword-1.6.1+dfsg.orig/debian/watch +++ sword-1.6.1+dfsg/debian/watch @@ -0,0 +1,4 @@ +version=3 +opts=dversionmangle=s/\+dfsg\d*// \ + http://www.crosswire.org/ftpmirror/pub/sword/source/v([\d\.]+)/sword-(.*)\.tar\.gz + --- sword-1.6.1+dfsg.orig/debian/patches/02_libver.diff +++ sword-1.6.1+dfsg/debian/patches/02_libver.diff @@ -0,0 +1,28 @@ +This patch changes the upstream SO name to Debian/Ubuntu SO name. + +Index: sword/lib/Makefile.am +=================================================================== +--- sword.orig/lib/Makefile.am 2010-01-03 04:36:09.622945995 +0200 ++++ sword/lib/Makefile.am 2010-01-03 04:38:16.010955077 +0200 +@@ -23,7 +23,7 @@ + + AM_CPPFLAGS += $(ICUDEF) + +-libsword_la_LDFLAGS = -release $(VERSION) ++libsword_la_LDFLAGS = -version-info 8 + + include ../src/keys/Makefile.am + include ../src/utilfuns/Makefile.am +Index: sword/lib/Makefile.in +=================================================================== +--- sword.orig/lib/Makefile.in 2010-01-03 03:49:46.274945658 +0200 ++++ sword/lib/Makefile.in 2010-01-03 04:38:47.198943804 +0200 +@@ -537,7 +537,7 @@ + $(zlddir)/zld.cpp $(bindingsdir)/flatapi.cpp + @HAVE_ICU_FALSE@ICUDEF = + @HAVE_ICU_TRUE@ICUDEF = -DSWICU_DATA=\"${pkglibdir}/${VERSION}_icu_${ICU_VER}\" +-libsword_la_LDFLAGS = -release $(VERSION) ++libsword_la_LDFLAGS = -version-info 8 + keysdir = $(top_srcdir)/src/keys + utilfunsdir = $(top_srcdir)/src/utilfuns + @INTERNALFTPLIB_FALSE@ftpsrc = --- sword-1.6.1+dfsg.orig/debian/patches/12_fix_compiler_warnings.diff +++ sword-1.6.1+dfsg/debian/patches/12_fix_compiler_warnings.diff @@ -0,0 +1,1174 @@ +Remove compiler warnings so SWORD will compile with -Wall -Werror +Index: sword/src/mgr/filemgr.cpp +=================================================================== +--- sword.orig/src/mgr/filemgr.cpp 2010-01-04 00:38:49.052717665 +0200 ++++ sword/src/mgr/filemgr.cpp 2010-01-04 00:40:32.823732625 +0200 +@@ -408,7 +408,7 @@ + + + int FileMgr::copyFile(const char *sourceFile, const char *targetFile) { +- int sfd, dfd, len; ++ int sfd, dfd, len; + char buf[4096]; + + if ((sfd = ::open(sourceFile, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH)) < 1) +Index: sword/src/utilfuns/zlib/untgz.c +=================================================================== +--- sword.orig/src/utilfuns/zlib/untgz.c 2010-01-04 00:38:49.032728497 +0200 ++++ sword/src/utilfuns/zlib/untgz.c 2010-01-04 00:39:44.144727307 +0200 +@@ -13,6 +13,8 @@ + #include + #ifdef unix + # include ++# include ++# include + #else + # include + # include +@@ -80,7 +82,7 @@ + + 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 @@ + /* 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 remaining = 0; + FILE *outfile = NULL; + char fname[BLOCKSIZE]; +- time_t tartime; ++ time_t tartime = 0; + + while (1) { + len = gzread(in, &buffer, BLOCKSIZE); +Index: sword/tests/testblocks.cpp +=================================================================== +--- sword.orig/tests/testblocks.cpp 2010-01-04 00:38:48.928718885 +0200 ++++ sword/tests/testblocks.cpp 2010-01-04 00:39:44.144727307 +0200 +@@ -29,14 +29,18 @@ + void addEntry(EntriesBlock *eb) { + string input; + string body; +- char line[1024]; ++ char line[1024], *c; + std::cout << "\nEnter new Entry's text. '.' on an empty line to finish:\n"; + do { + std::cout << "> "; +- fgets(line, 1000, stdin); +- input = line; +- if (input.compare(".")) +- body.append(input); ++ c = fgets(line, 1000, stdin); ++ if (c == NULL) { ++ std::cerr << "ERROR: fgets failed during addEntry\n"; ++ } else { ++ input = line; ++ if (input.compare(".")) ++ body.append(input); ++ } + } + while (input.compare(".")); + std::cout << "Adding new entry. Index is: " << eb->addEntry(body.c_str()) << "\n\n"; +@@ -72,29 +76,33 @@ + + 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: sword/utilities/stepdump.cpp +=================================================================== +--- sword.orig/utilities/stepdump.cpp 2010-01-04 00:38:49.012719004 +0200 ++++ sword/utilities/stepdump.cpp 2010-01-04 00:39:44.144727307 +0200 +@@ -153,33 +153,56 @@ + + + void readVersion(int fd, Version *versionRecord) { ++ int r; + + cout << "\n\nReading Version Record (" << 16/*sizeof(struct Version)*/ << " bytes)\n\n"; + // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS + // read(fd, &versionRecord, sizeof(struct Version)); + + cout << "Version Record Information\n"; +- read(fd, &(versionRecord->versionRecordSize), 2); ++ r = read(fd, &(versionRecord->versionRecordSize), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVersion"); + cout << "\tversionRecordSize: " << versionRecord->versionRecordSize << "\n"; +- read(fd, &(versionRecord->publisherID), 2); ++ r = read(fd, &(versionRecord->publisherID), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVersion"); + cout << "\tpublisherID: " << versionRecord->publisherID << "\n"; +- read(fd, &(versionRecord->bookID), 2); ++ r = read(fd, &(versionRecord->bookID), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVersion"); + cout << "\tbookID: " << versionRecord->bookID << "\n"; +- read(fd, &(versionRecord->setID), 2); ++ r = read(fd, &(versionRecord->setID), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVersion"); + cout << "\tsetID: " << versionRecord->setID << "\n"; +- read(fd, &(versionRecord->conversionProgramVerMajor), 1); ++ r = read(fd, &(versionRecord->conversionProgramVerMajor), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); + cout << "\tconversionProgramVerMajor: " << (int)versionRecord->conversionProgramVerMajor << "\n"; +- read(fd, &(versionRecord->conversionProgramVerMinor), 1); ++ r = read(fd, &(versionRecord->conversionProgramVerMinor), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); + cout << "\tconversionProgramVerMinor: " << (int)versionRecord->conversionProgramVerMinor << "\n"; +- read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1); ++ r = read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); + cout << "\tleastCompatSTEPVerMajor: " << (int)versionRecord->leastCompatSTEPVerMajor << "\n"; +- read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1); ++ r = read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); + cout << "\tleastCompatSTEPVerMinor: " << (int)versionRecord->leastCompatSTEPVerMinor << "\n"; +- read(fd, &(versionRecord->encryptionType), 1); ++ r = read(fd, &(versionRecord->encryptionType), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); + cout << "\tencryptionType: " << (int)versionRecord->encryptionType << "\n"; +- read(fd, &(versionRecord->editionID), 1); ++ r = read(fd, &(versionRecord->editionID), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); + cout << "\teditionID: " << (int)versionRecord->editionID << "\n"; +- read(fd, &(versionRecord->modifiedBy), 2); ++ r = read(fd, &(versionRecord->modifiedBy), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVersion"); + cout << "\tmodifiedBy: " << versionRecord->modifiedBy << "\n"; + + int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/; +@@ -187,33 +210,49 @@ + if (skip) { + cout << "\nSkipping " << skip << " unknown bytes.\n"; + char *skipbuf = new char[skip]; +- read(fd, skipbuf, skip); ++ r = read(fd, skipbuf, skip); ++ if (r != skip) ++ perror("ERROR: read failed in readVersion"); + delete [] skipbuf; + } + } + + + void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) { +- ++ int r; + cout << "\n\nReading Viewable Header Record (" << 16/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n"; + + // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS + // read(fd, &viewableHeaderRecord, sizeof(struct ViewableHeader)); + + cout << "Viewable Header Record Information\n"; +- read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2); ++ r = read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readViewableHeader"); + cout << "\tviewableHeaderRecordSize: " << viewableHeaderRecord->viewableHeaderRecordSize << "\n"; +- read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4); ++ r = read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readViewableHeader"); + cout << "\tviewableBlocksCount: " << viewableHeaderRecord->viewableBlocksCount << "\n"; +- read(fd, &(viewableHeaderRecord->glossBlocksCount), 4); ++ r = read(fd, &(viewableHeaderRecord->glossBlocksCount), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readViewableHeader"); + cout << "\tglossBlocksCount: " << viewableHeaderRecord->glossBlocksCount << "\n"; +- read(fd, &(viewableHeaderRecord->compressionType), 1); ++ r = read(fd, &(viewableHeaderRecord->compressionType), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readViewableHeader"); + cout << "\tcompressionType: " << (int)viewableHeaderRecord->compressionType << "(0 - none; 1 - LZSS)\n"; +- read(fd, &(viewableHeaderRecord->reserved1), 1); ++ r = read(fd, &(viewableHeaderRecord->reserved1), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readViewableHeader"); + cout << "\treserved1: " << (int)viewableHeaderRecord->reserved1 << "\n"; +- read(fd, &(viewableHeaderRecord->blockEntriesSize), 2); ++ r = read(fd, &(viewableHeaderRecord->blockEntriesSize), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readViewableHeader"); + cout << "\tblockEntriesSize: " << viewableHeaderRecord->blockEntriesSize << "\n"; +- read(fd, &(viewableHeaderRecord->reserved2), 2); ++ r = read(fd, &(viewableHeaderRecord->reserved2), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readViewableHeader"); + cout << "\treserved2: " << viewableHeaderRecord->reserved2 << "\n"; + + int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/; +@@ -221,18 +260,23 @@ + if (skip) { + cout << "\nSkipping " << skip << " unknown bytes.\n"; + char *skipbuf = new char[skip]; +- read(fd, skipbuf, skip); ++ r = read(fd, skipbuf, skip); ++ if (r != skip) ++ perror("ERROR: read failed in readViewableHeader"); + delete [] skipbuf; + } + } + + + void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) { ++ int r; + unsigned long size = vb->size; + + *buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ]; + lseek(fd, vb->offset, SEEK_SET); +- read(fd, *buf, vb->size); ++ r = read(fd, *buf, vb->size); ++ if (r != vb->size) ++ perror("ERROR: read failed in readViewableBlocktext"); + + compress->zBuf(&size, *buf); + strcpy(*buf, compress->Buf()); +@@ -242,30 +286,41 @@ + + + void readViewableBlock(int fd, ViewableBlock *vb) { +- ++ int r; + cout << "\n\nReading Viewable Block (" << 12/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n"; + + // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS + // read(fd, &vb, sizeof(struct ViewableBlock)); + + cout << "Viewable Block Information\n"; +- read(fd, &(vb->offset), 4); ++ r = read(fd, &(vb->offset), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readViewableBlock"); + cout << "\toffset: " << vb->offset << "\n"; +- read(fd, &(vb->uncompressedSize), 4); ++ r = read(fd, &(vb->uncompressedSize), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readViewableBlock"); + cout << "\tuncompressedSize: " << vb->uncompressedSize << "\n"; +- read(fd, &(vb->size), 4); ++ r = read(fd, &(vb->size), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readViewableBlock"); + cout << "\tsize: " << vb->size << "\n"; + } + + + void readHeaderControlWordAreaText(int fd, char **buf) { ++ int r; + long headerControlWordAreaSize; +- read(fd, &headerControlWordAreaSize, 4); ++ r = read(fd, &headerControlWordAreaSize, 4); ++ if (r != 4) ++ perror("ERROR: read failed in readHeaderControlWordAreaText"); + cout << "Reading Header Control Word Area (" << headerControlWordAreaSize << " bytes)\n\n"; + + *buf = new char [headerControlWordAreaSize + 1]; + +- read(fd, *buf, headerControlWordAreaSize); ++ r = read(fd, *buf, headerControlWordAreaSize); ++ if (r != headerControlWordAreaSize) ++ perror("ERROR: read failed in readHeaderControlWordAreaText"); + (*buf)[headerControlWordAreaSize] = 0; + + cout << "headerControlWordArea:\n" << *buf << "\n"; +Index: sword/utilities/treeidxutil.cpp +=================================================================== +--- sword.orig/utilities/treeidxutil.cpp 2010-01-04 00:38:48.992719359 +0200 ++++ sword/utilities/treeidxutil.cpp 2010-01-04 00:39:44.144727307 +0200 +@@ -49,27 +49,33 @@ + + + void setLocalName(TreeKeyIdx *treeKey) { +- char buf[1023]; ++ char buf[1023], *c; + std::cout << "Enter New Node Name: "; +- fgets(buf, 1000, stdin); ++ c = fgets(buf, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in setLocalName\n"; + treeKey->setLocalName(buf); + treeKey->save(); + } + + + void assurePath(TreeKeyIdx *treeKey) { +- char buf[1023]; ++ char buf[1023], *c; + std::cout << "Enter path: "; +- fgets(buf, 1000, stdin); ++ c = fgets(buf, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in assurePath\n"; + treeKey->assureKeyPath(buf); + } + + + void appendSibbling(TreeKeyIdx *treeKey) { + if (treeKey->getOffset()) { +- char buf[1023]; ++ char buf[1023], *c; + std::cout << "Enter New Sibbling Name: "; +- fgets(buf, 1000, stdin); ++ c = fgets(buf, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in appendSibbling\n"; + treeKey->append(); + treeKey->setLocalName(buf); + treeKey->save(); +@@ -79,9 +85,11 @@ + + + void appendChild(TreeKeyIdx *treeKey) { +- char buf[1023]; ++ char buf[1023], *c; + std::cout << "Enter New Child Name: "; +- fgets(buf, 1000, stdin); ++ c = fgets(buf, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in appendChild\n"; + treeKey->appendChild(); + treeKey->setLocalName(buf); + treeKey->save(); +@@ -114,11 +122,13 @@ + TreeKeyIdx root = *treeKey; + + std::string input; +- char line[1024]; ++ char line[1024], *c; + + do { + std::cout << "[" << treeKey->getText() << "] > "; +- fgets(line, 1000, stdin); ++ c = fgets(line, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in main\n"; + input = line; + if (input.length() > 0) { + switch (input[0]) { +Index: sword/utilities/gbfidx.cpp +=================================================================== +--- sword.orig/utilities/gbfidx.cpp 2010-01-04 00:38:48.952718391 +0200 ++++ sword/utilities/gbfidx.cpp 2010-01-04 00:39:44.144727307 +0200 +@@ -53,7 +53,7 @@ + int main(int argc, char **argv) + { + long pos, offset; +- int num1, num2, rangemax; ++ int num1, num2, rangemax, w; + char startflag = 0; + short size; + +@@ -65,18 +65,30 @@ + 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 @@ + + void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size) + { ++ int w; + long pos; + short tmp; + +@@ -127,26 +140,48 @@ + 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: sword/utilities/genbookutil.cpp +=================================================================== +--- sword.orig/utilities/genbookutil.cpp 2010-01-04 00:38:49.024719769 +0200 ++++ sword/utilities/genbookutil.cpp 2010-01-04 00:39:44.144727307 +0200 +@@ -48,9 +48,11 @@ + + + void setLocalName(TreeKeyIdx *treeKey) { +- char buf[1023]; ++ char buf[1023], *c; + std::cout << "Enter New Node Name: "; +- fgets(buf, 1000, stdin); ++ c = fgets(buf, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in setLocalName\n"; + SWBuf name = buf; + treeKey->setLocalName(name.trim()); + treeKey->save(); +@@ -58,18 +60,22 @@ + + + void gotoPath(TreeKeyIdx *treeKey) { +- char buf[1023]; ++ char buf[1023], *c; + std::cout << "Enter Path: "; +- fgets(buf, 1000, stdin); ++ c = fgets(buf, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in gotoPath\n"; + SWBuf path = buf; + (*treeKey) = path.trim(); + } + + + void assurePath(TreeKeyIdx *treeKey) { +- char buf[1023]; ++ char buf[1023], *c; + std::cout << "Enter Path: "; +- fgets(buf, 1000, stdin); ++ c = fgets(buf, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in assurePath\n"; + SWBuf path = buf; + treeKey->assureKeyPath(path.trim()); + } +@@ -86,10 +92,12 @@ + SWBuf body; + TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book); + if (treeKey->getOffset()) { +- char buf[1023]; ++ char buf[1023], *c; + std::cout << "Enter New Entry Text ('.' on a line by itself to end): \n"; + do { +- fgets(buf, 1000, stdin); ++ c = fgets(buf, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in setEntryText\n"; + SWBuf text = buf; + text.trim(); + if ((text[0] == '.') && (text[1] == 0)) +@@ -106,9 +114,11 @@ + + void appendSibbling(TreeKeyIdx *treeKey) { + if (treeKey->getOffset()) { +- char buf[1023]; ++ char buf[1023], *c; + std::cout << "Enter New Sibbling Name: "; +- fgets(buf, 1000, stdin); ++ c = fgets(buf, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in appendSibbling\n"; + SWBuf name = buf; + treeKey->append(); + treeKey->setLocalName(name.trim()); +@@ -119,9 +129,11 @@ + + + void appendChild(TreeKeyIdx *treeKey) { +- char buf[1023]; ++ char buf[1023], *c; + std::cout << "Enter New Child Name: "; +- fgets(buf, 1000, stdin); ++ c = fgets(buf, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in appendChild\n"; + SWBuf name = buf; + treeKey->appendChild(); + treeKey->setLocalName(name.trim()); +@@ -163,11 +175,13 @@ + treeKey = (TreeKeyIdx *)(SWKey *)(*book); + + SWBuf input; +- char line[1024]; ++ char line[1024], *c; + + do { + std::cout << "[" << treeKey->getText() << "] > "; +- fgets(line, 1000, stdin); ++ c = fgets(line, 1000, stdin); ++ if (c == NULL) ++ std::cerr << "ERROR: fgets failed in main\n"; + input = line; + input.trim(); + if (input.length() > 0) { +Index: sword/utilities/vpl2mod.cpp +=================================================================== +--- sword.orig/utilities/vpl2mod.cpp 2010-01-04 00:38:48.968728584 +0200 ++++ sword/utilities/vpl2mod.cpp 2010-01-04 00:39:44.144727307 +0200 +@@ -67,14 +67,18 @@ + break; + } + +- int size = (lseek(fd, 0, SEEK_CUR) - index) - 1; ++ int r, size = (lseek(fd, 0, SEEK_CUR) - index) - 1; + + *buf = new char [ size + 1 ]; + + if (size > 0) { + lseek(fd, index, SEEK_SET); +- read(fd, *buf, size); +- read(fd, &ch, 1); //pop terminating char ++ r = read(fd, *buf, size); ++ if (r != size) ++ std::cerr <<"ERROR: short read in readline\n"; ++ r = read(fd, &ch, 1); //pop terminating char ++ if (r != size) ++ std::cerr <<"ERROR: short read of terminating char in readline\n"; + (*buf)[size] = 0; + + // clean up any trailing junk on buf +Index: sword/utilities/installmgr.cpp +=================================================================== +--- sword.orig/utilities/installmgr.cpp 2010-01-04 00:38:48.984719291 +0200 ++++ sword/utilities/installmgr.cpp 2010-01-04 00:39:44.144727307 +0200 +@@ -65,8 +65,10 @@ + cout << "then type yes at the prompt\n\n"; + cout << "enable? [no] "; + +- char prompt[10]; +- fgets(prompt, 9, stdin); ++ char prompt[10], *c; ++ c = fgets(prompt, 9, stdin); ++ if (c == NULL) ++ std::cerr <<"ERROR: fgets failed in isUserDisclaimerConfirmed\n"; + confirmed = (!strcmp(prompt, "yes\n")); + cout << "\n"; + } +Index: sword/utilities/step2vpl.cpp +=================================================================== +--- sword.orig/utilities/step2vpl.cpp 2010-01-04 00:38:48.936719093 +0200 ++++ sword/utilities/step2vpl.cpp 2010-01-04 00:39:44.148729122 +0200 +@@ -218,93 +218,169 @@ + + + void readVersion(int fd, Version *versionRecord) { ++ int r; + +- read(fd, &(versionRecord->versionRecordSize), 2); +- read(fd, &(versionRecord->publisherID), 2); +- read(fd, &(versionRecord->bookID), 2); +- read(fd, &(versionRecord->setID), 2); +- read(fd, &(versionRecord->conversionProgramVerMajor), 1); +- read(fd, &(versionRecord->conversionProgramVerMinor), 1); +- read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1); +- read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1); +- read(fd, &(versionRecord->encryptionType), 1); +- read(fd, &(versionRecord->editionID), 1); +- read(fd, &(versionRecord->modifiedBy), 2); ++ r = read(fd, &(versionRecord->versionRecordSize), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVersion"); ++ ++ r = read(fd, &(versionRecord->publisherID), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVersion"); ++ r = read(fd, &(versionRecord->bookID), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVersion"); ++ r = read(fd, &(versionRecord->setID), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVersion"); ++ r = read(fd, &(versionRecord->conversionProgramVerMajor), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); ++ r = read(fd, &(versionRecord->conversionProgramVerMinor), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); ++ r = read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); ++ r = read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); ++ r = read(fd, &(versionRecord->encryptionType), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); ++ r = read(fd, &(versionRecord->editionID), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readVersion"); ++ r = read(fd, &(versionRecord->modifiedBy), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVersion"); + + int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/; + + if (skip) { + char *skipbuf = new char[skip]; +- read(fd, skipbuf, skip); ++ r = read(fd, skipbuf, skip); ++ if (r != skip) ++ perror("ERROR: read failed in readVersion"); + delete [] skipbuf; + } + } + + + void readSectionsHeader(int fd, SectionsHeader *sectionsHeaderRecord) { ++ int r; + +- read(fd, &(sectionsHeaderRecord->sectionsHeaderRecordSize), 2); +- read(fd, &(sectionsHeaderRecord->levelEntriesCount), 4); +- read(fd, &(sectionsHeaderRecord->glossEntriesCount), 4); +- read(fd, &(sectionsHeaderRecord->levelEntriesSize), 2); +- read(fd, &(sectionsHeaderRecord->reserved), 4); ++ r = read(fd, &(sectionsHeaderRecord->sectionsHeaderRecordSize), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readSectionsHeader"); ++ r = read(fd, &(sectionsHeaderRecord->levelEntriesCount), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readSectionsHeader"); ++ r = read(fd, &(sectionsHeaderRecord->glossEntriesCount), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readSectionsHeader"); ++ r = read(fd, &(sectionsHeaderRecord->levelEntriesSize), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readSectionsHeader"); ++ r = read(fd, &(sectionsHeaderRecord->reserved), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readSectionsHeader"); + + int skip = sectionsHeaderRecord->sectionsHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/; + + if (skip) { + char *skipbuf = new char[skip]; +- read(fd, skipbuf, skip); ++ r = read(fd, skipbuf, skip); ++ if (r != skip) ++ perror("ERROR: read failed in readSectionsHeader"); + delete [] skipbuf; + } + } + + + void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) { ++ int r; + +- read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2); +- read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4); +- read(fd, &(viewableHeaderRecord->glossBlocksCount), 4); +- read(fd, &(viewableHeaderRecord->compressionType), 1); +- read(fd, &(viewableHeaderRecord->reserved1), 1); +- read(fd, &(viewableHeaderRecord->blockEntriesSize), 2); +- read(fd, &(viewableHeaderRecord->reserved2), 2); ++ r = read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readViewableHeader"); ++ r = read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readViewableHeader"); ++ r = read(fd, &(viewableHeaderRecord->glossBlocksCount), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readViewableHeader"); ++ r = read(fd, &(viewableHeaderRecord->compressionType), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readViewableHeader"); ++ r = read(fd, &(viewableHeaderRecord->reserved1), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readViewableHeader"); ++ r = read(fd, &(viewableHeaderRecord->blockEntriesSize), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readViewableHeader"); ++ r = read(fd, &(viewableHeaderRecord->reserved2), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readViewableHeader"); + + int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/; + + if (skip) { + char *skipbuf = new char[skip]; +- read(fd, skipbuf, skip); ++ r = read(fd, skipbuf, skip); ++ if (r != skip) ++ perror("ERROR: read failed in readViewableHeader"); + delete [] skipbuf; + } + } + + + void readVSyncHeader(int fd, VSyncHeader *vSyncHeaderRecord) { ++ int r; + +- read(fd, &(vSyncHeaderRecord->vSyncHeaderRecordSize), 2); +- read(fd, &(vSyncHeaderRecord->startBookNumber), 2); +- read(fd, &(vSyncHeaderRecord->endBookNumber), 2); +- read(fd, &(vSyncHeaderRecord->bookPointerEntriesSize), 2); +- read(fd, &(vSyncHeaderRecord->syncPointEntriesSize), 2); +- read(fd, &(vSyncHeaderRecord->reserved1_1), 4); +- read(fd, &(vSyncHeaderRecord->reserved1_2), 2); ++ r = read(fd, &(vSyncHeaderRecord->vSyncHeaderRecordSize), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVSyncHeader"); ++ r = read(fd, &(vSyncHeaderRecord->startBookNumber), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVSyncHeader"); ++ r = read(fd, &(vSyncHeaderRecord->endBookNumber), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVSyncHeader"); ++ r = read(fd, &(vSyncHeaderRecord->bookPointerEntriesSize), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVSyncHeader"); ++ r = read(fd, &(vSyncHeaderRecord->syncPointEntriesSize), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVSyncHeader"); ++ r = read(fd, &(vSyncHeaderRecord->reserved1_1), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readVSyncHeader"); ++ r = read(fd, &(vSyncHeaderRecord->reserved1_2), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVSyncHeader"); + + int skip = vSyncHeaderRecord->vSyncHeaderRecordSize - 16/*sizeof(VSyncHeader)*/; + + if (skip) { + char *skipbuf = new char[skip]; +- read(fd, skipbuf, skip); ++ r = read(fd, skipbuf, skip); ++ if (r != skip) ++ perror("ERROR: read failed in readVSyncHeader"); + delete [] skipbuf; + } + } + + + void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) { ++ int r; + unsigned long size = vb->size; + + *buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ]; + lseek(fd, vb->offset, SEEK_SET); +- read(fd, *buf, vb->size); ++ r = read(fd, *buf, vb->size); ++ if (r != vb->size) ++ perror("ERROR: read failed in readViewableBlockText"); + + compress->zBuf(&size, *buf); + strcpy(*buf, compress->Buf()); +@@ -312,35 +388,53 @@ + + + void readViewableBlock(int fd, ViewableBlock *vb) { ++ int r; + +- read(fd, &(vb->offset), 4); +- read(fd, &(vb->uncompressedSize), 4); +- read(fd, &(vb->size), 4); ++ r = read(fd, &(vb->offset), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readViewableBlock"); ++ r = read(fd, &(vb->uncompressedSize), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readViewableBlock"); ++ r = read(fd, &(vb->size), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readViewableBlock"); + } + + + void readHeaderControlWordAreaText(int fd, char **buf) { ++ int r; + long headerControlWordAreaSize; +- read(fd, &headerControlWordAreaSize, 4); ++ r = read(fd, &headerControlWordAreaSize, 4); ++ if (r != 4) ++ perror("ERROR: read failed in readHeaderControlWordAreaText"); + + *buf = new char [headerControlWordAreaSize + 1]; + +- read(fd, *buf, headerControlWordAreaSize); ++ r = read(fd, *buf, headerControlWordAreaSize); ++ if (r != headerControlWordAreaSize) ++ perror("ERROR: read failed in readHeaderControlWordAreaText"); + (*buf)[headerControlWordAreaSize] = 0; + + } + + void readVSyncBooksInfo(int fd, VSyncHeader *vSyncHeaderRecord, VSyncBooksInfo **vSyncBooksInfo) { + ++ int r; + int bookCount = vSyncHeaderRecord->endBookNumber - vSyncHeaderRecord->startBookNumber; + *vSyncBooksInfo = new VSyncBooksInfo[bookCount]; + for (int i = 0; i <= bookCount; i++) { +- read(fd, &(*vSyncBooksInfo)[i].offset, 4); +- read(fd, &(*vSyncBooksInfo)[i].count, 2); ++ r = read(fd, &(*vSyncBooksInfo)[i].offset, 4); ++ if (r != 4) ++ perror("ERROR: read failed in readVSyncBooksInfo"); ++ r = read(fd, &(*vSyncBooksInfo)[i].count, 2); ++ if (r != 2) ++ perror("ERROR: read failed in readVSyncBooksInfo"); + } + } + + void displayBook(int fdbook, int fdviewable, int fdvsync, int fdsections, VSyncBooksInfo *vSyncBooksInfo) { ++ int r; + VSyncPoint vSyncPoint; + + lseek(fdvsync, vSyncBooksInfo->offset, SEEK_SET); +@@ -351,9 +445,15 @@ + char *sectionName; + char *verseText; + +- read(fdvsync, &(vSyncPoint.chapter), 2); +- read(fdvsync, &(vSyncPoint.verse), 2); +- read(fdvsync, &(vSyncPoint.offset), 4); ++ r = read(fdvsync, &(vSyncPoint.chapter), 2); ++ if (r != 2) ++ perror("ERROR: read failed in displayBook"); ++ r = read(fdvsync, &(vSyncPoint.verse), 2); ++ if (r != 2) ++ perror("ERROR: read failed in displayBook"); ++ r = read(fdvsync, &(vSyncPoint.offset), 4); ++ if (r != 4) ++ perror("ERROR: read failed in displayBook"); + vSyncPoint.offset = SECTIONSLEVELSTART + (vSyncPoint.offset * SECTIONSLEVELSIZE); + lseek(fdsections, vSyncPoint.offset, SEEK_SET); + readSectionLevelInfo(fdsections, §ionLevelInfo); +@@ -408,26 +508,50 @@ + + + void readSectionName(int fd, SectionLevelInfo *sli, char **name) { ++ int r; + short size; + lseek(fd, sli->nameOffset, SEEK_SET); +- read(fd, &size, 2); ++ r = read(fd, &size, 2); ++ if (r != 2) ++ perror("ERROR: read failed in readSectionName"); + *name = new char [ size + 1 ]; +- read(fd, *name, size); ++ r = read(fd, *name, size); ++ if (r != size) ++ perror("ERROR: read failed in readSectionName"); + (*name)[size] = 0; + } + + void readSectionLevelInfo(int fd, SectionLevelInfo *sli) { ++ int r; + +- read(fd, &(sli->parentOffset), 4); +- read(fd, &(sli->previousOffset), 4); +- read(fd, &(sli->nextOffset), 4); +- read(fd, &(sli->viewableOffset), 4); ++ r = read(fd, &(sli->parentOffset), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readSectionLevelInfo"); ++ r = read(fd, &(sli->previousOffset), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readSectionLevelInfo"); ++ r = read(fd, &(sli->nextOffset), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readSectionLevelInfo"); ++ r = read(fd, &(sli->viewableOffset), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readSectionLevelInfo"); + sli->viewableOffset = VIEWABLEBLOCKSTART + (VIEWABLEBLOCKSIZE * sli->viewableOffset); +- read(fd, &(sli->startLevel), 2); +- read(fd, &(sli->level), 1); +- read(fd, &(sli->nameOffset), 4); +- read(fd, &(sli->outSync_1), 4); +- read(fd, &(sli->outSync_2), 2); ++ r = read(fd, &(sli->startLevel), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readSectionLevelInfo"); ++ r = read(fd, &(sli->level), 1); ++ if (r != 1) ++ perror("ERROR: read failed in readSectionLevelInfo"); ++ r = read(fd, &(sli->nameOffset), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readSectionLevelInfo"); ++ r = read(fd, &(sli->outSync_1), 4); ++ if (r != 4) ++ perror("ERROR: read failed in readSectionLevelInfo"); ++ r = read(fd, &(sli->outSync_2), 2); ++ if (r != 2) ++ perror("ERROR: read failed in readSectionLevelInfo"); + } + + void cleanBuf(char *buf) { +Index: sword/utilities/cipherraw.cpp +=================================================================== +--- sword.orig/utilities/cipherraw.cpp 2010-01-04 00:38:48.960718319 +0200 ++++ sword/utilities/cipherraw.cpp 2010-01-04 00:39:44.148729122 +0200 +@@ -43,7 +43,7 @@ + SWCipher *zobj; + VerseKey key; + RawVerse *rawdrv; +- int ofd[2], oxfd[2]; ++ int ofd[2], oxfd[2], w; + long tmpoff = 0, offset, loffset = 0, lzoffset = 0; + unsigned short size, lsize = 0, lzsize; + char *tmpbuf; +@@ -69,10 +69,18 @@ + delete [] tmpbuf; + + printf("\n"); +- write(oxfd[0], &lzoffset, 4); +- write(oxfd[0], &lzsize, 2); +- write(oxfd[1], &lzoffset, 4); +- write(oxfd[1], &lzsize, 2); ++ w = write(oxfd[0], &lzoffset, 4); ++ if (w < 0) ++ perror("ERROR: write failed in main"); ++ w = write(oxfd[0], &lzsize, 2); ++ if (w < 0) ++ perror("ERROR: write failed in main"); ++ w = write(oxfd[1], &lzoffset, 4); ++ if (w < 0) ++ perror("ERROR: write failed in main"); ++ w = write(oxfd[1], &lzsize, 2); ++ if (w < 0) ++ perror("ERROR: write failed in main"); + + key.AutoNormalize(0); + key.Headings(1); +@@ -84,8 +92,13 @@ + 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; +@@ -102,13 +115,23 @@ + 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: sword/utilities/lexdump.c +=================================================================== +--- sword.orig/utilities/lexdump.c 2010-01-04 00:38:49.004730321 +0200 ++++ sword/utilities/lexdump.c 2010-01-04 00:39:44.148729122 +0200 +@@ -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 @@ + + 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); --- sword-1.6.1+dfsg.orig/debian/patches/13_curl.diff +++ sword-1.6.1+dfsg/debian/patches/13_curl.diff @@ -0,0 +1,21 @@ +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. + +Index: sword/src/mgr/curlftpt.cpp +=================================================================== +--- sword.orig/src/mgr/curlftpt.cpp 2010-03-22 18:22:59.045847934 +0000 ++++ sword/src/mgr/curlftpt.cpp 2010-03-22 18:23:02.244846081 +0000 +@@ -177,6 +177,9 @@ + res = curl_easy_perform(session); + SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n"); + ++ // 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; + } --- sword-1.6.1+dfsg.orig/debian/patches/series +++ sword-1.6.1+dfsg/debian/patches/series @@ -0,0 +1,3 @@ +02_libver.diff +12_fix_compiler_warnings.diff +13_curl.diff --- sword-1.6.1+dfsg.orig/lib/url.loT +++ sword-1.6.1+dfsg/lib/url.loT @@ -0,0 +1,7 @@ +# url.lo - a libtool object file +# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object.