Changelog for 4.38

diff --git a/CVS/Entries b/CVS/Entries
new file mode 100644 (file)
index 0000000..8b1a24c
--- /dev/null
+++ b/CVS/Entries
@@ -0,0 +1,31 @@
+/README.bible/2.0/Wed Jan  8 15:29:51 2003//
+/README.ftp/2.0/Wed Jan  8 15:29:51 2003//
+/README.linux/2.0/Wed Jan  8 15:29:51 2003//
+/bible.lsm/2.0/Wed Jan  8 15:29:51 2003//
+/bible.pkg/2.0/Wed Jan  8 15:29:51 2003//
+/bible.stopwords/2.0/Wed Jan  8 15:29:52 2003//
+/makeconc.pl/2.0/Wed Jan  8 15:29:52 2003//
+/makeconcordance/2.0/Wed Jan  8 15:29:52 2003//
+/testall/2.0/Wed Jan  8 15:29:52 2003//
+D/debian////
+/bible.rawtext/2.1/Wed Jan  8 16:21:36 2003//
+/makeindex2/2.2/Mon Jan 13 17:40:29 2003//
+/bible.h/2.2/Fri Jan 21 18:32:13 2005//
+/brl-index.c/2.1/Fri Jan 21 18:57:48 2005//
+/tsl.h/2.4/Sat Jan 22 00:25:08 2005//
+/util.c/2.2/Sat Jan 22 00:28:09 2005//
+/squish.h/2.2/Sat Jan 22 17:15:57 2005//
+/brl.h/2.2/Sat Jan 22 17:47:23 2005//
+/buildcmp.c/2.6/Sat Jan 22 18:23:16 2005//
+/cmp.h/2.3/Sat Jan 22 18:47:45 2005//
+/bible.1/2.2/Sat Jan 22 19:15:02 2005//
+/tsl.c/2.10/Sat Jan 22 18:47:06 2005//
+/Makefile/2.11/Sat Jan 22 23:31:01 2005//
+/brl.c/2.7/Sun Jan 23 11:29:54 2005//
+/compresslib.c/2.9/Sun Jan 23 11:29:54 2005//
+/makeconcfile.c/2.7/Sun Jan 23 11:29:54 2005//
+/makeindex.c/2.6/Sun Jan 23 11:29:54 2005//
+/squish.c/2.18/Sun Jan 23 11:29:54 2005//
+/util.h/2.6/Sun Jan 23 11:29:54 2005//
+/version.h/2.4/Sun Jan 23 11:29:54 2005//
+/bible.c/2.7/Tue Mar 11 20:48:41 2008//

diff --git a/CVS/Repository b/CVS/Repository
new file mode 100644 (file)
index 0000000..06ab31a
--- /dev/null
+++ b/CVS/Repository
@@ -0,0 +1 @@
+bible-kjv-4.10

diff --git a/CVS/Root b/CVS/Root
new file mode 100644 (file)
index 0000000..7905ca3
--- /dev/null
+++ b/CVS/Root
@@ -0,0 +1 @@
+/home/matthew/cvs

diff --git a/Makefile b/Makefile
index 3b998b8946cede50e1ca18bc42ef64f81f486d2e..6365c543891416486768d07beeb10d0d46e89bdb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ DESTMAN1      = $(DESTMAN)/man1
 
 # I use environment variables for these...
 #CFLAGS              = -g
-CFLAGS       = -Wall -Wformat -Werror -Wshadow -W -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wcast-align -Wcast-qual -Wbad-function-cast -Wpointer-arith -g2 -ggdb -DDESTLIB=\"$(DESTLIB)\"
+CFLAGS       = -Wall -Wformat -Werror -Wshadow -W -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wcast-align -Wcast-qual -Wbad-function-cast -Wpointer-arith -g2 -ggdb -DDESTLIB=\"$(DESTLIB)\" -ffile-prefix-map=$(CURDIR)=.
 LDFLAGS       = 
 LDADD         = -lreadline
 

diff --git a/debian/CVS/Entries b/debian/CVS/Entries
new file mode 100644 (file)
index 0000000..c1be16f
--- /dev/null
+++ b/debian/CVS/Entries
@@ -0,0 +1,20 @@
+/README.randverse/2.0/Wed Jan  8 15:50:53 2003//
+/bible-kjv-text.dirs/2.0/Wed Jan  8 15:50:53 2003//
+/bible-kjv-text.files/2.0/Wed Jan  8 15:50:53 2003//
+/bible-kjv-text.postinst/2.0/Wed Jan  8 15:50:53 2003//
+/bible-kjv-text.prerm/2.0/Wed Jan  8 15:50:53 2003//
+/dirs/2.0/Wed Jan  8 15:50:53 2003//
+/menu/2.0/Wed Jan  8 15:50:53 2003//
+/notes/2.0/Wed Jan  8 15:50:53 2003//
+/postinst/2.0/Wed Jan  8 15:50:53 2003//
+/postrm/2.0/Wed Jan  8 15:50:53 2003//
+/prerm/2.0/Wed Jan  8 15:50:53 2003//
+/randverse.1/2.0/Wed Jan  8 15:50:53 2003//
+/randverse.c/2.0/Wed Jan  8 15:50:53 2003//
+/text.readme/2.0/Wed Jan  8 15:50:53 2003//
+/control/2.2/Wed Jan  8 18:57:38 2003//
+/copyright/2.1/Sat Jan 22 19:11:24 2005//
+/substvars/2.0/Sun Jan 23 11:31:00 2005//
+/rules/2.5/Thu Feb  7 21:07:32 2008//
+/changelog/2.11/Tue Mar 11 20:50:46 2008//
+D

diff --git a/debian/CVS/Repository b/debian/CVS/Repository
new file mode 100644 (file)
index 0000000..360891f
--- /dev/null
+++ b/debian/CVS/Repository
@@ -0,0 +1 @@
+bible-kjv-4.10/debian

diff --git a/debian/CVS/Root b/debian/CVS/Root
new file mode 100644 (file)
index 0000000..7905ca3
--- /dev/null
+++ b/debian/CVS/Root
@@ -0,0 +1 @@
+/home/matthew/cvs

diff --git a/debian/changelog b/debian/changelog
index 6e20b7a605336b8cdafd533dfac4fdf485f4a276..071d25e94072c20b3c0caa872cdfe9a40b735d51 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,73 @@
+bible-kjv (4.38) unstable; urgency=medium
+
+  * Patches from Vagrant Cascadian to use -ffile-prefix-map to make build
+    reproducible (Closes: #1020813)
+
+ -- Matthew Vernon <matthew@debian.org>  Fri, 30 Sep 2022 15:22:50 +0100
+
+bible-kjv (4.37) unstable; urgency=medium
+
+  * Correct function signature of shortuniv_assign (Closes: #983989)
+
+ -- Matthew Vernon <matthew@debian.org>  Tue, 12 Oct 2021 08:59:18 +0100
+
+bible-kjv (4.36) unstable; urgency=medium
+
+  * Add tests for use with autopkgtest
+
+ -- Matthew Vernon <matthew@debian.org>  Sun, 22 Aug 2021 12:23:02 +0100
+
+bible-kjv (4.35) unstable; urgency=medium
+
+  * Fix off-by-one error in line numbers (and thus concordance)
+  * Update release_version
+
+ -- Matthew Vernon <matthew@debian.org>  Sat, 21 Aug 2021 18:02:31 +0100
+
+bible-kjv (4.34) unstable; urgency=medium
+
+  * Check for error return value
+
+ -- Matthew Vernon <matthew@debian.org>  Mon, 19 Jul 2021 12:36:43 +0100
+
+bible-kjv (4.33) unstable; urgency=medium
+
+  * Make the build not run in parallel 
+  * Use bible.rawtext to build concordance (Closes: #991133)
+
+ -- Matthew Vernon <matthew@debian.org>  Mon, 19 Jul 2021 12:10:28 +0100
+
+bible-kjv (4.32) unstable; urgency=medium
+
+  * Patch from Helmut Grohne to fix FTCBFS: (Closes: #947616)
+    + Let dh_auto_build pass cross tools to make.
+    + Additionally override LD.
+    + Keep building the build tools for the build architecture.
+    + Seed the compiler used for randverse from dpkg's buildtools.mk.
+    + Use dh_strip as it uses the correct cross tool.
+
+ -- Matthew Vernon <matthew@debian.org>  Sun, 21 Feb 2021 16:05:00 +0000
+
+bible-kjv (4.31) unstable; urgency=medium
+
+  * Relicence GPL-2 code to GPL-2+ (my code and that of Oliver
+    Elphick, who has agreed) (Closes: #977639)
+  * Bump standards-version
+
+ -- Matthew Vernon <matthew@debian.org>  Thu, 24 Dec 2020 13:26:42 +0000
+
+bible-kjv (4.30) unstable; urgency=medium
+
+  * Fix string overflow bug found by gcc-8 (Closes: #897712)
+
+ -- Matthew Vernon <matthew@debian.org>  Sat, 12 May 2018 10:03:54 +0100
+
+bible-kjv (4.29) unstable; urgency=low
+
+  * Add mandatory build-{arch,indep} targets to debian/rules (Closes: #821966)
+
+ -- Matthew Vernon <matthew@debian.org>  Thu, 07 Jul 2016 08:23:41 +0100
+
 bible-kjv (4.28) unstable; urgency=low
 
   * patch from Adam Borowski to fix FTBFS on x32 (Closes: #700012)

diff --git a/debian/control b/debian/control
index 37f731b401e90b7380c5d5f19946a7cc8cb26cf9..de5fbd7c97974af5f49eea8c0fbdf85a72360d30 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: bible-kjv
 Section: doc
 Priority: optional
 Maintainer: Matthew Vernon <matthew@debian.org>
-Build-Depends: libreadline-dev
-Standards-Version: 3.5.6
+Build-Depends: libreadline-dev, debhelper-compat (= 12)
+Standards-Version: 4.5.1
 
 Package: bible-kjv
 Architecture: any
-Depends: ${shlibs:Depends}, bible-kjv-text
+Depends: ${shlibs:Depends}, ${misc:Depends}, bible-kjv-text
 Conflicts: verse (<= 0.20)
 Suggests: verse
 Description: King James Version of the Bible: user interface program.
@@ -21,6 +21,7 @@ Description: King James Version of the Bible: user interface program.
 
 Package: bible-kjv-text
 Architecture: all
+Depends: ${misc:Depends}
 Recommends: bible-kjv
 Conflicts: bible-kjv (<< 4.00-5)
 Description: King James Version of the Bible - text and concordance

diff --git a/debian/copyright b/debian/copyright
index 10b4d6e05c8f9b43612fe26bdfe17911ce5deeac..aa2bb354b8863d477c025560d95466204c148e27 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,7 +18,7 @@ Debianized Package Released September 20, 1996 by
 Rev. Christoph Lameter (Master of Divinity, Master of Science)
 
 Substantial work on the code by Matthew Vernon <matthew@debian.org>
-Copyright 2003-2005. Its licence is GPL version 2.
+Copyright 2003-2018. Its licence is GPL version 2 or later.
 
 The copyright for the King James Version text of the Bible is expired since
 the  translation was done in 1611 under King James the first of Great
@@ -27,7 +27,7 @@ Britain.
                         =========================
 
 randverse is copyright of Oliver Elphick <Oliver.Elphick@lfix.co.uk>, 1997.
-Its licence is GPL version 2. Its original source is this package.
+Its licence is GPL version 2 or later. Its original source is this package.
 
-The text of the GPL can be found in /usr/share/common-licenses/GPL.
+The text of the GPL can be found in /usr/share/common-licenses/GPL-2.
 

diff --git a/debian/rules b/debian/rules
index f3a132c97f89543bd651b3022ebcf25bd1d87545..57e8174b743adabf3c6113183315dba644068520 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,14 +13,23 @@
 # dpkg-buildpackage in a package-independent way, and so these targets
 # are obsolete.
 
+include /usr/share/dpkg/architecture.mk
+-include /usr/share/dpkg/buildtools.mk
+
 package=bible-kjv
 
 build:
        $(checkdir)
-       $(MAKE) all
-       cd debian && gcc -g -O2 -o randverse randverse.c
+       dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_build --no-parallel -- bible-index.c bible.data bible.data.conc 'LD=$$(CC)'
+       rm -f *.o
+       dh_auto_build --no-parallel -- bible 'LD=$$(CC)'
+       cd debian && $(CC) -g -O2 -ffile-prefix-map=$(CURDIR)=. -o randverse randverse.c
        touch build
 
+build-arch: build
+
+build-indep: build
+
 clean:
        $(checkdir)
        -rm -f build
@@ -61,19 +70,10 @@ binary-arch:        checkroot build
        install -d debian/tmp/usr/share/man/man1
        install -d debian/tmp/usr/bin debian/tmp/usr/lib
        make install DEST=debian/tmp/usr
-       #Is nostrip set in DEB_BUILD_OPTIONS?
-       case "$$DEB_BUILD_OPTIONS" in \
-       *nostrip*)\
-       install -m 755 debian/randverse debian/tmp/usr/bin && \
-       install -m 755 bible debian/tmp/usr/bin && \
-       install -m 644 debian/randverse.1 debian/tmp/usr/share/man/man1 \
-       ;; \
-       *) \
-       install -s -m 755 debian/randverse debian/tmp/usr/bin && \
-       install -s -m 755 bible debian/tmp/usr/bin && \
-       install -m 644 debian/randverse.1 debian/tmp/usr/share/man/man1 \
-       ;; \
-       esac
+       install -m 755 debian/randverse debian/tmp/usr/bin
+       install -m 755 bible debian/tmp/usr/bin
+       install -m 644 debian/randverse.1 debian/tmp/usr/share/man/man1
+       dh_strip -p$(package) --tmpdir=debian/tmp
        cp debian/notes debian/copyright debian/tmp/usr/share/doc/$(package)/.
        cp debian/changelog debian/tmp/usr/share/doc/$(package)/changelog
        cp README* debian/README* debian/tmp/usr/share/doc/$(package)
@@ -104,4 +104,4 @@ checkroot:
        $(checkdir)
        test root = "`whoami`"
 
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean checkroot build-arch build-indep

diff --git a/debian/tests/bible-tests.sh b/debian/tests/bible-tests.sh
new file mode 100755 (executable)
index 0000000..ecab3a3
--- /dev/null
+++ b/debian/tests/bible-tests.sh
@@ -0,0 +1,16 @@
+#!/bin/bash -ex
+
+#Simple lookup - only 1 matching verse
+bible -f '??girl' | grep 'Jl3:3'
+
+#Simple lookup - 1840 matches, 2 header lines
+diff -u <( bible -f '??hath' | wc -l ) <(echo 1842)
+
+#Check text of a verse is correct
+bible -f Jn11:35 | grep -F "John11:35 Jesus wept."
+
+#Check search combination (cumbersome on the CLI)
+diff -u <( bible -f ??beginning "?a end" "?a year" | tail -1 ) <( echo "Dt11:12" )
+
+#Check output matches entire rawtext file (less header line)
+diff -u <( bible -f 'gen1:1-rev99:99' ) <( tail -n +2 bible.rawtext )

diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644 (file)
index 0000000..6c05e81
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+#Autopkg tests for the Bible package
+Tests: bible-tests.sh
+Restrictions: allow-stderr

diff --git a/makeconc.pl b/makeconc.pl
index 97a388db6525766294c7d70633176ed2aa1e2937..6ccc32d4392b0e35253e2ce3ee934722b3828b6a 100755 (executable)
--- a/makeconc.pl
+++ b/makeconc.pl
@@ -18,6 +18,7 @@
 #  Received from Chris Eich, replaces "makeconcordance" script.
 #  Made use of stopwords conditional.
 ###############################################################################
+use IO::Handle
 
 # Putting . on PATH ensures that the bible program will be found.
 $ENV{'PATH'} =~ s/^:*/.:/;
@@ -40,7 +41,8 @@ if (open(STOP, "$ARGV[0]")) {
 # Generate plain text file, one "record" (e.g. bible verse) per line.
 # Fill %lines and $count tables, which are keyed by words.
 
-open(BIBLE, "$PROG -f gen1:1-rev99:99 |");
+open(BIBLE, "bible.rawtext");
+<BIBLE>; #discard the header line
 while (<BIBLE>) {
     s/^\S+\s+//;       # Cut off the record reference that starts each line.
     tr/A-Z/a-z/;       # Downcase.
@@ -50,10 +52,11 @@ while (<BIBLE>) {
        next if $stopword{$word};
        $count{$word}++;        # Move below next line to count per-line.
        next if $seenonthisline{$word}++;
-       $lines{$word} .= " " . $.;
+       #the header line discard still leaves $. 1 higher than we want
+       $lines{$word} .= " " . ($. - 1);
     }
 }
-close(BIBLE);
+die $! if BIBLE->error();
 
 # Create raw concordance, listing the lines where each word occurs.
 

diff --git a/tsl.c b/tsl.c
index f6d90b20ec6fb6cc65325ccf8ad5b452e32e79d6..d5946a2129c0268406f71089645dbf1bf2f20fd6 100644 (file)
--- a/tsl.c
+++ b/tsl.c
@@ -595,7 +595,7 @@ void tsl_init(char *dfname,char *path, const int memlimit)
     Univ_Int *up;
     int tablesize;
 #define STRSZ 255
-    char cfname[STRSZ];
+    char cfname[STRSZ+1]; /*allow space for trailing NULL*/
 
     if (memlimit > 0)
        tsl_maxbuffusage = memlimit<<10;        /* times 1024 */

diff --git a/util.c b/util.c
index 1c6f64f2780063f365310969e5c4b7dc6eb17cde..2d14bee211f8452606d6b29ba9073aaf6b672ed0 100644 (file)
--- a/util.c
+++ b/util.c
@@ -128,7 +128,7 @@ void univ_assign(Univ_Int dst,int src)
 } /* univ_assign */
 
 
-void shortuniv_assign(Univ_Int dst,int src)
+void shortuniv_assign(Short_Univ_Int dst,int src)
 /*----------------------------------------------------------------------
 |   NAME:
 |       shortuniv_assign

diff --git a/util.h b/util.h
index 3868c7a485a55a370c86d50fddd86b5da903f89e..e7297697938137543237c9210d20a445bccac4a5 100644 (file)
--- a/util.h
+++ b/util.h
@@ -63,7 +63,7 @@ typedef unsigned char Short_Univ_Int[2]; /* shorter Univ_Int */
 int univ2int(Univ_Int src);
 int shortuniv2int(Short_Univ_Int src);
 void univ_assign(Univ_Int dst,int src);
-void shortuniv_assign(Univ_Int dst,int src);
+void shortuniv_assign(Short_Univ_Int dst,int src);
 
 FILE *findfile(char *dfname,char *pathlist);
 

diff --git a/version.h b/version.h
index 635dc3ee11d9d0c0058bb8ed427f8056abe2e4eb..444bcf852e89def0188941be40e49dd899c432f7 100644 (file)
--- a/version.h
+++ b/version.h
@@ -72,4 +72,4 @@
 *******************************************************************************
 */
 
-static char release_version[]="Debian/BRS Release 4.18, $Date: 2005/01/23 11:29:22 $";
+static char release_version[]="Debian/BRS Release 4.36";