[bibtool] 05/05: Imported Debian patch 2.67+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 f3513f0ca8a67f78d9e28c64ad5101a001121830
Author: Jerome Benoit <calculus@rezozer.net>
Date: Fri May 12 13:38:16 2017 +0400
Imported Debian patch 2.67+ds-1
---
debian/changelog | 11 +++
debian/patches/debianization-configure.patch | 2 +-
debian/patches/debianization-regex.patch | 2 +-
debian/patches/series | 2 +-
...stream-fix-empty_key_separator-bug_848947.patch | 86 ----------------------
.../patches/upstream-source-warnings-silence.patch | 62 ++++++++++++++++
6 files changed, 76 insertions(+), 89 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b4641d9..4f0994e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+bibtool (2.67+ds-1) experimental; urgency=medium
+
+ * New upstream version.
+ * Debianization:
+ - debian/patches/:
+ - d/p/upstream-source-warnings-silence.patch, silence gcc;
+ - discard integrated and/or obsoleted patches:
+ - d/p/upstream-fix-empty_key_separator-bug_848947.patch .
+
+ -- Jerome Benoit <calculus@rezozer.net> Fri, 12 May 2017 09:37:26 +0000
+
bibtool (2.66+ds-4) unstable; urgency=medium
* FTBFS fix release (Closes: #852887, second attempt), override sbuild
diff --git a/debian/patches/debianization-configure.patch b/debian/patches/debianization-configure.patch
index 2f45106..efb43b6 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.ac
+++ b/configure.ac
-@@ -85,6 +85,10 @@
+@@ -86,6 +86,10 @@
AC_CHECK_FUNCS(strrchr)
dnl ---------------------------------------------------------------------------
diff --git a/debian/patches/debianization-regex.patch b/debian/patches/debianization-regex.patch
index 51aa2bf..412a95c 100644
--- a/debian/patches/debianization-regex.patch
+++ b/debian/patches/debianization-regex.patch
@@ -39,7 +39,7 @@ use regex functions from glibc
dnl ---------------------------------------------------------------------------
dnl Checks for libraries.
-@@ -146,7 +146,8 @@
+@@ -147,7 +147,8 @@
dnl AC_CONFIG_SUBDIRS(BibTcl)
diff --git a/debian/patches/series b/debian/patches/series
index 6b52ab8..06f701a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-upstream-fix-empty_key_separator-bug_848947.patch
+upstream-source-warnings-silence.patch
cleanup-upstream.patch
rationalization-upstream-doc.patch
secure-upstream-doc.patch
diff --git a/debian/patches/upstream-fix-empty_key_separator-bug_848947.patch b/debian/patches/upstream-fix-empty_key_separator-bug_848947.patch
deleted file mode 100644
index 006b259..0000000
--- a/debian/patches/upstream-fix-empty_key_separator-bug_848947.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-apply upstream fix for bug #848947 as extract from GitHub
-(git commit 9dd8acbeb3b8045e490e6e7d692fb0f493768a5e).
---- a/key.c
-+++ b/key.c
-@@ -222,36 +222,64 @@
- ** s New value for the given separator. The new value is
- ** stored as a symbol. Thus the memory of |s| need not to
- ** be preserved after this function is completed.
--** The characters which are not allowed are silently sypressed.
-+** The characters which are not allowed are silently suppressed.
- ** Returns: nothing
- **___________________________________________________ */
--void set_separator(n,s) /* */
-+void set_separator(n, s) /* */
- register int n; /* */
- String s; /* */
- { /* */
-- if (n < 0 || n >= NoSeps || !is_allowed(*s)) /* */
-- { ERROR("Invalid separator specification."); /* */
-+ if (n < 0 || n >= NoSeps) /* */
-+ { ERROR("Invalid separator reference."); /* */
-+ return; /* */
-+ } /* */
-+ while (*s && !is_allowed(*s)) { s++; } /* */
-+ if (*s && !is_allowed(*s)) /* */
-+ { ERROR2("Invalid separator specification: ", s);/* */
- return; /* */
- } /* */
- /* */
- if (key_seps == NULL) init_key(); /* */
- /* */
-- key_seps[n] = sym_extract(&s, false); /* */
-+ if (*s) /* */
-+ { key_seps[n] = sym_extract(&s, false); /* */
-+ } else { /* */
-+ key_seps[n] = sym_empty; /* */
-+ } /* */
- } /*------------------------*/
-
- /*-----------------------------------------------------------------------------
- ** Function: get_separator()
- ** Type: String
--** Purpose: Getter for the key separator.
-+** Purpose: Getter for the key separator. The
-+** elements under the index have the following meaning:
-+** \begin{description}
-+** \item[0] The default key which is used when the
-+** formatting instruction fails completely.
-+** \item[1] The separator which is inserted between
-+** different names of a multi-authored publication.
-+** \item[2] The separator inserted between the first name
-+** and the last name when a name is formatted.
-+** \item[3] The separator inserted between the last names
-+** when more then one last name is present
-+** \item[4] The separator between the name and the title
-+** of a publication.
-+** \item[5] The separator inserted between words of the
-+** title.
-+** \item[6] The separator inserted before the number
-+** which might be added to disambiguate reference keys.
-+** \item[7] The string which is added when a list of
-+** names is truncated. (|.ea|)
-+** \end{description}
- ** Arguments:
- ** n the index
--** Returns:
-+** Returns: the separator for the given index or NULL
- **___________________________________________________ */
- Symbol get_separator(n) /* */
- int n; /* */
- { /* */
- if (n < 0 || n >= NoSeps) /* */
-- { ERROR("Invalid separator specification."); /* */
-+ { ERROR("Invalid separator reference."); /* */
- return NULL; /* */
- } /* */
- return key_seps[n]; /* */
-@@ -1283,7 +1311,7 @@
- ** Function*: add_fmt_tree()
- ** Purpose: Extend the format tree
- ** Arguments:
--** s the specification of th format
-+** s the specification of the format
- ** treep the pointer to the tree to be extended
- ** Returns: |true| iff the operation succeeds
- **___________________________________________________ */
diff --git a/debian/patches/upstream-source-warnings-silence.patch b/debian/patches/upstream-source-warnings-silence.patch
new file mode 100644
index 0000000..6718caf
--- /dev/null
+++ b/debian/patches/upstream-source-warnings-silence.patch
@@ -0,0 +1,62 @@
+fix the `pointer-to-int-cast' warning emitted by gcc (6.3.0) when the package builds
+--- a/rewrite.c
++++ b/rewrite.c
+@@ -806,7 +806,7 @@
+ Symbol* np; /* */
+ Symbol field = NO_SYMBOL; /* */
+ Symbol pattern = NO_SYMBOL; /* */
+- int i; /* */
++ intptr_t i; /* */
+ /* */
+ sp_open(s); /* */
+ if ((names = sp_symbols(&s)) == NULL) /* */
+@@ -846,7 +846,7 @@
+ field, /* */
+ RULE_KEEP | RULE_REGEXP, /* */
+ true); /* */
+- i = (int)(*np) % K_RULES_SIZE; /* */
++ i = (intptr_t)(*np) % K_RULES_SIZE; /* */
+ if (i < 0) i = -i; /* */
+ /* */
+ NextRule(rule) = k_rules[i]; /* */
+@@ -897,7 +897,7 @@
+ Record rec; /* */
+ DB db; /* */
+ { Rule r; /* */
+- int idx = (int)(sym) % K_RULES_SIZE; /* */
++ intptr_t idx = (intptr_t)(sym) % K_RULES_SIZE; /* */
+ if (idx < 0) idx = -idx; /* */
+ /* */
+ for (r = k_rules[idx]; r; r = NextRule(r)) /* */
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,6 +80,7 @@
+ AC_CHECK_HEADERS(string.h)
+ AC_CHECK_HEADERS(stdlib.h)
+ AC_CHECK_HEADERS(stdbool.h)
++AC_CHECK_HEADERS(stdint.h)
+ AC_CHECK_HEADERS(time.h)
+ AC_CHECK_FUNCS(getenv)
+ AC_CHECK_FUNCS(strrchr)
+--- a/include/bibtool/general.h
++++ b/include/bibtool/general.h
+@@ -71,12 +71,18 @@
+ #endif
+
+
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#else
++typedef intptr_t int;
++#endif
++
+ #ifdef HAVE_STDBOOL_H
+ #include <stdbool.h>
+ #else
+ typedef int bool;
+ #define true (1)
+-#define false (0)
++#define false (0)
+ #endif
+
+ /*-----------------------------------------------------------------------------
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/bibtool.git
Reply to: