[bibtool] 06/06: Imported Debian patch 2.64+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 f6f9a5ca1d902298399ff0992bff38b003f8dcc1
Author: Jerome Benoit <calculus@rezozer.net>
Date: Sat Jun 11 20:27:50 2016 +0100
Imported Debian patch 2.64+ds-1
---
debian/changelog | 17 +-
debian/control | 2 +-
debian/copyright | 370 +++++++++++++++++++--
debian/patches/compress-upstream-doc.patch | 17 -
debian/patches/debianization-Changes_tex.patch | 4 +-
debian/patches/debianization-build.patch | 6 +-
debian/patches/debianization-clean.patch | 2 +-
debian/patches/fix-upstream-Changes_tex.patch | 12 -
debian/patches/fix-upstream-README_ml.patch | 45 ---
.../patches/fix-upstream-doc-bibtool_doc_sty.patch | 18 -
.../fix-upstream-source-spelling_error.patch | 38 ---
debian/patches/rationalization-upstream-doc.patch | 34 +-
debian/patches/secure-upstream-doc.patch | 4 +-
debian/patches/series | 7 +-
debian/patches/silence-upstream-doc.patch | 6 +-
.../upstream-source-silence-warnings-extra.patch | 40 +++
.../patches/upstream-source-silence-warnings.patch | 64 ++++
17 files changed, 502 insertions(+), 184 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 55f142e..c0877ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,23 @@
-bibtool (2.64+ds-0) UNRELEASED; urgency=medium
+bibtool (2.64+ds-1) unstable; urgency=medium
* New upstream version.
* Debianization:
+ - debian/copyright, revisit;
+ - debian/control, update;
+ - debian/patches/:
+ - d/p/upstream-source-silence-warnings.patch, introduce (and submit);
+ - d/p/upstream-source-silence-warnings-extra.patch, idem;
+ - d/p/rationalization-upstream-doc.patch, update;
+ - d/p/debianization-Changes_tex.patch, refresh;
+ - discard integrated and/or obsoleted patches:
+ - d/p/fix-upstream-README_ml.patch
+ - d/p/fix-upstream-Changes_tex.patch
+ - d/p/fix-upstream-doc-bibtool_doc_sty.patch
+ - d/p/fix-upstream-source-spelling_error.patch
+ - d/p/compress-upstream-doc.patch
- debian/watch, revisit.
- -- Jerome Benoit <calculus@rezozer.net> Fri, 10 Jun 2016 20:45:29 +0000
+ -- Jerome Benoit <calculus@rezozer.net> Sat, 11 Jun 2016 19:25:30 +0000
bibtool (2.63+ds-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 45f3bb7..6e1b911 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tex Maintainers <debian-tex-maint@lists.debian.org>
Uploaders: Jerome Benoit <calculus@rezozer.net>, Norbert Preining <preining@debian.org>
Build-Depends:
debhelper (>= 9), autotools-dev, dh-autoreconf, tex-common,
- texlive-binaries, texlive-latex-base, texlive-latex-recommended,
+ texlive-binaries, texlive-latex-base, texlive-latex-recommended, texlive-luatex,
libkpathsea-dev,
tth, html2text
Standards-Version: 3.9.8
diff --git a/debian/copyright b/debian/copyright
index 35a1a8d..fe6aff0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,8 +25,24 @@ Files-Excluded:
configure
Files: *
-Copyright: 1996-2015 Gerd Neugebauer <gene@gerd-neugebauer.de>
-License: GPL-1+
+Copyright: 1996-2016 Gerd Neugebauer <gene@gerd-neugebauer.de>
+License: GPL-2+
+
+Files:
+ Changes.tex
+ install.tex
+ doc/*
+Copyright: 1996-2016 Gerd Neugebauer <gene@gerd-neugebauer.de>
+License: CC-BY-SA-3.0
+
+Files: install-sh
+Copyright: 1991, the Massachusetts Institute of Technology
+License: MIT
+
+Files: mkdirchain
+Copyright: Noah Friedman <friedman@prep.ai.mit.edu>
+License: public-domain
+ This file is in the public domain and is not licensed under any copyright.
Files: debian/*
Copyright:
@@ -38,23 +54,6 @@ Comment:
This package was originally assembled by Brian Mays <brian@debian.org>
and later significantly revamped by Henning Makholm <henning@makholm.net>.
-License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 1 can be found in "/usr/share/common-licenses/GPL-1".
-
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -71,3 +70,336 @@ 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: CC-BY-SA-3.0
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+ SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
+ RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS"
+ BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION
+ PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
+ .
+ License
+ .
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
+ BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
+ CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED
+ HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+ .
+ 1. Definitions
+ "Adaptation" means a work based upon the Work, or upon the Work and
+ other pre-existing works, such as a translation, adaptation, derivative
+ work, arrangement of music or other alterations of a literary or
+ artistic work, or phonogram or performance and includes cinematographic
+ adaptations or any other form in which the Work may be recast,
+ transformed, or adapted including in any form recognizably derived from
+ the original, except that a work that constitutes a Collection will not
+ be considered an Adaptation for the purpose of this License. For the
+ avoidance of doubt, where the Work is a musical work, performance or
+ phonogram, the synchronization of the Work in timed-relation with a
+ moving image ("synching") will be considered an Adaptation for the
+ purpose of this License.
+ "Collection" means a collection of literary or artistic works, such as
+ encyclopedias and anthologies, or performances, phonograms or
+ broadcasts, or other works or subject matter other than works listed in
+ Section 1(f) below, which, by reason of the selection and arrangement of
+ their contents, constitute intellectual creations, in which the Work is
+ included in its entirety in unmodified form along with one or more other
+ contributions, each constituting separate and independent works in
+ themselves, which together are assembled into a collective whole. A work
+ that constitutes a Collection will not be considered an Adaptation (as
+ defined below) for the purposes of this License.
+ "Creative Commons Compatible License" means a license that is listed at
+ http://creativecommons.org/compatiblelicenses that has been approved by
+ Creative Commons as being essentially equivalent to this License,
+ including, at a minimum, because that license: (i) contains terms that
+ have the same purpose, meaning and effect as the License Elements of
+ this License; and, (ii) explicitly permits the relicensing of
+ adaptations of works made available under that license under this
+ License or a Creative Commons jurisdiction license with the same License
+ Elements as this License.
+ "Distribute" means to make available to the public the original and
+ copies of the Work or Adaptation, as appropriate, through sale or other
+ transfer of ownership.
+ "License Elements" means the following high-level license attributes as
+ selected by Licensor and indicated in the title of this License:
+ Attribution, ShareAlike.
+ "Licensor" means the individual, individuals, entity or entities that
+ offer(s) the Work under the terms of this License.
+ "Original Author" means, in the case of a literary or artistic work, the
+ individual, individuals, entity or entities who created the Work or if
+ no individual or entity can be identified, the publisher; and in
+ addition (i) in the case of a performance the actors, singers,
+ musicians, dancers, and other persons who act, sing, deliver, declaim,
+ play in, interpret or otherwise perform literary or artistic works or
+ expressions of folklore; (ii) in the case of a phonogram the producer
+ being the person or legal entity who first fixes the sounds of a
+ performance or other sounds; and, (iii) in the case of broadcasts, the
+ organization that transmits the broadcast.
+ "Work" means the literary and/or artistic work offered under the terms
+ of this License including without limitation any production in the
+ literary, scientific and artistic domain, whatever may be the mode or
+ form of its expression including digital form, such as a book, pamphlet
+ and other writing; a lecture, address, sermon or other work of the same
+ nature; a dramatic or dramatico-musical work; a choreographic work or
+ entertainment in dumb show; a musical composition with or without words;
+ a cinematographic work to which are assimilated works expressed by a
+ process analogous to cinematography; a work of drawing, painting,
+ architecture, sculpture, engraving or lithography; a photographic work
+ to which are assimilated works expressed by a process analogous to
+ photography; a work of applied art; an illustration, map, plan, sketch
+ or three-dimensional work relative to geography, topography,
+ architecture or science; a performance; a broadcast; a phonogram; a
+ compilation of data to the extent it is protected as a copyrightable
+ work; or a work performed by a variety or circus performer to the extent
+ it is not otherwise considered a literary or artistic work.
+ "You" means an individual or entity exercising rights under this License
+ who has not previously violated the terms of this License with respect
+ to the Work, or who has received express permission from the Licensor to
+ exercise rights under this License despite a previous violation.
+ "Publicly Perform" means to perform public recitations of the Work and
+ to communicate to the public those public recitations, by any means or
+ process, including by wire or wireless means or public digital
+ performances; to make available to the public Works in such a way that
+ members of the public may access these Works from a place and at a place
+ individually chosen by them; to perform the Work to the public by any
+ means or process and the communication to the public of the performances
+ of the Work, including by public digital performance; to broadcast and
+ rebroadcast the Work by any means including signs, sounds or images.
+ "Reproduce" means to make copies of the Work by any means including
+ without limitation by sound or visual recordings and the right of
+ fixation and reproducing fixations of the Work, including storage of a
+ protected performance or phonogram in digital form or other electronic
+ medium.
+ .
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+ limit, or restrict any uses free from copyright or rights arising from
+ limitations or exceptions that are provided for in connection with the
+ copyright protection under copyright law or other applicable laws.
+ .
+ 3. License Grant. Subject to the terms and conditions of this License,
+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+ perpetual (for the duration of the applicable copyright) license to
+ exercise the rights in the Work as stated below:
+ .
+ to Reproduce the Work, to incorporate the Work into one or more
+ Collections, and to Reproduce the Work as incorporated in the
+ Collections;
+ to create and Reproduce Adaptations provided that any such Adaptation,
+ including any translation in any medium, takes reasonable steps to
+ clearly label, demarcate or otherwise identify that changes were made to
+ the original Work. For example, a translation could be marked "The
+ original work was translated from English to Spanish," or a modification
+ could indicate "The original work has been modified.";
+ to Distribute and Publicly Perform the Work including as incorporated in
+ Collections; and,
+ to Distribute and Publicly Perform Adaptations.
+ .
+ For the avoidance of doubt:
+ Non-waivable Compulsory License Schemes. In those jurisdictions in
+ which the right to collect royalties through any statutory or
+ compulsory licensing scheme cannot be waived, the Licensor reserves
+ the exclusive right to collect such royalties for any exercise by
+ You of the rights granted under this License;
+ Waivable Compulsory License Schemes. In those jurisdictions in which
+ the right to collect royalties through any statutory or compulsory
+ licensing scheme can be waived, the Licensor waives the exclusive
+ right to collect such royalties for any exercise by You of the
+ rights granted under this License; and,
+ Voluntary License Schemes. The Licensor waives the right to collect
+ royalties, whether individually or, in the event that the Licensor
+ is a member of a collecting society that administers voluntary
+ licensing schemes, via that society, from any exercise by You of the
+ rights granted under this License.
+ .
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make such
+ modifications as are technically necessary to exercise the rights in other
+ media and formats. Subject to Section 8(f), all rights not expressly
+ granted by Licensor are hereby reserved.
+ .
+ 4. Restrictions. The license granted in Section 3 above is expressly made
+ subject to and limited by the following restrictions:
+ .
+ You may Distribute or Publicly Perform the Work only under the terms of
+ this License. You must include a copy of, or the Uniform Resource
+ Identifier (URI) for, this License with every copy of the Work You
+ Distribute or Publicly Perform. You may not offer or impose any terms on
+ the Work that restrict the terms of this License or the ability of the
+ recipient of the Work to exercise the rights granted to that recipient
+ under the terms of the License. You may not sublicense the Work. You
+ must keep intact all notices that refer to this License and to the
+ disclaimer of warranties with every copy of the Work You Distribute or
+ Publicly Perform. When You Distribute or Publicly Perform the Work, You
+ may not impose any effective technological measures on the Work that
+ restrict the ability of a recipient of the Work from You to exercise the
+ rights granted to that recipient under the terms of the License. This
+ Section 4(a) applies to the Work as incorporated in a Collection, but
+ this does not require the Collection apart from the Work itself to be
+ made subject to the terms of this License. If You create a Collection,
+ upon notice from any Licensor You must, to the extent practicable,
+ remove from the Collection any credit as required by Section 4(c), as
+ requested. If You create an Adaptation, upon notice from any Licensor
+ You must, to the extent practicable, remove from the Adaptation any
+ credit as required by Section 4(c), as requested.
+ You may Distribute or Publicly Perform an Adaptation only under the
+ terms of: (i) this License; (ii) a later version of this License with
+ the same License Elements as this License; (iii) a Creative Commons
+ jurisdiction license (either this or a later license version) that
+ contains the same License Elements as this License (e.g.,
+ Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible
+ License. If you license the Adaptation under one of the licenses
+ mentioned in (iv), you must comply with the terms of that license. If
+ you license the Adaptation under the terms of any of the licenses
+ mentioned in (i), (ii) or (iii) (the "Applicable License"), you must
+ comply with the terms of the Applicable License generally and the
+ following provisions: (I) You must include a copy of, or the URI for,
+ the Applicable License with every copy of each Adaptation You Distribute
+ or Publicly Perform; (II) You may not offer or impose any terms on the
+ Adaptation that restrict the terms of the Applicable License or the
+ ability of the recipient of the Adaptation to exercise the rights
+ granted to that recipient under the terms of the Applicable License;
+ (III) You must keep intact all notices that refer to the Applicable
+ License and to the disclaimer of warranties with every copy of the Work
+ as included in the Adaptation You Distribute or Publicly Perform; (IV)
+ when You Distribute or Publicly Perform the Adaptation, You may not
+ impose any effective technological measures on the Adaptation that
+ restrict the ability of a recipient of the Adaptation from You to
+ exercise the rights granted to that recipient under the terms of the
+ Applicable License. This Section 4(b) applies to the Adaptation as
+ incorporated in a Collection, but this does not require the Collection
+ apart from the Adaptation itself to be made subject to the terms of the
+ Applicable License.
+ If You Distribute, or Publicly Perform the Work or any Adaptations or
+ Collections, You must, unless a request has been made pursuant to
+ Section 4(a), keep intact all copyright notices for the Work and
+ provide, reasonable to the medium or means You are utilizing: (i) the
+ name of the Original Author (or pseudonym, if applicable) if supplied,
+ and/or if the Original Author and/or Licensor designate another party or
+ parties (e.g., a sponsor institute, publishing entity, journal) for
+ attribution ("Attribution Parties") in Licensor's copyright notice,
+ terms of service or by other reasonable means, the name of such party or
+ parties; (ii) the title of the Work if supplied; (iii) to the extent
+ reasonably practicable, the URI, if any, that Licensor specifies to be
+ associated with the Work, unless such URI does not refer to the
+ copyright notice or licensing information for the Work; and (iv) ,
+ consistent with Ssection 3(b), in the case of an Adaptation, a credit
+ identifying the use of the Work in the Adaptation (e.g., "French
+ translation of the Work by Original Author," or "Screenplay based on
+ original Work by Original Author"). The credit required by this Section
+ 4(c) may be implemented in any reasonable manner; provided, however,
+ that in the case of a Adaptation or Collection, at a minimum such credit
+ will appear, if a credit for all contributing authors of the Adaptation
+ or Collection appears, then as part of these credits and in a manner at
+ least as prominent as the credits for the other contributing authors.
+ For the avoidance of doubt, You may only use the credit required by this
+ Section for the purpose of attribution in the manner set out above and,
+ by exercising Your rights under this License, You may not implicitly or
+ explicitly assert or imply any connection with, sponsorship or
+ endorsement by the Original Author, Licensor and/or Attribution Parties,
+ as appropriate, of You or Your use of the Work, without the separate,
+ express prior written permission of the Original Author, Licensor and/or
+ Attribution Parties.
+ Except as otherwise agreed in writing by the Licensor or as may be
+ otherwise permitted by applicable law, if You Reproduce, Distribute or
+ Publicly Perform the Work either by itself or as part of any Adaptations
+ or Collections, You must not distort, mutilate, modify or take other
+ derogatory action in relation to the Work which would be prejudicial to
+ the Original Author's honor or reputation. Licensor agrees that in those
+ jurisdictions (e.g. Japan), in which any exercise of the right granted
+ in Section 3(b) of this License (the right to make Adaptations) would be
+ deemed to be a distortion, mutilation, modification or other derogatory
+ action prejudicial to the Original Author's honor and reputation, the
+ Licensor will waive or not assert, as appropriate, this Section, to the
+ fullest extent permitted by the applicable national law, to enable You
+ to reasonably exercise Your right under Section 3(b) of this License
+ (right to make Adaptations) but not otherwise.
+ .
+ 5. Representations, Warranties and Disclaimer
+ .
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+ OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+ KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT
+ OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER
+ OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF
+ IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+ .
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+ LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY
+ SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING
+ OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. Termination
+ .
+ This License and the rights granted hereunder will terminate
+ automatically upon any breach by You of the terms of this License.
+ Individuals or entities who have received Adaptations or Collections
+ from You under this License, however, will not have their licenses
+ terminated provided such individuals or entities remain in full
+ compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+ survive any termination of this License.
+ Subject to the above terms and conditions, the license granted here is
+ perpetual (for the duration of the applicable copyright in the Work).
+ Notwithstanding the above, Licensor reserves the right to release the
+ Work under different license terms or to stop distributing the Work at
+ any time; provided, however that any such election will not serve to
+ withdraw this License (or any other license that has been, or is
+ required to be, granted under the terms of this License), and this
+ License will continue in full force and effect unless terminated as
+ stated above.
+ .
+ 8. Miscellaneous
+ .
+ Each time You Distribute or Publicly Perform the Work or a Collection,
+ the Licensor offers to the recipient a license to the Work on the same
+ terms and conditions as the license granted to You under this License.
+ Each time You Distribute or Publicly Perform an Adaptation, Licensor
+ offers to the recipient a license to the original Work on the same terms
+ and conditions as the license granted to You under this License.
+ If any provision of this License is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of
+ the remainder of the terms of this License, and without further action
+ by the parties to this agreement, such provision shall be reformed to
+ the minimum extent necessary to make such provision valid and
+ enforceable.
+ No term or provision of this License shall be deemed waived and no
+ breach consented to unless such waiver or consent shall be in writing
+ and signed by the party to be charged with such waiver or consent.
+ This License constitutes the entire agreement between the parties with
+ respect to the Work licensed here. There are no understandings,
+ agreements or representations with respect to the Work not specified
+ here. Licensor shall not be bound by any additional provisions that may
+ appear in any communication from You. This License may not be modified
+ without the mutual written agreement of the Licensor and You.
+ The rights granted under, and the subject matter referenced, in this
+ License were drafted utilizing the terminology of the Berne Convention
+ for the Protection of Literary and Artistic Works (as amended on
+ September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
+ Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and
+ the Universal Copyright Convention (as revised on July 24, 1971). These
+ rights and subject matter take effect in the relevant jurisdiction in
+ which the License terms are sought to be enforced according to the
+ corresponding provisions of the implementation of those treaty
+ provisions in the applicable national law. If the standard suite of
+ rights granted under applicable copyright law includes additional rights
+ not granted under this License, such additional rights are deemed to be
+ included in the License; this License is not intended to restrict the
+ license of any rights under applicable law.
+
+License: MIT
+ Permission to use, copy, modify, distribute, and sell this software and
+ its documentation for any purpose is hereby granted without fee,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of M.I.T. not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission. M.I.T. makes no
+ representations about the suitability of this software for any purpose.
+ It is provided "as is" without express or implied warranty.
diff --git a/debian/patches/compress-upstream-doc.patch b/debian/patches/compress-upstream-doc.patch
deleted file mode 100644
index 21193ab..0000000
--- a/debian/patches/compress-upstream-doc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-produce compressed PDF outputs (when meaningful)
---- a/doc/bibtool-doc.sty
-+++ b/doc/bibtool-doc.sty
-@@ -10,6 +10,13 @@
- %%*****************************************************************************
- \ProvidesPackage{bibtool-doc}
-
-+\RequirePackage{ifpdf}
-+\ifpdf
-+\pdfminorversion=6
-+\pdfcompresslevel=9
-+\pdfobjcompresslevel=3
-+\fi
-+
- \RequirePackage{color}
- \RequirePackage{makeidx}
- \RequirePackage{booktabs}
diff --git a/debian/patches/debianization-Changes_tex.patch b/debian/patches/debianization-Changes_tex.patch
index 5a07405..6483621 100644
--- a/debian/patches/debianization-Changes_tex.patch
+++ b/debian/patches/debianization-Changes_tex.patch
@@ -1,11 +1,13 @@
debianization: provide material for TtH translator
--- a/Changes.tex
+++ b/Changes.tex
-@@ -34,6 +34,8 @@
+@@ -36,6 +36,10 @@
\newenvironment{Update}[1]{\item }{}
\newcommand\BS{\char`\\}
+%%tth: \providecommand\LaTeXe{\ensuremath{\rm L^AT_EX 2_e}}
++%%tth: \newenvironment{multicols}[1]{}{}
++%%tth: \providecommand\RaggedRight{}
+
\begin{document}%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/debian/patches/debianization-build.patch b/debian/patches/debianization-build.patch
index dbf43c2..b0204d5 100644
--- a/debian/patches/debianization-build.patch
+++ b/debian/patches/debianization-build.patch
@@ -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
-@@ -447,6 +465,8 @@
+@@ -450,6 +468,8 @@
# The main target
# -----------------------------------------------------------------------------
@@ -35,7 +35,7 @@ debianization: build part
default all: bibtool$(EXT)
bibtool$(EXT): $(OFILES) $(REGEX) $(KPATHSEA_STATIC)
-@@ -476,6 +496,22 @@
+@@ -479,6 +499,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.
-@@ -515,6 +551,8 @@
+@@ -518,6 +554,8 @@
info:
diff --git a/debian/patches/debianization-clean.patch b/debian/patches/debianization-clean.patch
index e4465c7..4d5407a 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
-@@ -539,11 +539,15 @@
+@@ -542,11 +542,15 @@
-cd test && $(MAKE) $(MFLAGS) clean
-cd BibTcl && $(MAKE) $(MFLAGS) clean
-$(RM) $(CLEAN_TARGETS)
diff --git a/debian/patches/fix-upstream-Changes_tex.patch b/debian/patches/fix-upstream-Changes_tex.patch
deleted file mode 100644
index 1da4023..0000000
--- a/debian/patches/fix-upstream-Changes_tex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index ddcf989..0000000
--- a/debian/patches/fix-upstream-README_ml.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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/fix-upstream-doc-bibtool_doc_sty.patch b/debian/patches/fix-upstream-doc-bibtool_doc_sty.patch
deleted file mode 100644
index 6086791..0000000
--- a/debian/patches/fix-upstream-doc-bibtool_doc_sty.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-provide backward portability for old font command; fix Debian bug #825894.
---- a/doc/bibtool-doc.sty
-+++ b/doc/bibtool-doc.sty
-@@ -17,7 +17,13 @@
- linkcolor=blue,
- urlcolor=blue,
- filecolor=blue,
-- citecolor=blue]{hyperref}
-+ citecolor=blue]{hyperref}
-+
-+\renewcommand{\rm}{\rmfamily}
-+\renewcommand{\sf}{\sffamily}
-+\renewcommand{\tt}{\ttfamily}
-+\renewcommand{\bf}{\bfseries}
-+\renewcommand{\sc}{\scshape}
-
- \DeclareRobustCommand\BibTool{\textsc{Bib\hskip-.1em\-%
- \mbox{T\hskip-.15emo\hskip-.05emo\hskip-.05eml}}}
diff --git a/debian/patches/fix-upstream-source-spelling_error.patch b/debian/patches/fix-upstream-source-spelling_error.patch
deleted file mode 100644
index 8c1e62a..0000000
--- a/debian/patches/fix-upstream-source-spelling_error.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-correct spelling typo in some source files as emitted by Lintian.
---- a/main.c
-+++ b/main.c
-@@ -142,8 +142,8 @@
- "\t%cA<c>\t\tKind of disambiguating key strings: <c>=0|a|A\n",
- "\t%cc\t\tInclude crossreferenced entries into the output (toggle)\n",
- "\t%cd\t\tCheck double entries (toggle)\n",
-- "\t%cf <format>\tKey generation enabled (formated key)\n",
-- "\t%cF\t\tKey generation enabled with formated key\n",
-+ "\t%cf <format>\tKey generation enabled (formatted key)\n",
-+ "\t%cF\t\tKey generation enabled with formatted key\n",
- "\t%ch\t\tPrint this help info and exit\n",
- "\t[%ci] infile\tSpecify input file. If %ci omitted it may not start\n",
- "\t\t\twith a %c. If absent stdin is taken to read from.\n",
---- a/test/main.t
-+++ b/test/main.t
-@@ -473,8 +473,8 @@
- -A<c> Kind of disambiguating key strings: <c>=0|a|A
- -c Include crossreferenced entries into the output (toggle)
- -d Check double entries (toggle)
-- -f <format> Key generation enabled (formated key)
-- -F Key generation enabled with formated key
-+ -f <format> Key generation enabled (formatted key)
-+ -F Key generation enabled with formatted key
- -h Print this help info and exit
- [-i] infile Specify input file. If -i omitted it may not start
- with a -. If absent stdin is taken to read from.
---- a/database.c
-+++ b/database.c
-@@ -82,7 +82,7 @@
-
- /*---------------------------------------------------------------------------*/
-
--#define SkipWarning WARNING("Skiping to next '@'")
-+#define SkipWarning WARNING("Skipping to next '@'")
-
- /*---------------------------------------------------------------------------*/
-
diff --git a/debian/patches/rationalization-upstream-doc.patch b/debian/patches/rationalization-upstream-doc.patch
index 7d2281e..238f191 100644
--- a/debian/patches/rationalization-upstream-doc.patch
+++ b/debian/patches/rationalization-upstream-doc.patch
@@ -6,10 +6,10 @@ rationalization for the doc machinery
MAKEINDEX = makeindex
+LATEX_DMFLAG = -draftmode
-+PDFLATEX_DMFLAG = -draftmode
++LUALATEX_DMFLAG = -draftmode
+
+LATEX_FMFLAG =
-+PDFLATEX_FMFLAG =
++LUALATEX_FMFLAG =
+
DIR_SEP = /
@@ -17,15 +17,15 @@ rationalization for the doc machinery
+BIBTOOL_IST = bibtool.ist
-.tex.pdf:
-- $(PDFLATEX) $<
+- $(LUALATEX) $<
-.tex.dvi:
- $(LATEX) $<
-.tex.toc:
-- $(PDFLATEX) $<
+- $(LUALATEX) $<
-.tex.idx:
-- $(PDFLATEX) $<
+- $(LUALATEX) $<
-.tex.aux:
-- $(PDFLATEX) $<
+- $(LUALATEX) $<
-.aux.bbl:
- $(BIBTEX) $*
+.SUFFIXES: .dvi .pdf $(SUFFIXES)
@@ -52,14 +52,14 @@ rationalization for the doc machinery
+ $(LATEX) $(LATEX_FMFLAG) $<
-bibtool.pdf: config.tex bibtool.tex bibtool.bbl bibtool.ind
-- $(PDFLATEX) bibtool
-- $(PDFLATEX) bibtool
+- $(LUALATEX) bibtool
+- $(LUALATEX) bibtool
+bibtool.pdf: bibtool.tex config.tex
-+ $(PDFLATEX) $(PDFLATEX_DMFLAG) $<
++ $(LUALATEX) $(LUALATEX_DMFLAG) $<
+ $(BIBTEX) $*
+ $(MAKEINDEX) -s $(BIBTOOL_IST) $*.idx
-+ $(PDFLATEX) $(PDFLATEX_DMFLAG) $<
-+ $(PDFLATEX) $(PDFLATEX_FMFLAG) $<
++ $(LUALATEX) $(LUALATEX_DMFLAG) $<
++ $(LUALATEX) $(LUALATEX_FMFLAG) $<
bibtool.ind ind index: bibtool.idx
- $(MAKEINDEX) -s bibtool.ist bibtool
@@ -79,8 +79,8 @@ rationalization for the doc machinery
+ $(LATEX) $(LATEX_FMFLAG) $<
ref_card.pdf: ref_card.tex config.tex
-- $(PDFLATEX) ref_card.tex
-+ $(PDFLATEX) $(PDFLATEX_FMFLAG) $<
+- $(LUALATEX) ref_card.tex
++ $(LUALATEX) $(LUALATEX_FMFLAG) $<
##-----------------------------------------------------------------------------
@@ -102,12 +102,12 @@ rationalization for the doc machinery
+ $(LATEX) $(LATEX_FMFLAG) $<
c_lib.pdf: c_lib.tex c_main.tex c.tex config.tex
-- $(PDFLATEX) c_lib.tex
+- $(LUALATEX) c_lib.tex
- $(MAKEINDEX) -s bibtool.ist c_lib
-- $(PDFLATEX) c_lib.tex
-+ $(PDFLATEX) $(PDFLATEX_DMFLAG) $<
+- $(LUALATEX) c_lib.tex
++ $(LUALATEX) $(LUALATEX_DMFLAG) $<
+ $(MAKEINDEX) -s $(BIBTOOL_IST) $*.idx
-+ $(PDFLATEX) $(PDFLATEX_FMFLAG) $<
++ $(LUALATEX) $(LUALATEX_FMFLAG) $<
c_main.tex: $(CDIR)main.c c_get.pl
- perl c_get.pl $(CDIR)main.c > $@
diff --git a/debian/patches/secure-upstream-doc.patch b/debian/patches/secure-upstream-doc.patch
index 6c0c6c4..1f3dd1e 100644
--- a/debian/patches/secure-upstream-doc.patch
+++ b/debian/patches/secure-upstream-doc.patch
@@ -6,9 +6,9 @@ secure TeX and its friends
##*****************************************************************************
-LATEX = latex
--PDFLATEX = pdflatex
+-LUALATEX = lualatex
+LATEX = latex -no-shell-escape
-+PDFLATEX = pdflatex -no-shell-escape
++LUALATEX = lualatex -no-shell-escape
BIBTEX = bibtex
MAKEINDEX = makeindex
diff --git a/debian/patches/series b/debian/patches/series
index b6e363e..0945471 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,9 @@
-fix-upstream-README_ml.patch
-fix-upstream-Changes_tex.patch
-fix-upstream-doc-bibtool_doc_sty.patch
-fix-upstream-source-spelling_error.patch
+upstream-source-silence-warnings.patch
+upstream-source-silence-warnings-extra.patch
cleanup-upstream.patch
rationalization-upstream-doc.patch
secure-upstream-doc.patch
silence-upstream-doc.patch
-compress-upstream-doc.patch
debianization.patch
debianization-configure.patch
debianization-regex.patch
diff --git a/debian/patches/silence-upstream-doc.patch b/debian/patches/silence-upstream-doc.patch
index 5f0e797..c7caff7 100644
--- a/debian/patches/silence-upstream-doc.patch
+++ b/debian/patches/silence-upstream-doc.patch
@@ -6,13 +6,13 @@ silence TeX and its friends
##*****************************************************************************
-LATEX = latex -no-shell-escape
--PDFLATEX = pdflatex -no-shell-escape
+-LUALATEX = lualatex -no-shell-escape
-BIBTEX = bibtex
-MAKEINDEX = makeindex
+LATEX = latex -no-shell-escape -interaction=batchmode
-+PDFLATEX = pdflatex -no-shell-escape -interaction=batchmode
++LUALATEX = lualatex -no-shell-escape -interaction=batchmode
+BIBTEX = bibtex -terse
+MAKEINDEX = makeindex -q
LATEX_DMFLAG = -draftmode
- PDFLATEX_DMFLAG = -draftmode
+ LUALATEX_DMFLAG = -draftmode
diff --git a/debian/patches/upstream-source-silence-warnings-extra.patch b/debian/patches/upstream-source-silence-warnings-extra.patch
new file mode 100644
index 0000000..05109a6
--- /dev/null
+++ b/debian/patches/upstream-source-silence-warnings-extra.patch
@@ -0,0 +1,40 @@
+silence gcc compiler warnings caused by unused varibles
+--- a/crossref.c
++++ b/crossref.c
+@@ -237,8 +237,7 @@
+ **___________________________________________________ */
+ void crossref_map(spec) /* */
+ String spec; /* */
+-{ String s; /* */
+- String *src, *dest; /* */
++{ String *src, *dest; /* */
+ String src_field, dest_field; /* */
+ String *sp, *dp; /* */
+ /* */
+@@ -320,7 +319,7 @@
+ Record rec; /* */
+ { register String *hp; /* */
+ register int i; /* */
+- String t, s, ms; /* */
++ String t, s; /* */
+ Record r = rec; /* */
+ int limit = rsc_xref_limit; /* */
+ String xdata = (rsc_expand_xdata ? sym_xdata : NONE);/* */
+--- a/record.c
++++ b/record.c
+@@ -296,13 +296,12 @@
+ { int len = 0; /* */
+ int i; /* */
+ register String *hp; /* */
+- register String s, t; /* */
++ register String t; /* */
+ /* */
+ for (i = RecordFree(rec), hp = RecordHeap(rec); /* visit all fields */
+ i > 0; /* */
+ i -= 2) /* */
+- { s = *hp++; /* */
+- t = *hp++; /* */
++ { t = *hp++; /* */
+ if (t != StringNULL) /* */
+ { len++; } /* */
+ } /* */
diff --git a/debian/patches/upstream-source-silence-warnings.patch b/debian/patches/upstream-source-silence-warnings.patch
new file mode 100644
index 0000000..01429ea
--- /dev/null
+++ b/debian/patches/upstream-source-silence-warnings.patch
@@ -0,0 +1,64 @@
+silence gcc compiler warnings
+--- a/rsc.c
++++ b/rsc.c
+@@ -47,6 +47,7 @@
+ #include <bibtool/s_parse.h>
+ #include <bibtool/entry.h>
+ #include <bibtool/type.h>
++#include <bibtool/crossref.h>
+ #include <bibtool/version.h>
+ #include "config.h"
+ #define RSC_INIT
+--- a/include/bibtool/s_parse.h
++++ b/include/bibtool/s_parse.h
+@@ -57,6 +57,6 @@
+ String s_parse _ARG((int type, String *sp, int errp));/* s_parse.c */
+ int sp_open _ARG((String s)); /* s_parse.c */
+ void sp_close _ARG((void)); /* s_parse.c */
+- int sp_expect _ARG((String*sp, String expect, int vaerbose));/* s_parse.c */
++ int sp_expect _ARG((String *sp, String expect, int vaerbose));/* s_parse.c */
+ String* sp_symbols _ARG((String *sp)); /* s_parse.c */
+
+--- a/s_parse.c
++++ b/s_parse.c
+@@ -52,7 +52,7 @@
+ /*---------------------------------------------------------------------------*/
+
+ #define Error(E,S,A,B) \
+- if(E) error(ERR_ERROR|ERR_POINT,A,(String)B,(String)0,sp_line,(String)S,0,(char*)0)
++ if(E) error(ERR_ERROR|ERR_POINT,(String)A,(String)B,(String)0,sp_line,(String)S,0,(char*)0)
+
+ static String unexpected = (String)"Unexpected ";/* */
+ static String expected = (String)" expected.";/* */
+--- a/crossref.c
++++ b/crossref.c
+@@ -358,15 +358,15 @@
+ t++; /* */
+ (void)sp_open(t); /* Try to extract */
+ /* */
+- if (sp_expect(&t, "}", 0) ) return FALSE; /* */
++ if (sp_expect(&t, (String)"}", 0) ) return FALSE; /* */
+ for (;;) /* */
+ { if ((s = SParseSymbol(&t)) == NULL) /* */
+ { return TRUE; } /* */
+ /* */
+ insert_record(db, rec, hp, s, "XData"); /* */
+ /* */
+- if (sp_expect(&t, "}", 0) ) break; /* */
+- sp_expect(&t, ",", 1); /* */
++ if (sp_expect(&t, (String)"}", 0) ) break; /* */
++ sp_expect(&t, (String)",", 1); /* */
+ } /* */
+ } /* */
+ } /* */
+--- a/key.c
++++ b/key.c
+@@ -366,7 +366,7 @@
+ { case KEY_BASE_UPPER: return (String)"upper"; /* */
+ case KEY_BASE_LOWER: return (String)"lower"; /* */
+ case KEY_BASE_DIGIT: return (String)"digit"; /* */
+- default: return ""; /* */
++ default: return (String)""; /* */
+ } /* */
+ } /*------------------------*/
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/bibtool.git
Reply to: