I am uploading a NMU to DELAYED/10 in order to fix this.
Please find the debdiff attached.
diff -Nru cdecl-2.5/cdecl.1 cdecl-2.5/cdecl.1
--- cdecl-2.5/cdecl.1 2023-10-02 22:35:48.000000000 +0200
+++ cdecl-2.5/cdecl.1 1996-01-16 04:44:29.000000000 +0100
@@ -274,7 +274,7 @@
<modifier> ::= short | long | unsigned | signed | <ptrmod>
<ptrmodlist> ::= <ptrmod> <ptrmodlist> | NOTHING
<ptrmod> ::= const | volatile | noalias
- <storage> ::= auto | extern | register | static
+ <storage> ::= auto | extern | register | auto
<optstorage> ::= NOTHING | <storage>
<options> ::= NOTHING | <options>
| create | nocreate
diff -Nru cdecl-2.5/cdecl.c cdecl-2.5/cdecl.c
--- cdecl-2.5/cdecl.c 2023-10-02 22:35:48.000000000 +0200
+++ cdecl-2.5/cdecl.c 1996-01-16 04:54:46.000000000 +0100
@@ -67,7 +67,6 @@
# include <stddef.h>
# include <string.h>
# include <stdarg.h>
-# include <errno.h>
#else
# ifndef NOVARARGS
# include <varargs.h>
@@ -91,10 +90,10 @@
#ifdef USE_READLINE
# include <readline/readline.h>
/* prototypes for functions related to readline() */
- char * get_line();
- char ** attempt_completion(const char *, int, int);
+ char * getline();
+ char ** attempt_completion(char *, int, int);
char * keyword_completion(char *, int);
- char * command_completion(const char *, int);
+ char * command_completion(char *, int);
#endif
/* maximum # of chars from progname to display in prompt */
@@ -125,6 +124,7 @@
#if __STDC__
char *ds(char *), *cat(char *, ...), *visible(int);
+ int getopt(int,char **,char *);
int main(int, char **);
int yywrap(void);
int dostdin(void);
@@ -241,7 +241,7 @@
/* for unsupported combinations of types. */
void mbcheck()
{
- register int i, j, restriction;
+ register int i, j, restrict;
char *t1, *t2;
/* Loop through the types */
@@ -258,26 +258,26 @@
if (!(modbits & crosstypes[j].bit))
continue;
/* check the type of restriction */
- restriction = crosscheck[i][j];
- if (restriction == ALWAYS)
+ restrict = crosscheck[i][j];
+ if (restrict == ALWAYS)
continue;
t1 = crosstypes[i].name;
t2 = crosstypes[j].name;
- if (restriction == NEVER)
+ if (restrict == NEVER)
{
notsupported("", t1, t2);
}
- else if (restriction == RITCHIE)
+ else if (restrict == RITCHIE)
{
if (RitchieFlag)
notsupported(" (Ritchie Compiler)", t1, t2);
}
- else if (restriction == PREANSI)
+ else if (restrict == PREANSI)
{
if (PreANSIFlag || RitchieFlag)
notsupported(" (Pre-ANSI Compiler)", t1, t2);
}
- else if (restriction == ANSI)
+ else if (restrict == ANSI)
{
if (!RitchieFlag && !PreANSIFlag)
notsupported(" (ANSI Compiler)", t1, t2);
@@ -286,7 +286,7 @@
{
(void) fprintf (stderr,
"%s: Internal error in crosscheck[%d,%d]=%d!\n",
- progname, i, j, restriction);
+ progname, i, j, restrict);
exit(1); /* NOTREACHED */
}
}
@@ -375,7 +375,7 @@
static char *line_read = NULL;
/* Read a string, and return a pointer to it. Returns NULL on EOF. */
-char * get_line ()
+char * getline ()
{
/* If the buffer has already been allocated, return the memory
to the free pool. */
@@ -395,16 +395,16 @@
return (line_read);
}
-char ** attempt_completion(const char *text, int start, int end)
+char ** attempt_completion(char *text, int start, int end)
{
char **matches = NULL;
- if (start == 0) matches = rl_completion_matches(text, command_completion);
+ if (start == 0) matches = completion_matches(text, command_completion);
return matches;
}
-char * command_completion(const char *text, int flag)
+char * command_completion(char *text, int flag)
{
static int index, len;
char *command;
@@ -887,7 +887,7 @@
if (!quiet) (void) printf("Type `help' or `?' for help\n");
ret = 0;
- while ((line = get_line())) {
+ while ((line = getline())) {
if (!strcmp(line, "quit") || !strcmp(line, "exit")) {
free(line);
return ret;
@@ -1251,8 +1251,8 @@
#ifdef USE_READLINE
/* install completion handlers */
- rl_attempted_completion_function = (rl_completion_func_t
*)attempt_completion;
- rl_completion_entry_function = (rl_compentry_func_t *)keyword_completion;
+ rl_attempted_completion_function = (CPPFunction *)attempt_completion;
+ rl_completion_entry_function = (Function *)keyword_completion;
#endif
setprogname(argv[0]);
diff -Nru cdecl-2.5/debian/changelog cdecl-2.5/debian/changelog
--- cdecl-2.5/debian/changelog 2023-10-02 22:35:48.000000000 +0200
+++ cdecl-2.5/debian/changelog 2023-10-02 22:30:30.000000000 +0200
@@ -1,3 +1,10 @@
+cdecl (2.5-13.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Convert to source format 3.0 (closes: #1007649)
+
+ -- Bastian Germann <b...@debian.org> Mon, 02 Oct 2023 22:30:30 +0200
+
cdecl (2.5-13) unstable; urgency=low
* Fixed lintian warnings
@@ -6,7 +13,7 @@
-- Fredrik Hallenberg <hal...@debian.org> Sat, 29 Mar 2014 17:37:34 +0100
-cdecl (2.5-12) untable; urgency=low
+cdecl (2.5-12) unstable; urgency=low
* Fixed readline build (closes: 741835)
diff -Nru cdecl-2.5/debian/patches/debian.patch
cdecl-2.5/debian/patches/debian.patch
--- cdecl-2.5/debian/patches/debian.patch 1970-01-01 01:00:00.000000000
+0100
+++ cdecl-2.5/debian/patches/debian.patch 2023-10-02 22:30:30.000000000
+0200
@@ -0,0 +1,182 @@
+--- cdecl-2.5.orig/Makefile
++++ cdecl-2.5/Makefile
+@@ -15,9 +15,9 @@
+ #
+ # add -DUSE_READLINE To compile in support for the GNU readline library.
+
+-CFLAGS= -s -O2 -DUSE_READLINE
++CFLAGS= -g -O2 -DUSE_READLINE
+ CC= gcc
+-LIBS= -lreadline -ltermcap
++LIBS= -lreadline
+ ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++
+ BINDIR= /usr/bin
+ MANDIR= /usr/man/man1
+@@ -25,11 +25,13 @@ CATDIR= /usr/man/cat1
+ INSTALL= install -c
+ INSTALL_DATA= install -c -m 644
+
++LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
++
+ cdecl: c++decl
+- ln c++decl cdecl
++ ln -s c++decl cdecl
+
+ c++decl: cdgram.c cdlex.c cdecl.c
+- $(CC) $(CFLAGS) -o c++decl cdecl.c $(LIBS)
++ $(CC) $(CFLAGS) -o c++decl cdecl.c $(LIBS) $(LDFLAGS)
+ rm -f cdecl
+
+ cdlex.c: cdlex.l
+@@ -44,7 +46,7 @@ test:
+
+ install: cdecl
+ $(INSTALL) cdecl $(BINDIR)
+- ln $(BINDIR)/cdecl $(BINDIR)/c++decl
++ ln -s cdecl $(BINDIR)/c++decl
+ $(INSTALL_DATA) cdecl.1 $(MANDIR)
+ $(INSTALL_DATA) c++decl.1 $(MANDIR)
+
+--- cdecl-2.5.orig/cdecl.1
++++ cdecl-2.5/cdecl.1
+@@ -274,7 +274,7 @@ NL means the new-line or semi-colon char
+ <modifier> ::= short | long | unsigned | signed | <ptrmod>
+ <ptrmodlist> ::= <ptrmod> <ptrmodlist> | NOTHING
+ <ptrmod> ::= const | volatile | noalias
+- <storage> ::= auto | extern | register | auto
++ <storage> ::= auto | extern | register | static
+ <optstorage> ::= NOTHING | <storage>
+ <options> ::= NOTHING | <options>
+ | create | nocreate
+--- cdecl-2.5.orig/cdecl.c
++++ cdecl-2.5/cdecl.c
+@@ -67,6 +67,7 @@ char cdeclsccsid[] = "@(#)cdecl.c 2.5 1/
+ # include <stddef.h>
+ # include <string.h>
+ # include <stdarg.h>
++# include <errno.h>
+ #else
+ # ifndef NOVARARGS
+ # include <varargs.h>
+@@ -90,10 +91,10 @@ void free(), exit(), perror();
+ #ifdef USE_READLINE
+ # include <readline/readline.h>
+ /* prototypes for functions related to readline() */
+- char * getline();
+- char ** attempt_completion(char *, int, int);
++ char * get_line();
++ char ** attempt_completion(const char *, int, int);
+ char * keyword_completion(char *, int);
+- char * command_completion(char *, int);
++ char * command_completion(const char *, int);
+ #endif
+
+ /* maximum # of chars from progname to display in prompt */
+@@ -124,7 +125,6 @@ char real_prompt[MAX_NAME+3];
+
+ #if __STDC__
+ char *ds(char *), *cat(char *, ...), *visible(int);
+- int getopt(int,char **,char *);
+ int main(int, char **);
+ int yywrap(void);
+ int dostdin(void);
+@@ -241,7 +241,7 @@ struct
+ /* for unsupported combinations of types. */
+ void mbcheck()
+ {
+- register int i, j, restrict;
++ register int i, j, restriction;
+ char *t1, *t2;
+
+ /* Loop through the types */
+@@ -258,26 +258,26 @@ void mbcheck()
+ if (!(modbits & crosstypes[j].bit))
+ continue;
+ /* check the type of restriction */
+- restrict = crosscheck[i][j];
+- if (restrict == ALWAYS)
++ restriction = crosscheck[i][j];
++ if (restriction == ALWAYS)
+ continue;
+ t1 = crosstypes[i].name;
+ t2 = crosstypes[j].name;
+- if (restrict == NEVER)
++ if (restriction == NEVER)
+ {
+ notsupported("", t1, t2);
+ }
+- else if (restrict == RITCHIE)
++ else if (restriction == RITCHIE)
+ {
+ if (RitchieFlag)
+ notsupported(" (Ritchie Compiler)", t1, t2);
+ }
+- else if (restrict == PREANSI)
++ else if (restriction == PREANSI)
+ {
+ if (PreANSIFlag || RitchieFlag)
+ notsupported(" (Pre-ANSI Compiler)", t1, t2);
+ }
+- else if (restrict == ANSI)
++ else if (restriction == ANSI)
+ {
+ if (!RitchieFlag && !PreANSIFlag)
+ notsupported(" (ANSI Compiler)", t1, t2);
+@@ -286,7 +286,7 @@ void mbcheck()
+ {
+ (void) fprintf (stderr,
+ "%s: Internal error in crosscheck[%d,%d]=%d!\n",
+- progname, i, j, restrict);
++ progname, i, j, restriction);
+ exit(1); /* NOTREACHED */
+ }
+ }
+@@ -375,7 +375,7 @@ char *options[] = {
+ static char *line_read = NULL;
+
+ /* Read a string, and return a pointer to it. Returns NULL on EOF. */
+-char * getline ()
++char * get_line ()
+ {
+ /* If the buffer has already been allocated, return the memory
+ to the free pool. */
+@@ -395,16 +395,16 @@ char * getline ()
+ return (line_read);
+ }
+
+-char ** attempt_completion(char *text, int start, int end)
++char ** attempt_completion(const char *text, int start, int end)
+ {
+ char **matches = NULL;
+
+- if (start == 0) matches = completion_matches(text, command_completion);
++ if (start == 0) matches = rl_completion_matches(text, command_completion);
+
+ return matches;
+ }
+
+-char * command_completion(char *text, int flag)
++char * command_completion(const char *text, int flag)
+ {
+ static int index, len;
+ char *command;
+@@ -887,7 +887,7 @@ int dostdin()
+
+ if (!quiet) (void) printf("Type `help' or `?' for help\n");
+ ret = 0;
+- while ((line = getline())) {
++ while ((line = get_line())) {
+ if (!strcmp(line, "quit") || !strcmp(line, "exit")) {
+ free(line);
+ return ret;
+@@ -1251,8 +1251,8 @@ char **argv;
+
+ #ifdef USE_READLINE
+ /* install completion handlers */
+- rl_attempted_completion_function = (CPPFunction *)attempt_completion;
+- rl_completion_entry_function = (Function *)keyword_completion;
++ rl_attempted_completion_function = (rl_completion_func_t
*)attempt_completion;
++ rl_completion_entry_function = (rl_compentry_func_t *)keyword_completion;
+ #endif
+
+ setprogname(argv[0]);
diff -Nru cdecl-2.5/debian/patches/series cdecl-2.5/debian/patches/series
--- cdecl-2.5/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ cdecl-2.5/debian/patches/series 2023-10-02 22:30:30.000000000 +0200
@@ -0,0 +1 @@
+debian.patch
diff -Nru cdecl-2.5/debian/source/format cdecl-2.5/debian/source/format
--- cdecl-2.5/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ cdecl-2.5/debian/source/format 2023-10-02 22:30:30.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru cdecl-2.5/Makefile cdecl-2.5/Makefile
--- cdecl-2.5/Makefile 2023-10-02 22:35:48.000000000 +0200
+++ cdecl-2.5/Makefile 1996-01-16 06:36:38.000000000 +0100
@@ -15,9 +15,9 @@
#
# add -DUSE_READLINE To compile in support for the GNU readline library.
-CFLAGS= -g -O2 -DUSE_READLINE
+CFLAGS= -s -O2 -DUSE_READLINE
CC= gcc
-LIBS= -lreadline
+LIBS= -lreadline -ltermcap
ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++
BINDIR= /usr/bin
MANDIR= /usr/man/man1
@@ -25,13 +25,11 @@
INSTALL= install -c
INSTALL_DATA= install -c -m 644
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-
cdecl: c++decl
- ln -s c++decl cdecl
+ ln c++decl cdecl
c++decl: cdgram.c cdlex.c cdecl.c
- $(CC) $(CFLAGS) -o c++decl cdecl.c $(LIBS) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o c++decl cdecl.c $(LIBS)
rm -f cdecl
cdlex.c: cdlex.l
@@ -46,7 +44,7 @@
install: cdecl
$(INSTALL) cdecl $(BINDIR)
- ln -s cdecl $(BINDIR)/c++decl
+ ln $(BINDIR)/cdecl $(BINDIR)/c++decl
$(INSTALL_DATA) cdecl.1 $(MANDIR)
$(INSTALL_DATA) c++decl.1 $(MANDIR)
