[bibtool] 05/05: Imported Debian patch 2.65+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 3c6191c1d6acb533d766559ed9b102f6422e854f
Author: Jerome Benoit <calculus@rezozer.net>
Date: Wed Jun 15 00:28:00 2016 +0100
Imported Debian patch 2.65+ds-1
---
Changes.tex | 2 +-
debian/changelog | 16 +++++-
debian/patches/series | 3 +-
.../patches/upstream-Changes_tex-date_setup.patch | 12 ++++
.../upstream-source-silence-warnings-extra.patch | 40 --------------
.../patches/upstream-source-silence-warnings.patch | 64 ----------------------
6 files changed, 29 insertions(+), 108 deletions(-)
diff --git a/Changes.tex b/Changes.tex
index a09377c..8eb0755 100644
--- 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/changelog b/debian/changelog
index c0877ad..9bd25a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+bibtool (2.65+ds-1) unstable; urgency=medium
+
+ * New upstream version (Closes: #827102):
+ - thanks to the upstream maintainer for promptly fixing the FTBFS issue;
+ - integrate previous Debian fixes that silenced compiler warnings.
+ * Debianization:
+ - debian/patches/
+ - d/p/upstream-Changes_tex-date_setup.patch, introduce;
+ - discard integrated and/or obsoleted patches:
+ - d/p/upstream-source-silence-warnings.patch
+ - d/p/upstream-source-silence-warnings-extra.patch .
+
+ -- Jerome Benoit <calculus@rezozer.net> Tue, 14 Jun 2016 23:26:38 +0000
+
bibtool (2.64+ds-1) unstable; urgency=medium
* New upstream version.
@@ -21,7 +35,7 @@ bibtool (2.64+ds-1) unstable; urgency=medium
bibtool (2.63+ds-2) unstable; urgency=medium
- * FTBS fix release (Closes: #825894), provide backward compatibility for old
+ * FTBFS fix release (Closes: #825894), provide backward compatibility for old
font commands for the bibtool-doc LaTeX style; thanks to Norbert Preining
<preining@debian.org>.
* Debianization:
diff --git a/debian/patches/series b/debian/patches/series
index 0945471..5d1d294 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
-upstream-source-silence-warnings.patch
-upstream-source-silence-warnings-extra.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
new file mode 100644
index 0000000..759b74a
--- /dev/null
+++ b/debian/patches/upstream-Changes_tex-date_setup.patch
@@ -0,0 +1,12 @@
+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-source-silence-warnings-extra.patch b/debian/patches/upstream-source-silence-warnings-extra.patch
deleted file mode 100644
index 05109a6..0000000
--- a/debian/patches/upstream-source-silence-warnings-extra.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
deleted file mode 100644
index 01429ea..0000000
--- a/debian/patches/upstream-source-silence-warnings.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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: