Package: pccts
Version: 1.33MR33-6.1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for pccts (versioned as 1.33MR33-6.2) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru pccts-1.33MR33/antlr/antlr.1 pccts-1.33MR33/antlr/antlr.1
--- pccts-1.33MR33/antlr/antlr.1 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/antlr/antlr.1 1995-10-06 01:40:04.000000000 +0100
@@ -98,7 +98,7 @@
.IP \fB-gl\fP
Generate line info about grammar actions in C parser of the form
\fB#\ \fIline\fP\ "\fIfile\fP"\fR which makes error messages from
-the C/C++ compiler make more sense as they will point into the
+the C/C++ compiler make more sense as they will \*Qpoint\*U into the
grammar file not the resulting C file. Debugging is easier as well,
because you will step through the grammar not C file.
.IP \fB-gs\fR
diff -Nru pccts-1.33MR33/antlr/gen.c pccts-1.33MR33/antlr/gen.c
--- pccts-1.33MR33/antlr/gen.c 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/antlr/gen.c 2002-03-04 03:34:22.000000000 +0100
@@ -1743,7 +1743,7 @@
Junction *q;
#endif
{
- /* Junction * qOriginal = q; DEBUG */
+ Junction * qOriginal = q; /* DEBUG */
/* MR14 Couldn't find aSubBlock which was a guess block when it lay
behind aLoopBlk. The aLoopBlk only appear in conjunction with
diff -Nru pccts-1.33MR33/debian/changelog pccts-1.33MR33/debian/changelog
--- pccts-1.33MR33/debian/changelog 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/debian/changelog 2022-05-26 00:54:42.000000000 +0200
@@ -1,3 +1,13 @@
+pccts (1.33MR33-6.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Mark pccts Multi-Arch: foreign. (Closes: #955991)
+ * Add Homepage field to d/control (Closes: #34837)
+ * Convert to 3.0 (quilt). (Closes: #1007689)
+ * Add -g flag to produce dbgsymbols.
+
+ -- Tobias Frost <t...@debian.org> Thu, 26 May 2022 00:54:42 +0200
+
pccts (1.33MR33-6.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru pccts-1.33MR33/debian/control pccts-1.33MR33/debian/control
--- pccts-1.33MR33/debian/control 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/debian/control 2022-05-25 23:26:08.000000000 +0200
@@ -4,9 +4,11 @@
Maintainer: Dale E. Martin <d...@the-martins.org>
Standards-Version: 3.8.3
Build-Depends: debhelper-compat (= 13)
+Homepage: http://www.polhode.com/pccts.html
Package: pccts
Architecture: any
+Multi-Arch: foreign
Replaces: sorcerer
Provides: sorcerer
Depends: ${shlibs:Depends}, ${misc:Depends}
diff -Nru pccts-1.33MR33/debian/patches/conversion-format-3.0-quilt.patch pccts-1.33MR33/debian/patches/conversion-format-3.0-quilt.patch
--- pccts-1.33MR33/debian/patches/conversion-format-3.0-quilt.patch 1970-01-01 01:00:00.000000000 +0100
+++ pccts-1.33MR33/debian/patches/conversion-format-3.0-quilt.patch 2022-05-26 00:41:41.000000000 +0200
@@ -0,0 +1,151 @@
+Description: Conversion patch from d/source/format 1.0 to 3.0 quilt.
+Last-Update: 2022-05-25
+
+--- a/RIGHTS
++++ b/RIGHTS
+@@ -5,7 +5,7 @@
+ Set (PCCTS) -- PCCTS is in the public domain. An individual or
+ company may do whatever they wish with source code distributed with
+ PCCTS or the code generated by PCCTS, including the incorporation of
+-PCCTS, or its output, into commerical software.
++PCCTS, or its output, into commercial software.
+
+ We encourage users to develop software with PCCTS. However, we do ask
+ that credit is given to us for developing PCCTS. By "credit", we mean
+--- a/antlr/antlr.1
++++ b/antlr/antlr.1
+@@ -98,7 +98,7 @@
+ .IP \fB-gl\fP
+ Generate line info about grammar actions in C parser of the form
+ \fB#\ \fIline\fP\ "\fIfile\fP"\fR which makes error messages from
+-the C/C++ compiler make more sense as they will \*Qpoint\*U into the
++the C/C++ compiler make more sense as they will point into the
+ grammar file not the resulting C file. Debugging is easier as well,
+ because you will step through the grammar not C file.
+ .IP \fB-gs\fR
+--- a/antlr/gen.c
++++ b/antlr/gen.c
+@@ -1743,7 +1743,7 @@
+ Junction *q;
+ #endif
+ {
+- Junction * qOriginal = q; /* DEBUG */
++ /* Junction * qOriginal = q; DEBUG */
+
+ /* MR14 Couldn't find aSubBlock which was a guess block when it lay
+ behind aLoopBlk. The aLoopBlk only appear in conjunction with
+--- a/dlg/dlg.1
++++ b/dlg/dlg.1
+@@ -30,7 +30,7 @@
+ of look ahead.
+ .IP "\fB-cl\fP class
+ Specify a class name for DLG to generate. The default is DLGLexer.
+-'class' will be a subclass of DLGLexerBase; only used for -CC.
++"class" will be a subclass of DLGLexerBase; only used for -CC.
+ .IP \fB-ci\fP
+ The automaton will treat upper and lower case characters identically.
+ This is accomplished in the automaton; the characters in the lexical
+--- a/sorcerer/lib/astlib.c
++++ b/sorcerer/lib/astlib.c
+@@ -217,7 +217,7 @@
+ SORAST *sib;
+
+ if ( u==NULL ) return 1;
+- if ( t==NULL ) if ( u!=NULL ) return 0; else return 1;
++ if ( t==NULL ) { if ( u!=NULL ) return 0; } else return 1;
+
+ for (sib=t; sib!=NULL&&u!=NULL; sib=sib->ast_right, u=u->ast_right)
+ {
+@@ -310,7 +310,7 @@
+ {
+ SORAST *sib;
+
+- if ( t==NULL ) if ( u!=NULL ) return 0; else return 1;
++ if ( t==NULL ) { if ( u!=NULL ) return 0; } else return 1;
+ if ( u==NULL ) return 0;
+
+ for (sib=t; sib!=NULL&&u!=NULL; sib=sib->ast_right, u=u->ast_right)
+@@ -335,7 +335,7 @@
+ {
+ ScanAST *sib;
+
+- if ( t==NULL ) if ( u!=NULL ) return 0; else return 1;
++ if ( t==NULL ) { if ( u!=NULL ) return 0; } else return 1;
+ if ( u==NULL ) return 0;
+
+ for (sib=t; sib!=NULL&&u!=NULL; sib=sib->right, u=u->ast_right)
+--- a/sorcerer/lib/sintstack.c
++++ b/sorcerer/lib/sintstack.c
+@@ -29,6 +29,7 @@
+ #include <stdio.h>
+ #include <setjmp.h>
+
++#include "pcctscfg.h"
+ #ifdef PCCTS_USE_STDARG
+ #include <stdarg.h>
+ #else
+--- a/sorcerer/lib/sorlist.c
++++ b/sorcerer/lib/sorlist.c
+@@ -28,6 +28,7 @@
+ */
+ #include <stdio.h>
+ #include <setjmp.h>
++#include "pcctscfg.h"
+
+ #ifdef PCCTS_USE_STDARG
+ #include <stdarg.h>
+--- a/sorcerer/makefile
++++ b/sorcerer/makefile
+@@ -43,6 +43,7 @@
+
+ clean:
+ rm -f *.o core sor
++ $(MAKE) -C lib clean
+
+ scrub:
+ rm -f *.o core $(GENHFILES) parser.dlg scan.c err.c sor.c sor
+--- a/sorcerer/sor.c
++++ b/sorcerer/sor.c
+@@ -6,7 +6,7 @@
+ * With AHPCRC, University of Minnesota
+ * ANTLR Version 1.33MR33
+ *
+- * ..\bin\antlr -gh -k 2 -gt sor.g
++ * ../bin/antlr -gh -k 2 -gt sor.g
+ *
+ */
+
+--- a/sorcerer/test/makefile
++++ b/sorcerer/test/makefile
+@@ -2,9 +2,7 @@
+ # Makefile for simple 1.00B SORCERER examples
+ #
+
+-PCCTS=../..
+-BIN=$(PCCTS)/bin
+-SOR = $(BIN)/sor
++SOR = sor
+ CFLAGS = -I. -I../../h -I../h -I../lib -g -ansi
+ DFLAGS = -C2 -i
+ SRC = test.c
+--- a/support/genmk/genmk.c
++++ b/support/genmk/genmk.c
+@@ -79,6 +79,7 @@
+ void pfiles();
+ void fatal();
+ void warn();
++void pclasses(char **classes, int n, char *suffix);
+ #endif
+
+ typedef struct _Opt {
+@@ -966,8 +967,10 @@
+ }
+
+ #ifdef __STDC__
++void
+ pclasses(char **classes, int n, char *suffix)
+ #else
++void
+ pclasses(classes, n, suffix)
+ char **classes;
+ int n;
diff -Nru pccts-1.33MR33/debian/patches/series pccts-1.33MR33/debian/patches/series
--- pccts-1.33MR33/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ pccts-1.33MR33/debian/patches/series 2022-05-26 00:50:46.000000000 +0200
@@ -0,0 +1 @@
+conversion-format-3.0-quilt.patch
diff -Nru pccts-1.33MR33/debian/rules pccts-1.33MR33/debian/rules
--- pccts-1.33MR33/debian/rules 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/debian/rules 2022-05-26 00:49:24.000000000 +0200
@@ -5,10 +5,11 @@
# This is the debhelper compatibility version to use.
-export COPT=-O2 -Wall -Wno-unused
-ifneq ($(findstring debug,$(DEB_BUILD_OPTIONS)),)
-COPT+=-g
-endif
+export COPT=-O2 -Wall -Wno-unused -g
+#ifneq ($(findstring debug,$(DEB_BUILD_OPTIONS)),)
+#COPT+=-g
+#endif
+#
build build-arch: build-stamp
build-stamp:
diff -Nru pccts-1.33MR33/debian/source/format pccts-1.33MR33/debian/source/format
--- pccts-1.33MR33/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ pccts-1.33MR33/debian/source/format 2022-05-25 23:29:32.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru pccts-1.33MR33/dlg/dlg.1 pccts-1.33MR33/dlg/dlg.1
--- pccts-1.33MR33/dlg/dlg.1 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/dlg/dlg.1 1995-10-06 01:40:08.000000000 +0100
@@ -30,7 +30,7 @@
of look ahead.
.IP "\fB-cl\fP class
Specify a class name for DLG to generate. The default is DLGLexer.
-"class" will be a subclass of DLGLexerBase; only used for -CC.
+'class' will be a subclass of DLGLexerBase; only used for -CC.
.IP \fB-ci\fP
The automaton will treat upper and lower case characters identically.
This is accomplished in the automaton; the characters in the lexical
diff -Nru pccts-1.33MR33/RIGHTS pccts-1.33MR33/RIGHTS
--- pccts-1.33MR33/RIGHTS 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/RIGHTS 1995-10-06 01:39:54.000000000 +0100
@@ -5,7 +5,7 @@
Set (PCCTS) -- PCCTS is in the public domain. An individual or
company may do whatever they wish with source code distributed with
PCCTS or the code generated by PCCTS, including the incorporation of
-PCCTS, or its output, into commercial software.
+PCCTS, or its output, into commerical software.
We encourage users to develop software with PCCTS. However, we do ask
that credit is given to us for developing PCCTS. By "credit", we mean
diff -Nru pccts-1.33MR33/sorcerer/lib/astlib.c pccts-1.33MR33/sorcerer/lib/astlib.c
--- pccts-1.33MR33/sorcerer/lib/astlib.c 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/sorcerer/lib/astlib.c 1999-06-30 16:41:21.000000000 +0200
@@ -217,7 +217,7 @@
SORAST *sib;
if ( u==NULL ) return 1;
- if ( t==NULL ) { if ( u!=NULL ) return 0; } else return 1;
+ if ( t==NULL ) if ( u!=NULL ) return 0; else return 1;
for (sib=t; sib!=NULL&&u!=NULL; sib=sib->ast_right, u=u->ast_right)
{
@@ -310,7 +310,7 @@
{
SORAST *sib;
- if ( t==NULL ) { if ( u!=NULL ) return 0; } else return 1;
+ if ( t==NULL ) if ( u!=NULL ) return 0; else return 1;
if ( u==NULL ) return 0;
for (sib=t; sib!=NULL&&u!=NULL; sib=sib->ast_right, u=u->ast_right)
@@ -335,7 +335,7 @@
{
ScanAST *sib;
- if ( t==NULL ) { if ( u!=NULL ) return 0; } else return 1;
+ if ( t==NULL ) if ( u!=NULL ) return 0; else return 1;
if ( u==NULL ) return 0;
for (sib=t; sib!=NULL&&u!=NULL; sib=sib->right, u=u->ast_right)
diff -Nru pccts-1.33MR33/sorcerer/lib/sintstack.c pccts-1.33MR33/sorcerer/lib/sintstack.c
--- pccts-1.33MR33/sorcerer/lib/sintstack.c 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/sorcerer/lib/sintstack.c 1999-06-30 16:08:06.000000000 +0200
@@ -29,7 +29,6 @@
#include <stdio.h>
#include <setjmp.h>
-#include "pcctscfg.h"
#ifdef PCCTS_USE_STDARG
#include <stdarg.h>
#else
diff -Nru pccts-1.33MR33/sorcerer/lib/sorlist.c pccts-1.33MR33/sorcerer/lib/sorlist.c
--- pccts-1.33MR33/sorcerer/lib/sorlist.c 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/sorcerer/lib/sorlist.c 1999-06-30 04:15:56.000000000 +0200
@@ -28,7 +28,6 @@
*/
#include <stdio.h>
#include <setjmp.h>
-#include "pcctscfg.h"
#ifdef PCCTS_USE_STDARG
#include <stdarg.h>
diff -Nru pccts-1.33MR33/sorcerer/makefile pccts-1.33MR33/sorcerer/makefile
--- pccts-1.33MR33/sorcerer/makefile 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/sorcerer/makefile 2001-04-13 02:43:59.000000000 +0200
@@ -43,7 +43,6 @@
clean:
rm -f *.o core sor
- $(MAKE) -C lib clean
scrub:
rm -f *.o core $(GENHFILES) parser.dlg scan.c err.c sor.c sor
diff -Nru pccts-1.33MR33/sorcerer/sor.c pccts-1.33MR33/sorcerer/sor.c
--- pccts-1.33MR33/sorcerer/sor.c 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/sorcerer/sor.c 2002-04-20 04:45:08.000000000 +0200
@@ -6,7 +6,7 @@
* With AHPCRC, University of Minnesota
* ANTLR Version 1.33MR33
*
- * ../bin/antlr -gh -k 2 -gt sor.g
+ * ..\bin\antlr -gh -k 2 -gt sor.g
*
*/
diff -Nru pccts-1.33MR33/sorcerer/test/makefile pccts-1.33MR33/sorcerer/test/makefile
--- pccts-1.33MR33/sorcerer/test/makefile 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/sorcerer/test/makefile 1999-06-30 07:39:54.000000000 +0200
@@ -2,7 +2,9 @@
# Makefile for simple 1.00B SORCERER examples
#
-SOR = sor
+PCCTS=../..
+BIN=$(PCCTS)/bin
+SOR = $(BIN)/sor
CFLAGS = -I. -I../../h -I../h -I../lib -g -ansi
DFLAGS = -C2 -i
SRC = test.c
diff -Nru pccts-1.33MR33/support/genmk/genmk.c pccts-1.33MR33/support/genmk/genmk.c
--- pccts-1.33MR33/support/genmk/genmk.c 2022-05-26 00:58:35.000000000 +0200
+++ pccts-1.33MR33/support/genmk/genmk.c 2000-12-04 17:05:21.000000000 +0100
@@ -79,7 +79,6 @@
void pfiles();
void fatal();
void warn();
-void pclasses(char **classes, int n, char *suffix);
#endif
typedef struct _Opt {
@@ -967,10 +966,8 @@
}
#ifdef __STDC__
-void
pclasses(char **classes, int n, char *suffix)
#else
-void
pclasses(classes, n, suffix)
char **classes;
int n;
