[bibtool] 05/05: Imported Debian patch 2.63+ds-1
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository bibtool.
commit ff3d3e84b1407e680766b91ded9f4260ee0ae022
Author: Jerome Benoit <calculus@rezozer.net>
Date: Fri Jan 29 03:04:51 2016 +0100
Imported Debian patch 2.63+ds-1
---
debian/{docs => bibtool.docs} | 2 +-
debian/changelog | 22 ++++-
debian/control | 4 +-
debian/patches/cleanup-upstream.patch | 2 +-
debian/patches/debianization-Changes_tex.patch | 2 +-
debian/patches/debianization-build.patch | 8 +-
debian/patches/debianization-clean.patch | 2 +-
debian/patches/debianization-configure.patch | 2 +-
debian/patches/debianization-regex.patch | 6 +-
debian/patches/debianization.patch | 54 ++++++------
debian/patches/fix-upstream-Changes_tex.patch | 12 +++
debian/patches/fix-upstream-README_ml.patch | 45 ++++++++++
debian/patches/rationalization-upstream-doc.patch | 3 +-
debian/patches/rationalization-upstream-test.patch | 94 ---------------------
debian/patches/reproducible-upstream-doc.patch | 25 ------
debian/patches/series | 4 +-
debian/source/include-binaries | 2 +-
debian/tests/control | 4 +
debian/tests/make-check | 2 +-
debian/{ => tests}/stresstest | 2 +-
.../signing-key.pgp} | Bin
21 files changed, 127 insertions(+), 170 deletions(-)
diff --git a/debian/docs b/debian/bibtool.docs
similarity index 89%
rename from debian/docs
rename to debian/bibtool.docs
index caab0e4..fe0fb18 100644
--- a/debian/docs
+++ b/debian/bibtool.docs
@@ -1,4 +1,4 @@
-README
+README.md
THANKS
ToDo
Changes.tex
diff --git a/debian/changelog b/debian/changelog
index ef112ac..170d823 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,30 @@
+bibtool (2.63+ds-1) unstable; urgency=medium
+
+ * New upstream version:
+ - integrate previous Debian reproducible patch and test enhancement.
+ * Debianization:
+ - debian/control:
+ - Vcs-* fields, secure;
+ - debian/docs:
+ - rename debian/bibtool.docs for consistency;
+ - update;
+ - debian/upstream-signing-key.pgp, move to debian/upstream/signing-key.pgp;
+ - debian/stresstest, move to debian/tests and recycle as Test-Command;
+ - debian/test/make-check, harden;
+ - debian/patches/*:
+ - debian/patches/fix-upstream-Changes_tex.patch, minor fix;
+ - debian/patches/fix-upstream-README_ml.patch, aesthetic fix;
+ - refresh.
+
+ -- Jerome Benoit <calculus@rezozer.net> Fri, 29 Jan 2016 02:04:04 +0000
+
bibtool (2.61+ds-4) unstable; urgency=medium
* Debianization:
- debian/copyright, update;
- debian/control:
- Recommends field, introduce;
- - Enhances filed, add.
+ - Enhances field, add.
- debian/tests/control, correct;
- debian/texts/make-check, rationalize.
diff --git a/debian/control b/debian/control
index eee17f8..4e96e56 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends:
tth, html2text
Standards-Version: 3.9.6
Homepage: http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html
-Vcs-Git: git://anonscm.debian.org/debian-tex/bibtool.git
-Vcs-Browser: http://anonscm.debian.org/cgit/debian-tex/bibtool.git
+Vcs-Git: https://anonscm.debian.org/git/debian-tex/bibtool.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-tex/bibtool.git
Package: bibtool
Architecture: any
diff --git a/debian/patches/cleanup-upstream.patch b/debian/patches/cleanup-upstream.patch
index 00fd724..79895e1 100644
--- a/debian/patches/cleanup-upstream.patch
+++ b/debian/patches/cleanup-upstream.patch
@@ -3,7 +3,7 @@ it is defined nowhere in the source and because
kpse_set_progname is deprecated.
--- a/init.c
+++ b/init.c
-@@ -80,12 +80,8 @@
+@@ -94,12 +94,8 @@
POSSIBLY_UNUSED(progname); /* */
/* */
#ifdef HAVE_LIBKPATHSEA
diff --git a/debian/patches/debianization-Changes_tex.patch b/debian/patches/debianization-Changes_tex.patch
index 15a7e2b..5a07405 100644
--- a/debian/patches/debianization-Changes_tex.patch
+++ b/debian/patches/debianization-Changes_tex.patch
@@ -1,7 +1,7 @@
debianization: provide material for TtH translator
--- a/Changes.tex
+++ b/Changes.tex
-@@ -18,6 +18,8 @@
+@@ -34,6 +34,8 @@
\newenvironment{Update}[1]{\item }{}
\newcommand\BS{\char`\\}
diff --git a/debian/patches/debianization-build.patch b/debian/patches/debianization-build.patch
index 1521ea7..dbf43c2 100644
--- a/debian/patches/debianization-build.patch
+++ b/debian/patches/debianization-build.patch
@@ -1,7 +1,7 @@
debianization: build part
--- a/AutoConf/makefile.in
+++ b/AutoConf/makefile.in
-@@ -186,6 +186,24 @@
+@@ -200,6 +200,24 @@
CXREF = cxref
# -------------------------------------------------------
@@ -26,7 +26,7 @@ debianization: build part
# Defines to support (non-ANSI) C compilers.
# For Solaris 2 you may have to define HAVE_STRING_H
# For some versions of Cygwin you may have to define
-@@ -433,6 +451,8 @@
+@@ -447,6 +465,8 @@
# The main target
# -----------------------------------------------------------------------------
@@ -35,7 +35,7 @@ debianization: build part
default all: bibtool$(EXT)
bibtool$(EXT): $(OFILES) $(REGEX) $(KPATHSEA_STATIC)
-@@ -462,6 +482,22 @@
+@@ -476,6 +496,22 @@
.c$(OBJ):
$(CC) $(C_FLAGS) $(DONT_LINK) -c $< -o $@
@@ -58,7 +58,7 @@ debianization: build part
# __________________________________________________________________
# Include the makefile into the dependencies to force updates
# when the makefile is modified.
-@@ -501,6 +537,8 @@
+@@ -515,6 +551,8 @@
info:
diff --git a/debian/patches/debianization-clean.patch b/debian/patches/debianization-clean.patch
index ce49b63..e4465c7 100644
--- a/debian/patches/debianization-clean.patch
+++ b/debian/patches/debianization-clean.patch
@@ -1,7 +1,7 @@
debianization: clean part
--- a/AutoConf/makefile.in
+++ b/AutoConf/makefile.in
-@@ -525,11 +525,15 @@
+@@ -539,11 +539,15 @@
-cd test && $(MAKE) $(MFLAGS) clean
-cd BibTcl && $(MAKE) $(MFLAGS) clean
-$(RM) $(CLEAN_TARGETS)
diff --git a/debian/patches/debianization-configure.patch b/debian/patches/debianization-configure.patch
index e1f085a..9eb1cf9 100644
--- a/debian/patches/debianization-configure.patch
+++ b/debian/patches/debianization-configure.patch
@@ -1,7 +1,7 @@
neutralize 'unrecognized options' warnings caused by dh_auto_config expectations
--- a/configure.in
+++ b/configure.in
-@@ -58,6 +58,10 @@
+@@ -72,6 +72,10 @@
AC_CHECK_FUNCS(strrchr)
dnl ---------------------------------------------------------------------------
diff --git a/debian/patches/debianization-regex.patch b/debian/patches/debianization-regex.patch
index 429a1ec..813b05b 100644
--- a/debian/patches/debianization-regex.patch
+++ b/debian/patches/debianization-regex.patch
@@ -1,7 +1,7 @@
use regex functions from glibc
--- a/AutoConf/makefile.in
+++ b/AutoConf/makefile.in
-@@ -210,17 +210,12 @@
+@@ -224,17 +224,12 @@
# GNU Regular Expression Library support.
# First of all the (sub)directory containing the
# necessary files (excluding trailing slash).
@@ -26,7 +26,7 @@ use regex functions from glibc
# Kpathsea Library support.
--- a/configure.in
+++ b/configure.in
-@@ -27,9 +27,9 @@
+@@ -41,9 +41,9 @@
dnl ---------------------------------------------------------------------------
dnl for regexp
@@ -39,7 +39,7 @@ use regex functions from glibc
dnl ---------------------------------------------------------------------------
dnl Checks for libraries.
-@@ -119,7 +119,8 @@
+@@ -133,7 +133,8 @@
dnl AC_CONFIG_SUBDIRS(BibTcl)
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 9ac8065..fcaf7ca 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -1,7 +1,7 @@
debianization
--- a/AutoConf/makefile.in
+++ b/AutoConf/makefile.in
-@@ -32,7 +32,7 @@
+@@ -46,7 +46,7 @@
# as the final location. This seems useful for building
# RPMs on Linux.
@@ -10,7 +10,7 @@ debianization
# -------------------------------------------------------
# Destination directory for make install
-@@ -57,7 +57,7 @@
+@@ -71,7 +71,7 @@
# are installed plus a final BibTool.
#
@@ -19,7 +19,7 @@ debianization
#-------------------------------------------------------
# Destination directory for make install.include
-@@ -84,7 +84,7 @@
+@@ -98,7 +98,7 @@
# optimizer is turned on.
#
@@ -28,7 +28,7 @@ debianization
# CFLAGS = -O
# GNU C
# CFLAGS = -g -Wall
-@@ -155,7 +155,7 @@
+@@ -169,7 +169,7 @@
# already existent. If your install does not support the
# -d option you can try to use mkdir instead.
@@ -39,45 +39,39 @@ debianization
# The ranlib program or : for nothing.
--- a/doc/make_version.pl
+++ b/doc/make_version.pl
-@@ -74,7 +74,7 @@
- %% Net: gene\@gerd-neugebauer.de
- %%
- %%********************************************************
--\\newcommand\\LIBDIR{/usr/local/lib/BibTool}
-+\\newcommand\\LIBDIR{/usr/share/bibtool}
- \\newcommand\\Year{$year}
- \\newcommand\\Version{$version}
- __EOF__
+@@ -46,7 +46,7 @@
+ #
+ my $verbose = 0;
+
+-my $LIBDIR = '/usr/local/lib/BibTool';
++my $LIBDIR = '/usr/share/bibtool';
+
+ use Getopt::Long;
+ GetOptions("h|help" => \&usage,
--- a/Perl/bibtool.pl
+++ b/Perl/bibtool.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
##*****************************************************************************
- ## $Id: bibtool.pl,v 1.3 2007-02-08 05:35:57 gene Exp $
- ##=============================================================================
+ ##
+ ## This file is part of BibTool.
--- a/Tcl/bibtool.tcl
+++ b/Tcl/bibtool.tcl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/tclsh
+#!/usr/bin/tclsh
##*****************************************************************************
- ## $Id: bibtool.tcl,v 1.1.1.1 2007-02-07 21:28:51 gene Exp $
- ##=============================================================================
---- a/test/BUnit.pm
-+++ b/test/BUnit.pm
-@@ -1,4 +1,4 @@
--#!/bin/perl -W
-+#!/usr/bin/perl -W
- # =============================================================================
- #
- # This file is part of BibTool.
-@@ -67,7 +67,7 @@
- # Variable: $BIBTOOLPROG
+ ##
+ ## This file is part of BibTool.
+--- a/test/lib/BUnit.pm
++++ b/test/lib/BUnit.pm
+@@ -97,7 +97,7 @@
+ # Variable: $BIBTOOL
# Description:
#
--our $BIBTOOLPROG = '/usr/local/bin/bibtool';
-+our $BIBTOOLPROG = '/usr/bin/bibtool';
- if (defined $ENV{'BIBTOOLPROG'}) { $BIBTOOLPROG = $ENV{'BIBTOOLPROG'} ; }
+-our $BIBTOOL = $ENV{'BIBTOOL_PRG'} || '../bibtool';
++our $BIBTOOL = $ENV{'BIBTOOL_PRG'} || '/usr/bin/bibtool';
#------------------------------------------------------------------------------
+ # Variable: $name_prefix
diff --git a/debian/patches/fix-upstream-Changes_tex.patch b/debian/patches/fix-upstream-Changes_tex.patch
new file mode 100644
index 0000000..1da4023
--- /dev/null
+++ b/debian/patches/fix-upstream-Changes_tex.patch
@@ -0,0 +1,12 @@
+correct a LaTeX typo.
+--- a/Changes.tex
++++ b/Changes.tex
+@@ -61,7 +61,7 @@
+ \end{Fix}
+ \begin{Update}{gene}
+ Minor improvements for the distribution.
+- \end{Fix}
++ \end{Update}
+ \begin{Update}{gene}
+ \File{README} renamed to \File{README.md} to comply with the
+ conventions of the GitHub repository.
diff --git a/debian/patches/fix-upstream-README_ml.patch b/debian/patches/fix-upstream-README_ml.patch
new file mode 100644
index 0000000..ddcf989
--- /dev/null
+++ b/debian/patches/fix-upstream-README_ml.patch
@@ -0,0 +1,45 @@
+cleanup some terminating spaces and other invisible characters;
+correct a combination involving UN*X that is overinterpreted by vim(1).
+--- a/README.md
++++ b/README.md
+@@ -13,10 +13,11 @@
+ ###### ## ##### ## #### #### #######
+
+ ----------------------------------------------------------------------
+-
++
++
+ BibTool: A Tool for Manipulating BibTeX Data Bases
+
+-
++
+ BibTeX provides an easy to use means to integrate citations and
+ bibliographies into LaTeX documents. But the user is left alone with
+ the management of the BibTeX files. The program BibTool is intended to
+@@ -26,7 +27,7 @@
+
+ * Pretty-printing BibTeX data bases adjustable by lots of parameters.
+
+-* Syntactic checks with error recovery superior to BibTeX and helpful
++* Syntactic checks with error recovery superior to BibTeX and helpful
+ error messages.
+
+ * Semantic checks can be specified by the user.
+@@ -55,7 +56,7 @@
+ pages (and still growing).
+
+ BibTool is written in C and has been compiled on various operating
+-systems like flavors of UN*X and MSDOG machines. It is distributed in
++systems like flavors of UNiX and MSDOG machines. It is distributed in
+ source code. No compiled versions are available from the author
+ (Useless to ask!).
+
+@@ -68,7 +69,7 @@
+ * http://mirrors.ctan.org/biblio/bibtex/utils/bibtool
+
+ Get the file BibTool-x.xx.tar.gz where x.xx is the version number.
+-Unpack it with the command (on UN*X)
++Unpack it with the command (on UNiX)
+
+ gunzip < BibTool-x.xx.tar.gz | tar -xvf -
+
diff --git a/debian/patches/rationalization-upstream-doc.patch b/debian/patches/rationalization-upstream-doc.patch
index 0dd6375..7d2281e 100644
--- a/debian/patches/rationalization-upstream-doc.patch
+++ b/debian/patches/rationalization-upstream-doc.patch
@@ -67,8 +67,9 @@ rationalization for the doc machinery
##-----------------------------------------------------------------------------
- config.tex: ..$(DIR_SEP)version.c
+-config.tex: ..$(DIR_SEP)version.c .$(DIR_SEP)make_version.pl
- .$(DIR_SEP)make_version.pl ..$(DIR_SEP)version.c > $*.tex
++config.tex: ..$(DIR_SEP)version.c
+ .$(DIR_SEP)make_version.pl $< > $@
##-----------------------------------------------------------------------------
diff --git a/debian/patches/rationalization-upstream-test.patch b/debian/patches/rationalization-upstream-test.patch
deleted file mode 100644
index e7fe352..0000000
--- a/debian/patches/rationalization-upstream-test.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-attempt to render test doable outside the build tree:
-BIBTOOL variable name is replaced by BIBTOOLPROG variable
-name in order to avoid interferences with the environment
-variable BIBTOOL used by bibtool itself; changes are meant
-to be compatible with previous usage; tests can be run by
-passing BIBTOOLPROG as environment variable (e.g.;
- $make -C test check BIBTOOLPROG=/usr/bin/bibtool ; );
-the changes allow automatic tests against bibtool as
-performed by the Debian Continuous Integration (CI) machinery
-( https://ci.debian.net/doc/ ).
-
---- a/test/makefile
-+++ b/test/makefile
-@@ -26,14 +26,13 @@
- EXT =
-
- # -----------------------------------------------------------------------------
--BIBTOOL = ../bibtool$(EXT)
-+BIBTOOLPROG ?= ../bibtool$(EXT)
- PERL = perl
-
--default all: $(BIBTOOL) $(SUITES)
-- @${PERL} -MBUnit -e "exit all()"
-+default all: check
-
--$(BIBTOOL): ../*.c ../*.h ../include/bibtool/*.h ../regex-0.12/*.[ch]
-- (cd ..; make)
-+check:
-+ @BIBTOOLPROG=${BIBTOOLPROG} ${PERL} -MBUnit -e "exit all()"
-
- clean:
- ${RM} *.log *.err *.???-expected *.out *~ *.bak
-@@ -44,7 +43,7 @@
-
- .SUFFIXES: .t .test $(SUFFIXES)
-
--.t.test: $(BIBTOOL)
-- @${PERL} -I. $<
-+.t.test:
-+ @BIBTOOLPROG=${BIBTOOLPROG} ${PERL} -I. $<
-
- #
---- a/test/BUnit.pm
-+++ b/test/BUnit.pm
-@@ -64,10 +64,11 @@
- our $VERSION = ('$Revision: 1.17 $ ' =~ m/[0-9.]+/ ? $& : '0.0' );
-
- #------------------------------------------------------------------------------
--# Variable: $BIBTOOL
-+# Variable: $BIBTOOLPROG
- # Description:
- #
--our $BIBTOOL = '../bibtool';
-+our $BIBTOOLPROG = '/usr/local/bin/bibtool';
-+if (defined $ENV{'BIBTOOLPROG'}) { $BIBTOOLPROG = $ENV{'BIBTOOLPROG'} ; }
-
- #------------------------------------------------------------------------------
- # Variable: %summary
-@@ -124,7 +125,7 @@
- my $bib = store_file(TEST_BIB, $a{bib}, TEST_BIB);
- my $args = $a{args} || '';
-
-- `$BIBTOOL $rsc $args $bib <$null 1>$out 2>$err`;
-+ `$BIBTOOLPROG $rsc $args $bib <$null 1>$out 2>$err`;
-
- if ( run_check($name, $a{check}) +
- check($a{expected_out}, $out, 'out', $a{fct_out}) +
-@@ -210,7 +211,7 @@
- $ENV{HOME} = getcwd;
-
-
-- die "*** '$BIBTOOL' executable not found\n" if not -x $BIBTOOL;
-+ die "*** '$BIBTOOLPROG' executable not found\n" if not -x $BIBTOOLPROG;
- die "*** Current dircetory is not writable\n" if not -w '.';
- die "*** .bibtoolrsc exists in current directory. Aborted\n"
- if -e ".bibtoolrsc";
-@@ -275,7 +276,7 @@
- #
- sub get_library_path {
- my $err = '_lib.err';
-- `$BIBTOOL -h 2>$err`;
-+ `$BIBTOOLPROG -h 2>$err`;
-
- my $library_path;
- local $_;
-@@ -293,7 +294,7 @@
- #
- sub get_configuration_options {
- my $err = '_lib.err';
-- `$BIBTOOL -h 2>$err`;
-+ `$BIBTOOLPROG -h 2>$err`;
-
- my $options;
- local $_;
diff --git a/debian/patches/reproducible-upstream-doc.patch b/debian/patches/reproducible-upstream-doc.patch
deleted file mode 100644
index a72eb80..0000000
--- a/debian/patches/reproducible-upstream-doc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-attempt to render reproducible TeX documents
-(see https://wiki.debian.org/ReproducibleBuilds/About ).
-
---- a/doc/make_version.pl
-+++ b/doc/make_version.pl
-@@ -57,7 +57,7 @@
-
- while(<>) {
- $version = $1 if m/bibtool_version *= *"([0-9.]*)/;
-- $year = $1 if m/\$Id: make_version.pl,v 1.3 2011-11-27 14:25:46 gene Exp $/;
-+ $year = $1 if m/bibtool_year *= *"(2[0-9]{3})/;
- }
-
- die "*** Missing version\n" if not defined $version;
---- a/Changes.tex
-+++ b/Changes.tex
-@@ -22,7 +22,7 @@
-
- \title{\BibTool{} Change Log}
- \author{Gerd Neugebauer}
--%\date{}
-+\date{}
- \maketitle
-
- \begin{Developers}
diff --git a/debian/patches/series b/debian/patches/series
index f5ba6b2..578371d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
+fix-upstream-README_ml.patch
+fix-upstream-Changes_tex.patch
cleanup-upstream.patch
-rationalization-upstream-test.patch
-reproducible-upstream-doc.patch
rationalization-upstream-doc.patch
secure-upstream-doc.patch
silence-upstream-doc.patch
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 95a390b..a610508 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1 +1 @@
-debian/upstream-signing-key.pgp
+debian/upstream/signing-key.pgp
diff --git a/debian/tests/control b/debian/tests/control
index 9f5f87c..1c0abd0 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,7 @@
Tests: make-check
Depends: bibtool, make
Restrictions: allow-stderr, needs-recommends
+
+Test-Command: debian/tests/stresstest test/bib/xampl.bib test/bib/xampl_s.bib $ADTTMP/STRESSTESTDIR
+Depends: bibtool
+Restrictions: needs-recommends
diff --git a/debian/tests/make-check b/debian/tests/make-check
index 90d1cea..7074042 100755
--- a/debian/tests/make-check
+++ b/debian/tests/make-check
@@ -18,7 +18,7 @@ BIBTOOLPROG = /usr/bin/bibtool
default:
check:
- BIBTOOLPROG=\$(BIBTOOLPROG) \$(PERL) -MBUnit -e "exit all()" || find . -name '*.err*' -o -name '*.out*' -printf "\n%f" | sort | xargs tail -n +1
+ BIBTOOL_PRG=\$(BIBTOOLPROG) \$(PERL) -Ilib -MBUnit -e "exit all()" || ( find . -name '*.err*' -o -name '*.out*' -printf "\n%f" | sort | xargs tail -n +1 ; exit 1 ; )
clean:
rm -f *.out* *.err*
diff --git a/debian/stresstest b/debian/tests/stresstest
old mode 100644
new mode 100755
similarity index 99%
rename from debian/stresstest
rename to debian/tests/stresstest
index 01520dd..94395f6
--- a/debian/stresstest
+++ b/debian/tests/stresstest
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
if [ $# == 0 ] || [ $# == 1 ]
then
diff --git a/debian/upstream-signing-key.pgp b/debian/upstream/signing-key.pgp
similarity index 100%
rename from debian/upstream-signing-key.pgp
rename to debian/upstream/signing-key.pgp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/bibtool.git
Reply to: