Imported Upstream version 20211224upstream/20211224

8 files changed, 36 insertions, 16 deletions

diff --git a/package/byacc.spec b/package/byacc.spec
index 525378b..36f1d62 100644
--- a/package/byacc.spec
+++ b/package/byacc.spec
@@ -1,9 +1,9 @@
 Summary: byacc - public domain Berkeley LALR Yacc parser generator
 %define AppProgram byacc
 %define AltProgram btyacc
-%define AppVersion 20210808
+%define AppVersion 20211224
 %define UseProgram yacc
-# $Id: byacc.spec,v 1.59 2021/08/08 19:26:10 tom Exp $
+# $Id: byacc.spec,v 1.60 2021/12/25 00:13:22 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: 1
diff --git a/package/debian/changelog b/package/debian/changelog
index f9ecf53..84f3ee6 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+byacc (20211224) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 24 Dec 2021 19:13:22 -0500
+
 byacc (20210808) unstable; urgency=low
 
   * maintenance updates
diff --git a/package/debian/control b/package/debian/control
index fccd907..a6b8644 100644
--- a/package/debian/control
+++ b/package/debian/control
@@ -2,12 +2,14 @@ Source: byacc
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
 Section: devel
 Priority: optional
-Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5)
-Homepage: http://invisible-island.net/byacc/
+Standards-Version: 4.3.0
+Build-Depends: debhelper (>= 11)
+Homepage: https://invisible-island.net/byacc/
+Vcs-Git: https://salsa.debian.org/dickey/byacc
 
 Package: byacc
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: public domain Berkeley LALR Yacc parser generator
  This package provides a parser generator utility that reads a grammar
@@ -18,6 +20,7 @@ Description: public domain Berkeley LALR Yacc parser generator
 
 Package: btyacc
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: public domain Berkeley LALR Yacc parser generator
  This package provides a parser generator utility that reads a grammar
diff --git a/package/debian/copyright b/package/debian/copyright
index 80d467a..073020c 100644
--- a/package/debian/copyright
+++ b/package/debian/copyright
@@ -96,7 +96,7 @@ Licence: other-BSD
     from scratch.  It can only install one file at a time, a restriction
     shared with many OS's install programs.
 
-Files: debian/*
+Files: package/debian/*
 Copyright:  2012-2020,2021 Thomas E. Dickey
 Licence: other-BSD
     Permission to use, copy, modify, and distribute this software and its
diff --git a/package/debian/docs b/package/debian/docs
index cbda209..1985e68 100644
--- a/package/debian/docs
+++ b/package/debian/docs
@@ -1,4 +1,5 @@
 README
+README.BTYACC
 ACKNOWLEDGEMENTS
 NEW_FEATURES
 NOTES
diff --git a/package/debian/rules b/package/debian/rules
index 0ce508e..b71dc19 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.5 2021/05/20 23:48:03 tom Exp $
+# $Id: rules,v 1.6 2021/12/25 01:55:41 tom Exp $
 #
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -48,14 +48,16 @@ configure = \
 all: build
 
 config: config-arch
-build: build-arch
+build: build-indep build-arch
 install: install-arch
-binary: binary-arch
+binary: binary-indep binary-arch
 
 config-arch:  $(PACKAGES.arch:%=config-%-stamp)
 build-arch:   $(PACKAGES.arch:%=build-%-stamp)
 install-arch: $(PACKAGES.arch:%=install-%-stamp)
 
+build-indep:
+
 config-byacc-stamp:
 	dh_testdir
 
@@ -97,6 +99,7 @@ install-byacc-stamp: build-byacc-stamp
 	dh_installdirs
 
 	cd $(BYACC_TMP); $(MAKE) install DESTDIR=$(BYACC_DIR)
+	sed -i '/- an LALR/s,^..N,byacc,' $(BYACC_DIR)/usr/share/man/man1/byacc.1
 
 	touch $@
 
@@ -106,6 +109,7 @@ install-btyacc-stamp: build-btyacc-stamp
 	dh_installdirs
 
 	cd $(BTYACC_TMP); $(MAKE) install DESTDIR=$(BTYACC_DIR)
+	sed -i '/- an LALR/s,^..N,btyacc,' $(BTYACC_DIR)/usr/share/man/man1/btyacc.1
 
 	touch $@
 
@@ -117,6 +121,15 @@ clean:
 
 	rm -rf t
 
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_lintian           $(verbose) $(PACKAGES.arch:%=-p%)
+	dh_installdocs	     $(verbose) $(PACKAGES.arch:%=-p%)
+	dh_installexamples   $(verbose) $(PACKAGES.arch:%=-p%)
+	dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%) CHANGES
+
 # Build architecture-dependent files here.
 binary-arch: build install
 ifneq ($(PACKAGES.arch),)
@@ -124,9 +137,6 @@ ifneq ($(PACKAGES.arch),)
 	dh_testdir
 	dh_testroot
 	dh_lintian           $(verbose) $(PACKAGES.arch:%=-p%)
-	dh_installdocs	     $(verbose) $(PACKAGES.arch:%=-p%)
-	dh_installexamples   $(verbose) $(PACKAGES.arch:%=-p%)
-	dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%) CHANGES
 	dh_strip	     $(verbose) $(PACKAGES.arch:%=-p%)
 	dh_compress	     $(verbose) $(PACKAGES.arch:%=-p%)
 	dh_fixperms	     $(verbose) $(PACKAGES.arch:%=-p%)
@@ -137,4 +147,4 @@ ifneq ($(PACKAGES.arch),)
 	dh_builddeb	     $(verbose) $(PACKAGES.arch:%=-p%)
 endif
 
-.PHONY: build clean config config-arch binary binary-arch install install-arch
+.PHONY: build clean config config-arch binary binary-indep binary-arch install install-arch
diff --git a/package/mingw-byacc.spec b/package/mingw-byacc.spec
index bd5616c..d7281c5 100644
--- a/package/mingw-byacc.spec
+++ b/package/mingw-byacc.spec
@@ -1,8 +1,8 @@
 Summary: byacc - public domain Berkeley LALR Yacc parser generator
 %define AppProgram byacc
-%define AppVersion 20210808
+%define AppVersion 20211224
 %define UseProgram yacc
-# $Id: mingw-byacc.spec,v 1.37 2021/08/08 19:26:10 tom Exp $
+# $Id: mingw-byacc.spec,v 1.38 2021/12/25 00:13:22 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: 1
diff --git a/package/pkgsrc/Makefile b/package/pkgsrc/Makefile
index 58cb531..09e9310 100644
--- a/package/pkgsrc/Makefile
+++ b/package/pkgsrc/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.9 2008/07/24 17:13:00 tonnerre Exp $
 #
 
-DISTNAME=	byacc-20210808
+DISTNAME=	byacc-20211224
 PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.invisible-island.net/byacc/