[bibtool] 05/05: Imported Debian patch 2.66+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 eed41250db70c8400a3c0954bb5ed3deddf0cab3
Author: Jerome Benoit <calculus@rezozer.net>
Date: Thu Nov 10 07:14:23 2016 +0000
Imported Debian patch 2.66+ds-1
---
debian/changelog | 8 ++++++++
debian/patches/cleanup-upstream.patch | 2 +-
debian/patches/debianization-build.patch | 6 +++---
debian/patches/debianization-clean.patch | 2 +-
debian/patches/debianization-configure.patch | 6 +++---
debian/patches/debianization-regex.patch | 10 +++++-----
debian/patches/debianization.patch | 2 +-
debian/patches/series | 2 --
debian/patches/upstream-Changes_tex-date_setup.patch | 12 ------------
.../patches/upstream-test-security-local_load-explicit.patch | 12 ------------
10 files changed, 22 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dc29df6..54e1318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bibtool (2.66+ds-1) unstable; urgency=medium
+
+ * New upstream version.
+ * Debianization:
+ - debian/patches/*, refresh.
+
+ -- Jerome Benoit <calculus@rezozer.net> Thu, 10 Nov 2016 07:10:02 +0000
+
bibtool (2.65+ds-2) unstable; urgency=medium
* Debianization:
diff --git a/debian/patches/cleanup-upstream.patch b/debian/patches/cleanup-upstream.patch
index 79895e1..dea14e3 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
-@@ -94,12 +94,8 @@
+@@ -93,12 +93,8 @@
POSSIBLY_UNUSED(progname); /* */
/* */
#ifdef HAVE_LIBKPATHSEA
diff --git a/debian/patches/debianization-build.patch b/debian/patches/debianization-build.patch
index b0204d5..77bf81d 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
-@@ -450,6 +468,8 @@
+@@ -452,6 +470,8 @@
# The main target
# -----------------------------------------------------------------------------
@@ -35,7 +35,7 @@ debianization: build part
default all: bibtool$(EXT)
bibtool$(EXT): $(OFILES) $(REGEX) $(KPATHSEA_STATIC)
-@@ -479,6 +499,22 @@
+@@ -481,6 +501,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.
-@@ -518,6 +554,8 @@
+@@ -520,6 +556,8 @@
info:
diff --git a/debian/patches/debianization-clean.patch b/debian/patches/debianization-clean.patch
index 4d5407a..2a1c6a7 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
-@@ -542,11 +542,15 @@
+@@ -544,11 +544,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 9eb1cf9..2f45106 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
-@@ -72,6 +72,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,6 +85,10 @@
AC_CHECK_FUNCS(strrchr)
dnl ---------------------------------------------------------------------------
diff --git a/debian/patches/debianization-regex.patch b/debian/patches/debianization-regex.patch
index 813b05b..51aa2bf 100644
--- a/debian/patches/debianization-regex.patch
+++ b/debian/patches/debianization-regex.patch
@@ -24,9 +24,9 @@ use regex functions from glibc
# -------------------------------------------------------
# Kpathsea Library support.
---- a/configure.in
-+++ b/configure.in
-@@ -41,9 +41,9 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,9 +54,9 @@
dnl ---------------------------------------------------------------------------
dnl for regexp
@@ -39,7 +39,7 @@ use regex functions from glibc
dnl ---------------------------------------------------------------------------
dnl Checks for libraries.
-@@ -133,7 +133,8 @@
+@@ -146,7 +146,8 @@
dnl AC_CONFIG_SUBDIRS(BibTcl)
@@ -48,4 +48,4 @@ use regex functions from glibc
+dnl AC_CONFIG_HEADER(regex-0.12/config.h:AutoConf/reconfig.h.in)
AC_OUTPUT(makefile:AutoConf/makefile.in)
-
+ dnl ---------------------------------------------------------------------------
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index fcaf7ca..ac3d6f3 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -24,7 +24,7 @@ debianization
#
-CFLAGS = @CFLAGS@
-+CFLAGS = -Wall @CFLAGS@
++CFLAGS = -Wall @CFLAGS@ -Wno-misleading-indentation -Wno-unused-function
# CFLAGS = -O
# GNU C
# CFLAGS = -g -Wall
diff --git a/debian/patches/series b/debian/patches/series
index da92af2..719846b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-upstream-test-security-local_load-explicit.patch
-upstream-Changes_tex-date_setup.patch
cleanup-upstream.patch
rationalization-upstream-doc.patch
secure-upstream-doc.patch
diff --git a/debian/patches/upstream-Changes_tex-date_setup.patch b/debian/patches/upstream-Changes_tex-date_setup.patch
deleted file mode 100644
index 759b74a..0000000
--- a/debian/patches/upstream-Changes_tex-date_setup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-setup the latest release date as set up in the upstream repository
---- a/Changes.tex
-+++ b/Changes.tex
-@@ -50,7 +50,7 @@
- \begin{multicols}2\RaggedRight
-
- % =====================================================================
-- \begin{Release}{2.65}{June ??, 2016}
-+ \begin{Release}{2.65}{June 14, 2016}
- \begin{Fix}{gene}
- Hash function and value storing for field name mapping during xref
- expansion fixed.
diff --git a/debian/patches/upstream-test-security-local_load-explicit.patch b/debian/patches/upstream-test-security-local_load-explicit.patch
deleted file mode 100644
index 06273fd..0000000
--- a/debian/patches/upstream-test-security-local_load-explicit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-implement explicit local load in test perl script as '.' has been removed from @INC (CVE-2016-1238)
---- a/test/lib/BUnit.pm
-+++ b/test/lib/BUnit.pm
-@@ -277,7 +277,7 @@
- $suite = $_;
- $suite =~ s/\.t$//;
-
-- my $ret = do "$_";
-+ my $ret = do "./$_";
- unless($ret) {
- if ($@) { warn "couldn't parse $_: $@\n"
- } elsif(not defined $ret) { warn "couldn't do $_: $!\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/bibtool.git
Reply to: