[xml/sgml-commit] r2256 - in /packages/refdb/tags/1.0.2-3: ./ debian/changelog debian/patches/bug741839.patch
malat at users.alioth.debian.org
malat at users.alioth.debian.org
Mon Sep 1 16:11:02 UTC 2014
Author: malat
Date: Mon Sep 1 16:11:02 2014
New Revision: 2256
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2256
Log:
[svn-buildpackage] Tagging refdb 1.0.2-3
Added:
packages/refdb/tags/1.0.2-3/
- copied from r2255, packages/refdb/trunk/
Modified:
packages/refdb/tags/1.0.2-3/debian/changelog
packages/refdb/tags/1.0.2-3/debian/patches/bug741839.patch
Modified: packages/refdb/tags/1.0.2-3/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/tags/1.0.2-3/debian/changelog?rev=2256&op=diff
==============================================================================
--- packages/refdb/tags/1.0.2-3/debian/changelog (original)
+++ packages/refdb/tags/1.0.2-3/debian/changelog Mon Sep 1 16:11:02 2014
@@ -1,3 +1,10 @@
+refdb (1.0.2-3) unstable; urgency=low
+
+ * Fix another compilation error with newer readline. Closes: #759855
+ + Refresh debian/patches/bug741839.patch
+
+ -- Mathieu Malaterre <malat at debian.org> Mon, 01 Sep 2014 18:02:59 +0200
+
refdb (1.0.2-2) unstable; urgency=low
* Fix compilation with newer readline. Closes: #741839
Modified: packages/refdb/tags/1.0.2-3/debian/patches/bug741839.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/tags/1.0.2-3/debian/patches/bug741839.patch?rev=2256&op=diff
==============================================================================
--- packages/refdb/tags/1.0.2-3/debian/patches/bug741839.patch (original)
+++ packages/refdb/tags/1.0.2-3/debian/patches/bug741839.patch Mon Sep 1 16:11:02 2014
@@ -1,18 +1,77 @@
Description: Fix compilation
+ Also incorporate changes from:
+ https://bugs.debian.org/759855#10
Author: Mathieu Malaterre <malat at debian.org>
Bug-Debian: http://bugs.debian.org/741839
-Forwarded: not-needed
+Index: refdb-1.0.2/src/readln.c
+===================================================================
+--- refdb-1.0.2.orig/src/readln.c 2013-12-22 01:17:45.000000000 +0100
++++ refdb-1.0.2/src/readln.c 2014-09-01 17:51:16.813428867 +0200
+@@ -92,7 +92,7 @@
+ /* rl_readline_name = "refdb-admin"; */
+
+ /* Tell the completer that we want a crack first. */
+- rl_attempted_completion_function = (CPPFunction *)refdb_completion;
++ rl_attempted_completion_function = (rl_completion_func_t *)refdb_completion;
+ }
+
+ /* Attempt to complete on the contents of TEXT. START and END bound the
Index: refdb-1.0.2/src/readln.h
===================================================================
---- refdb-1.0.2.orig/src/readln.h 2014-04-09 12:37:12.876307005 +0000
-+++ refdb-1.0.2/src/readln.h 2014-04-09 12:43:03.120318211 +0000
-@@ -22,6 +22,8 @@
- #include <readline/readline.h>
- #include <readline/history.h>
+--- refdb-1.0.2.orig/src/readln.h 2014-09-01 17:49:26.000000000 +0200
++++ refdb-1.0.2/src/readln.h 2014-09-01 17:51:16.813428867 +0200
+@@ -24,7 +24,8 @@
-+typedef rl_icpfunc_t Function;
-+typedef rl_completion_func_t CPPFunction;
typedef struct {
char *name; /* User printable name of the function. */
- Function *func; /* Function to call to do the job. */
+- Function *func; /* Function to call to do the job. */
++ /* Function *func; */ /* Function to call to do the job. */
++ rl_icpfunc_t *func; /* Function to call to do the job. */
+ char *doc; /* Documentation for this function. */
+ } COMMAND;
+
+Index: refdb-1.0.2/src/refdba.c
+===================================================================
+--- refdb-1.0.2.orig/src/refdba.c 2013-12-22 01:17:46.000000000 +0100
++++ refdb-1.0.2/src/refdba.c 2014-09-01 17:51:16.813428867 +0200
+@@ -86,7 +86,7 @@
+ { "set", com_setvalue, "Set new value of config variable" },
+ { "verbose", com_verbose, "Toggle verbose mode" },
+ { "viewstat", com_viewstat, "View statistics" },
+- { (char *)NULL, (Function *)NULL, (char *)NULL }
++ { (char *)NULL, (rl_icpfunc_t *)NULL, (char *)NULL }
+ };
+
+ /* Globals */
+@@ -135,7 +135,7 @@
+ #endif /* READLINE41 */
+
+ char readline_name[] = "refdba";
+-CPPFunction* rl_attempted_completion_function; /* ptr to completer */
++rl_completion_func_t *rl_attempted_completion_function; /* ptr to completer */
+ int n_refdb_timeout;
+ int n_verbose = 0; /*+ do we want logorrhoeic output? +*/
+
+Index: refdb-1.0.2/src/refdbc.c
+===================================================================
+--- refdb-1.0.2.orig/src/refdbc.c 2013-12-22 01:17:46.000000000 +0100
++++ refdb-1.0.2/src/refdbc.c 2014-09-01 17:51:16.817428862 +0200
+@@ -100,7 +100,7 @@
+ { "verbose", com_verbose, "Toggle verbose mode" },
+ { "updatejo", com_updatejo, "Update journal name synonyms" },
+ { "whichdb", com_whichdb, "Show info about current database" },
+- { (char *)NULL, (Function *)NULL, (char *)NULL }
++ { (char *)NULL, (rl_icpfunc_t *)NULL, (char *)NULL }
+ };
+
+ /* Globals */
+@@ -172,7 +172,7 @@
+ #endif /* READLINE41 */
+
+ char readline_name[] = "refdbc";
+-CPPFunction* rl_attempted_completion_function; /* ptr to completer */
++rl_completion_func_t *rl_attempted_completion_function; /* ptr to completer */
+
+ int n_refdb_timeout;
+ int n_verbose = 0; /*+ do we want logorrhoeic output? +*/
More information about the debian-xml-sgml-commit
mailing list