Package: noweb Version: 2.11b-11 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for noweb (versioned as 2.11b-11.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru noweb-2.11b/debian/changelog noweb-2.11b/debian/changelog --- noweb-2.11b/debian/changelog 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/changelog 2020-01-21 12:31:45.000000000 +0100 @@ -1,3 +1,26 @@ +noweb (2.11b-11.1) unstable; urgency=medium + + * Non-maintainer upload. + * Drop nowebm package and maintainer scripts. Closes: #878777. + * Switch to debhelper 12 and dh. + It handles manual pages, DEB_BUILD_OPTIONS. + * Switch source format from dpatch to 3.0 (quilt) with DEP-3 headers. + Drop empty 11_german. Inline 99_touch in d/rules. + Merge and 01_debian and 12_nostrip. + * Pass hardening flags to upstream Make. Closes: #661655. + * Add watch file. + * Switch copyright file to format 1.0. + * Rules-Requires-Root: no. + * Standards-Version: 4.5.0. + * Set priority to optional from obsolete extra. + * Switch Homepage URL to HTTPS. + * Remove obsolete Apps section from doc-base registration. + * Clean files generated by the build. + * Wrap and sort dependencies.. + * Delete trailing whitespaces in d/changelog and d/rules. + + -- Nicolas Boulenguez <[email protected]> Tue, 21 Jan 2020 12:31:45 +0100 + noweb (2.11b-11) unstable; urgency=low * debian/control, debian/rules: we don't use iconc any more. @@ -182,11 +205,11 @@ * Fixed debian/rules to explicitly define DESTDIR (Closes: #175242) * Patch 002_tmp_fix (Closes: #173240) - fixes insecure usage of /tmp by cpif - - fixes insecure usage of /tmp by noroff + - fixes insecure usage of /tmp by noroff * Switched to icont only again (Closes: #142644) * Removed full stop from synopsis. * Removed debian/nowebm.conffiles (dh_installemacs does that) - + -- Federico Di Gregorio <[email protected]> Fri, 4 Apr 2003 11:18:40 +0200 noweb (2.10c-1) unstable; urgency=low @@ -195,7 +218,7 @@ * Resynced version number. * Re-enabled iconc, let see if it compiles right on strange archs. * Reintegrated cpif into main package. - + -- Federico Di Gregorio <[email protected]> Wed, 24 Jul 2002 20:48:22 +0200 noweb (2.10b.1-1) unstable; urgency=low @@ -204,7 +227,7 @@ * Closing bugs fixed in NMU (closes: #132119). * Finally switched to debhelper V3 and dbs. * ICONC=icont as suggested by the upstream author. That should fix all - the build problems on non-i386 archs. + the build problems on non-i386 archs. * Created cpif package as requested on the BTS 2 years ago (closes: #54182) * Changed upstream version to 2.10b.1 to be able to upload new source tarball, next upstream version will be 2.10c and will be in sync @@ -225,19 +248,19 @@ fixes are compiling problems on some archs.) -- Federico Di Gregorio <[email protected]> Thu, 2 May 2002 14:26:04 +0200 - + noweb (2.9a-9) unstable; urgency=high - + * Trying to fix the ia64 bug the hppa way. - + -- Federico Di Gregorio <[email protected]> Mon, 29 Apr 2002 21:45:42 +0200 noweb (2.9a-8) unstable; urgency=low * Applied patch from LaMont Jones (closes: #144323). - + -- Federico Di Gregorio <[email protected]> Wed, 24 Apr 2002 11:17:09 +0200 - + noweb (2.9a-7.1) unstable; urgency=low * Non-maintainer upload. @@ -248,14 +271,14 @@ noweb (2.9a-7) frozen unstable; urgency=low * Re-upload with bumped version to avoid overwrite problems. - + -- Federico Di Gregorio <[email protected]> Wed, 19 Sep 2001 15:58:20 +0200 - + noweb (2.9a-6) frozen unstable; urgency=low - + * Added build deps (Closes: #109356). * Bumped up policy version. - + -- Federico Di Gregorio <[email protected]> Mon, 3 Sep 2001 18:30:17 +0200 noweb (2.9a-5) frozen unstable; urgency=low @@ -280,23 +303,23 @@ noweb (2.9a-2) unstable; urgency=low - * Fixed bug in debian/rules. Now shell scripts are built with - correct path. + * Fixed bug in debian/rules. Now shell scripts are built with + correct path. -- Federico Di Gregorio <[email protected]> Sat, 15 Jan 2000 19:12:46 +0100 noweb (2.9a-1) unstable; urgency=low * New upstream version (fixes: #54115) - * Applied PowerPC patch from Konstantinos Margaritis + * Applied PowerPC patch from Konstantinos Margaritis <[email protected]> (fixes: #51874) - * Applied postinst/prerm patch from Rafael Laboissiere - <[email protected]> (fixes: #34029) + * Applied postinst/prerm patch from Rafael Laboissiere + <[email protected]> (fixes: #34029) * Changed documentation entry from menu to docbase (fixes: #32100) * Now FHS compliant (fixes: #42451) * Adption of debhelper in debian/rules. * Lintian clean! - + -- Federico Di Gregorio <[email protected]> Sat, 8 Jan 2000 12:23:04 +0100 noweb (2.8a-3) frozen unstable; urgency=low @@ -307,7 +330,7 @@ the licence to do any modification (packaging/bugfixing/etc...) * Removed mawk dependence (fixes: #19622). * Made the package lintian-clean. - + -- Federico Di Gregorio <[email protected]> Mon, 13 Apr 1998 22:14:14 +0100 noweb (2.8a-2) unstable; urgency=low @@ -315,15 +338,11 @@ * Moved LaTeX .sty file to .../latex/litprog. * Added documentation (onepage.ps) got from Norman noweb page. * Removed bashisms from debian/rules. - + -- Federico Di Gregorio <[email protected]> Sat, 28 Feb 1998 12:14:14 +0100 noweb (2.8a-1) unstable; urgency=low * Initial release. (And now if only Norman would change the license...) - - -- Federico Di Gregorio <[email protected]> Tue, 18 Nov 1997 11:47:27 +0100 - - - + -- Federico Di Gregorio <[email protected]> Tue, 18 Nov 1997 11:47:27 +0100 diff -Nru noweb-2.11b/debian/compat noweb-2.11b/debian/compat --- noweb-2.11b/debian/compat 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -5 diff -Nru noweb-2.11b/debian/control noweb-2.11b/debian/control --- noweb-2.11b/debian/control 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/control 2020-01-21 12:31:45.000000000 +0100 @@ -1,36 +1,34 @@ Source: noweb Section: devel -Priority: extra +Priority: optional Maintainer: Hubert Chathi <[email protected]> -Build-Depends: icont, iconx, debhelper (>= 5.0.34), texlive-latex-base, texlive-latex-extra, dpatch -Standards-Version: 3.7.3 -Homepage: http://www.cs.tufts.edu/~nr/noweb/ +Build-Depends: + debhelper-compat (= 12), + icont, + iconx, +# d/rules runs dh_installtex via 'dh --with=tex': + tex-common, + texlive-latex-base, + texlive-latex-extra, +Standards-Version: 4.5.0 +Homepage: https://www.cs.tufts.edu/~nr/noweb +Rules-Requires-Root: no Package: noweb Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iconx, gawk +Depends: ${shlibs:Depends}, ${misc:Depends}, + gawk, + iconx, Recommends: texlive -Replaces: nowebm Multi-Arch: foreign -Description: A WEB-like literate-programming tool +Description: WEB-like literate-programming tool noweb is designed to meet the needs of literate programmers while remaining as simple as possible. Its primary advantages are simplicity, extensibility, and language-independence. . The noweb manual is only 3 pages; an additional page explains how to customize its LaTeX output. noweb works ``out of the box'' with any - programming language, and supports TeX, latex, and HTML back ends. + programming language, and supports TeX, LaTeX, and HTML back ends. . The primary sacrifice relative to WEB is that code is not prettyprinted. - -Package: nowebm -Architecture: all -Depends: noweb -Description: A WEB-like literate-programming tool - transitional package - noweb is designed to meet the needs of literate programmers while - remaining as simple as possible. Its primary advantages are - simplicity, extensibility, and language-independence. - . - This is a transitional package. You can safely remove this package - after it is installed. diff -Nru noweb-2.11b/debian/copyright noweb-2.11b/debian/copyright --- noweb-2.11b/debian/copyright 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/copyright 2020-01-03 20:37:35.000000000 +0100 @@ -1,35 +1,35 @@ -This package was debianized by: - - Federico Di Gregorio <[email protected]> on - Thu, 18 Nov 1997 12:00:00 - -The current Debian maintainer is Hubert Chan <[email protected]>. - -The original, pristine sources can be obtained from: - - http://www.cs.tufts.edu/~nr/noweb/dist +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: noweb +Source: http://www.cs.tufts.edu/~nr/noweb/dist + +Files: * +Copyright: 1989-2000 Norman Ramsey +License: noweb +Files: debian/* Copyright: - -Noweb is copyright 1989-2000 by Norman Ramsey. All rights reserved. - -Noweb is protected by copyright. It is not public-domain -software or shareware, and it is not protected by a ``copyleft'' -agreement like the one used by the Free Software Foundation. - -Noweb is available free for any use in any field of endeavor. You may -redistribute noweb in whole or in part provided you acknowledge its -source and include this COPYRIGHT file. You may modify noweb and -create derived works, provided you retain this copyright notice, but -the result may not be called noweb without my written consent. - -You may sell noweb if you wish. For example, you may sell a CD-ROM -including noweb. - -You may sell a derived work, provided that all source code for your -derived work is available, at no additional charge, to anyone who buys -your derived work in any form. You must give permisson for said -source code to be used and modified under the terms of this license. -You must state clearly that your work uses or is based on noweb and -that noweb is available free of change. You must also request that -bug reports on your work be reported to you. + 1997-2003 Federico Di Gregorio <[email protected]> + 2006-2016 Hubert Chan <[email protected]>. +License: noweb + +License: noweb + Noweb is protected by copyright. It is not public-domain + software or shareware, and it is not protected by a ``copyleft'' + agreement like the one used by the Free Software Foundation. + . + Noweb is available free for any use in any field of endeavor. You may + redistribute noweb in whole or in part provided you acknowledge its + source and include this COPYRIGHT file. You may modify noweb and + create derived works, provided you retain this copyright notice, but + the result may not be called noweb without my written consent. + . + You may sell noweb if you wish. For example, you may sell a CD-ROM + including noweb. + . + You may sell a derived work, provided that all source code for your + derived work is available, at no additional charge, to anyone who buys + your derived work in any form. You must give permisson for said + source code to be used and modified under the terms of this license. + You must state clearly that your work uses or is based on noweb and + that noweb is available free of change. You must also request that + bug reports on your work be reported to you. diff -Nru noweb-2.11b/debian/noweb.dirs noweb-2.11b/debian/noweb.dirs --- noweb-2.11b/debian/noweb.dirs 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/noweb.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -usr/share/man -usr/share/emacs/site-lisp -usr/share/texmf/tex/plain/misc -usr/share/texmf/tex/latex/litprog -usr/share/groff/tmac -usr/lib/noweb -usr/bin -etc/emacs/site-start.d diff -Nru noweb-2.11b/debian/noweb.doc-base.guide noweb-2.11b/debian/noweb.doc-base.guide --- noweb-2.11b/debian/noweb.doc-base.guide 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/noweb.doc-base.guide 2020-01-03 20:37:31.000000000 +0100 @@ -3,7 +3,7 @@ Author: Norman Ramsey Abstract: This manual describes what noweb is and how to change and extend it. Ordinary users will find nothing of interest here. -Section: Apps/Programming +Section: Programming Format: DVI Files: /usr/share/doc/noweb/guide.dvi.gz diff -Nru noweb-2.11b/debian/noweb.doc-base.onepage noweb-2.11b/debian/noweb.doc-base.onepage --- noweb-2.11b/debian/noweb.doc-base.onepage 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/noweb.doc-base.onepage 2020-01-03 20:37:31.000000000 +0100 @@ -2,7 +2,7 @@ Title: A One-Page Guide to Using noweb with LaTeX Author: Norman Ramsey after Lee Wittenberg and Carl Gregory Abstract: One page introduction to noweb and LaTeX for ordinary users. -Section: Apps/Programming +Section: Programming Format: PostScript Files: /usr/share/doc/noweb/onepage.ps.gz diff -Nru noweb-2.11b/debian/noweb.docs noweb-2.11b/debian/noweb.docs --- noweb-2.11b/debian/noweb.docs 1970-01-01 01:00:00.000000000 +0100 +++ noweb-2.11b/debian/noweb.docs 2020-01-21 12:31:45.000000000 +0100 @@ -0,0 +1,7 @@ +src/FAQ +src/README +src/xdoc/guide.dvi +src/xdoc/guide.html +src/xdoc/guide.ps +src/xdoc/onepage.dvi +src/xdoc/onepage.ps diff -Nru noweb-2.11b/debian/noweb.install noweb-2.11b/debian/noweb.install --- noweb-2.11b/debian/noweb.install 1970-01-01 01:00:00.000000000 +0100 +++ noweb-2.11b/debian/noweb.install 2020-01-21 12:31:45.000000000 +0100 @@ -0,0 +1 @@ +contrib/norman/scopehack usr/lib/noweb diff -Nru noweb-2.11b/debian/noweb.postinst noweb-2.11b/debian/noweb.postinst --- noweb-2.11b/debian/noweb.postinst 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/noweb.postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -e - -# Move a conffile without triggering a dpkg question -# http://www.dpkg.org/dpkg/ConffileHandling -mv_conffile() { - OLDCONFFILE="$1" - NEWCONFFILE="$2" - - if [ -e "$OLDCONFFILE" ]; then - echo "Preserving user changes to $NEWCONFFILE ..." - mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new - mv -f "$OLDCONFFILE" "$NEWCONFFILE" - fi -} - -case "$1" in -configure) - if dpkg --compare-versions "$2" le "2.11b-3"; then - mv_conffile "/etc/emacs/site-start.d/50nowebm.el" "/etc/emacs/site-start.d/50noweb.el" - fi -esac - -#DEBHELPER# - diff -Nru noweb-2.11b/debian/noweb.postrm noweb-2.11b/debian/noweb.postrm --- noweb-2.11b/debian/noweb.postrm 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/noweb.postrm 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -#!/bin/sh -e - -#DEBHELPER# diff -Nru noweb-2.11b/debian/noweb.preinst noweb-2.11b/debian/noweb.preinst --- noweb-2.11b/debian/noweb.preinst 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/noweb.preinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -e - -# Prepare to move a conffile without triggering a dpkg question -# http://www.dpkg.org/dpkg/ConffileHandling -prep_mv_conffile() { - CONFFILE="$1" - - if [ -e "$CONFFILE" ]; then - md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`" - if [ "$md5sum" = "$old_md5sum" ]; then - rm -f "$CONFFILE" - fi - fi -} - -case "$1" in -install|upgrade) - if dpkg --compare-versions "$2" le "2.11b-3"; then - prep_mv_conffile "/etc/emacs/site-start.d/50nowebm.el" - fi -esac - -#DEBHELPER# diff -Nru noweb-2.11b/debian/patches/00list noweb-2.11b/debian/patches/00list --- noweb-2.11b/debian/patches/00list 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -01_debian -02_tmp_fix -04_uninstall -05_security_CVE-2005-3342 -06_roff_output -08_tmac_dir -09_awk -10_vmargin -11_german -12_nostrip -13_bashism -14_nountangle_filters.dpatch -99_touch diff -Nru noweb-2.11b/debian/patches/01_debian.dpatch noweb-2.11b/debian/patches/01_debian.dpatch --- noweb-2.11b/debian/patches/01_debian.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/01_debian.dpatch 2020-01-21 12:31:45.000000000 +0100 @@ -1,75 +1,264 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_debian.dpatch by <[email protected]>, <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: modify source to follow Debian conventions +Author: <[email protected]> +Author: Hubert Chathi <[email protected]> +Author: Nicolas Boulenguez <[email protected]> +Description: modify source to follow common conventions. Prevent texhash. + Let DESTDIR and INSTALL_PROGRAM have their usual meaning + (so the values set by Debhelper are correct). + . + Create directories with mkdir -p (reporting unexpected errors). + . + texhash is run by postinst scripts, no need to run it via Make. + . + For manual pages, symbolic links are better than hard links. + . + TODO: the change in src/xdoc/Makefile deserves an explanation here. + . + src/Makefile is generated from src/Makefile.nw. + It would be trivial to fix it instead, + but the generation is avoided in the Debian build + in order to break a circular dependency. -@DPATCH@ - -diff -ruN noweb/src/icon/Makefile noweb/src/icon/Makefile ---- noweb/src/icon/Makefile 2002-07-18 00:43:46.000000000 +0200 -+++ noweb/src/icon/Makefile 2003-04-04 11:20:45.000000000 +0200 -@@ -32,9 +32,9 @@ - touch $(SRCS) +--- a/src/Makefile ++++ b/src/Makefile +@@ -29,6 +29,10 @@ + # change WEAVE if you want a different version of noweave to be installed + WEAVE=noweave - install: $(EXECS) -- cp $(LIBEXECS) $(LIB) -- cp $(BINEXECS) $(BIN) -- cp $(LIBSPECIAL) $(LIB)/autodefs.c -+ cp $(LIBEXECS) $(DESTDIR)/$(LIB) -+ cp $(BINEXECS) $(DESTDIR)/$(BIN) -+ cp $(LIBSPECIAL) $(DESTDIR)/$(LIB)/autodefs.c - - uninstall: - for i in $(LIBEXECS); do rm -f $(LIB)/$$i; done -diff -ruN noweb/src/lib/Makefile noweb/src/lib/Makefile ---- noweb/src/lib/Makefile 2006-06-12 17:52:18.957203000 -0400 -+++ noweb/src/lib/Makefile 2006-06-12 18:26:16.018379000 -0400 -@@ -11,9 +11,9 @@ - chmod +x unmarkup emptydefn toascii nwmtime pipedocs h2a btdefn ++INSTALL = install ++INSTALL_PROGRAM = $(INSTALL) ++INSTALL_DATA = $(INSTALL) -m 644 ++ + # Stop editing. No user-serviceable parts below. + SHELL=/bin/sh + CINAME= +@@ -58,30 +62,30 @@ + -rmdir $(BIN) $(LIB) 2>/dev/null - install: all -- cp unmarkup emptydefn toascii nwmtime h2a btdefn $(LIB) -- sed 's@|LIBDIR|@$(LIB)@g' pipedocs > $(LIB)/pipedocs -- chmod +x $(LIB)/pipedocs -+ cp unmarkup emptydefn toascii nwmtime h2a btdefn $(DESTDIR)/$(LIB) -+ sed 's@|LIBDIR|@$(LIBNAME)@g' pipedocs > $(DESTDIR)/$(LIB)/pipedocs -+ chmod +x $(DESTDIR)/$(LIB)/pipedocs - - uninstall: - for i in unmarkup emptydefn toascii nwmtime h2a btdefn; do rm -f $(LIB)/$$i; done -diff -ruN noweb/src/Makefile noweb/src/Makefile ---- noweb/src/Makefile 2002-07-18 00:47:31.000000000 +0200 -+++ noweb/src/Makefile 2003-04-04 11:20:45.000000000 +0200 -@@ -122,10 +122,11 @@ - sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.1 > $(MANDIR)/htmltoc.$(MANEXT) - sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.7 > $(MAN7DIR)/nowebstyle.$(MAN7EXT) - sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.7 > $(MAN7DIR)/nowebfilters.$(MAN7EXT) + install-shell: +- -mkdir $(BIN) $(LIB) 2>/dev/null +- sed "s@|LIBDIR|@$(LIBNAME)@" shell/noweb > $(BIN)/noweb +- chmod +x $(BIN)/noweb +- sed "s@|LIBDIR|@$(LIBNAME)@" shell/notangle > $(BIN)/notangle +- chmod +x $(BIN)/notangle +- sed "s@|LIBDIR|@$(LIBNAME)@" shell/$(WEAVE) > $(BIN)/$(WEAVE) +- chmod +x $(BIN)/$(WEAVE) +- sed "s@|LIBDIR|@$(LIBNAME)@" shell/nountangle > $(BIN)/nountangle +- chmod +x $(BIN)/nountangle +- sed "s@|LIBDIR|@$(LIBNAME)@" shell/nodefs > $(BIN)/nodefs +- chmod +x $(BIN)/nodefs +- sed "s@|LIBDIR|@$(LIBNAME)@" shell/noroots > $(BIN)/noroots +- chmod +x $(BIN)/noroots +- sed "s@|LIBDIR|@$(LIBNAME)@" shell/nuweb2noweb > $(BIN)/nuweb2noweb +- chmod +x $(BIN)/nuweb2noweb +- sed "s@|LIBDIR|@$(LIBNAME)@" shell/cpif > $(BIN)/cpif +- chmod +x $(BIN)/cpif +- sed "s@|LIBDIR|@$(LIBNAME)@" shell/htmltoc > $(BIN)/htmltoc +- chmod +x $(BIN)/htmltoc +- sed "s@|LIBDIR|@$(LIBNAME)@" shell/noroff > $(BIN)/noroff +- chmod +x $(BIN)/noroff +- sed "s@|LIBDIR|@$(LIBNAME)@" shell/toroff > $(LIB)/toroff +- chmod +x $(LIB)/toroff +- cp shell/tmac.w $(LIB) ++ mkdir -p $(DESTDIR)$(BIN) $(DESTDIR)$(LIB) ++ sed "s@|LIBDIR|@$(LIBNAME)@" shell/noweb > $(DESTDIR)$(BIN)/noweb ++ chmod +x $(DESTDIR)$(BIN)/noweb ++ sed "s@|LIBDIR|@$(LIBNAME)@" shell/notangle > $(DESTDIR)$(BIN)/notangle ++ chmod +x $(DESTDIR)$(BIN)/notangle ++ sed "s@|LIBDIR|@$(LIBNAME)@" shell/$(WEAVE) > $(DESTDIR)$(BIN)/$(WEAVE) ++ chmod +x $(DESTDIR)$(BIN)/$(WEAVE) ++ sed "s@|LIBDIR|@$(LIBNAME)@" shell/nountangle > $(DESTDIR)$(BIN)/nountangle ++ chmod +x $(DESTDIR)$(BIN)/nountangle ++ sed "s@|LIBDIR|@$(LIBNAME)@" shell/nodefs > $(DESTDIR)$(BIN)/nodefs ++ chmod +x $(DESTDIR)$(BIN)/nodefs ++ sed "s@|LIBDIR|@$(LIBNAME)@" shell/noroots > $(DESTDIR)$(BIN)/noroots ++ chmod +x $(DESTDIR)$(BIN)/noroots ++ sed "s@|LIBDIR|@$(LIBNAME)@" shell/nuweb2noweb > $(DESTDIR)$(BIN)/nuweb2noweb ++ chmod +x $(DESTDIR)$(BIN)/nuweb2noweb ++ sed "s@|LIBDIR|@$(LIBNAME)@" shell/cpif > $(DESTDIR)$(BIN)/cpif ++ chmod +x $(DESTDIR)$(BIN)/cpif ++ sed "s@|LIBDIR|@$(LIBNAME)@" shell/htmltoc > $(DESTDIR)$(BIN)/htmltoc ++ chmod +x $(DESTDIR)$(BIN)/htmltoc ++ sed "s@|LIBDIR|@$(LIBNAME)@" shell/noroff > $(DESTDIR)$(BIN)/noroff ++ chmod +x $(DESTDIR)$(BIN)/noroff ++ sed "s@|LIBDIR|@$(LIBNAME)@" shell/toroff > $(DESTDIR)$(LIB)/toroff ++ chmod +x $(DESTDIR)$(LIB)/toroff ++ cp shell/tmac.w $(DESTDIR)$(LIB) + + uninstall-shell: + rm -f $(BIN)/noweb +@@ -98,9 +102,8 @@ + rm $(LIB)/tmac.w + + install-code: install-shell +- -mkdir $(BIN) $(LIB) 2>/dev/null +- strip c/nt c/markup c/mnt c/finduses +- cp c/nt c/markup c/mnt c/finduses $(LIB) ++ mkdir -p $(DESTDIR)$(BIN) $(DESTDIR)$(LIB) ++ $(INSTALL_PROGRAM) -s c/nt c/markup c/mnt c/finduses $(DESTDIR)$(LIB) + cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install + cd lib; make LIB=$(LIB) install + +@@ -109,23 +112,21 @@ + cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall + cd lib; make LIB=$(LIB) uninstall + install-man: +- -mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT) +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 > $(MANDIR)/nodefs.$(MANEXT) +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 > $(MANDIR)/noroots.$(MANEXT) +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.1 > $(MANDIR)/noweb.$(MANEXT) +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.1 > $(MANDIR)/noindex.$(MANEXT) +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.1 > $(MANDIR)/nuweb2noweb.$(MANEXT) +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.1 > $(MANDIR)/notangle.$(MANEXT) +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.1 > $(MANDIR)/noroff.$(MANEXT) +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.1 > $(MANDIR)/sl2h.$(MANEXT) +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.1 > $(MANDIR)/htmltoc.$(MANEXT) +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.7 > $(MAN7DIR)/nowebstyle.$(MAN7EXT) +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.7 > $(MAN7DIR)/nowebfilters.$(MAN7EXT) - rm -f $(MANDIR)/noweave.$(MANEXT) - (cd $(MANDIR); ln notangle.$(MANEXT) noweave.$(MANEXT)) - rm -f $(MANDIR)/nountangle.$(MANEXT) - (cd $(MANDIR); ln notangle.$(MANEXT) nountangle.$(MANEXT)) -+ # removed and replaced by dh_link --fog -+ #rm -f $(MANDIR)/noweave.$(MANEXT) -+ #(cd $(MANDIR); ln -s notangle.$(MANEXT) noweave.$(MANEXT)) -+ #rm -f $(MANDIR)/nountangle.$(MANEXT) -+ #(cd $(MANDIR); ln -s notangle.$(MANEXT) nountangle.$(MANEXT)) ++ mkdir -p $(DESTDIR)$(MAN) $(DESTDIR)$(MANDIR) $(DESTDIR)$(MAN7DIR) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(DESTDIR)$(MANDIR)/cpif.$(MANEXT) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 > $(DESTDIR)$(MANDIR)/nodefs.$(MANEXT) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 > $(DESTDIR)$(MANDIR)/noroots.$(MANEXT) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.1 > $(DESTDIR)$(MANDIR)/noweb.$(MANEXT) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.1 > $(DESTDIR)$(MANDIR)/noindex.$(MANEXT) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.1 > $(DESTDIR)$(MANDIR)/nuweb2noweb.$(MANEXT) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.1 > $(DESTDIR)$(MANDIR)/notangle.$(MANEXT) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.1 > $(DESTDIR)$(MANDIR)/noroff.$(MANEXT) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.1 > $(DESTDIR)$(MANDIR)/sl2h.$(MANEXT) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.1 > $(DESTDIR)$(MANDIR)/htmltoc.$(MANEXT) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.7 > $(DESTDIR)$(MAN7DIR)/nowebstyle.$(MAN7EXT) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.7 > $(DESTDIR)$(MAN7DIR)/nowebfilters.$(MAN7EXT) ++ (cd $(DESTDIR)$(MANDIR); ln -fs notangle.$(MANEXT) noweave.$(MANEXT)) ++ (cd $(DESTDIR)$(MANDIR); ln -fs notangle.$(MANEXT) nountangle.$(MANEXT)) uninstall-man: rm -f $(MANDIR)/cpif.$(MANEXT) rm -f $(MANDIR)/nodefs.$(MANEXT) -@@ -181,7 +181,8 @@ +@@ -142,53 +143,50 @@ + rm -f $(MANDIR)/noweave.$(MANEXT) + rm -f $(MANDIR)/nountangle.$(MANEXT) + install-gzipped-man: +- -mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 | gzip -9 > $(MANDIR)/cpif.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 | gzip -9 > $(MANDIR)/nodefs.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 | gzip -9 > $(MANDIR)/noroots.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.1 | gzip -9 > $(MANDIR)/noweb.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.1 | gzip -9 > $(MANDIR)/noindex.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.1 | gzip -9 > $(MANDIR)/nuweb2noweb.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.1 | gzip -9 > $(MANDIR)/notangle.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.1 | gzip -9 > $(MANDIR)/noroff.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.1 | gzip -9 > $(MANDIR)/sl2h.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.1 | gzip -9 > $(MANDIR)/htmltoc.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.7 | gzip -9 > $(MAN7DIR)/nowebstyle.$(MAN7EXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.7 | gzip -9 > $(MAN7DIR)/nowebfilters.$(MAN7EXT).gz +- rm -f $(MANDIR)/noweave.$(MANEXT).gz +- (cd $(MANDIR); ln notangle.$(MANEXT).gz noweave.$(MANEXT).gz) +- rm -f $(MANDIR)/nountangle.$(MANEXT).gz +- (cd $(MANDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz) ++ mkdir -p $(DESTDIR)$(MAN) $(DESTDIR)$(MANDIR) $(DESTDIR)$(MAN7DIR) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 | gzip -9 > $(DESTDIR)$(MANDIR)/cpif.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.1 | gzip -9 > $(DESTDIR)$(MANDIR)/nodefs.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.1 | gzip -9 > $(DESTDIR)$(MANDIR)/noroots.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.1 | gzip -9 > $(DESTDIR)$(MANDIR)/noweb.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.1 | gzip -9 > $(DESTDIR)$(MANDIR)/noindex.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.1 | gzip -9 > $(DESTDIR)$(MANDIR)/nuweb2noweb.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.1 | gzip -9 > $(DESTDIR)$(MANDIR)/notangle.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.1 | gzip -9 > $(DESTDIR)$(MANDIR)/noroff.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.1 | gzip -9 > $(DESTDIR)$(MANDIR)/sl2h.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.1 | gzip -9 > $(DESTDIR)$(MANDIR)/htmltoc.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.7 | gzip -9 > $(DESTDIR)$(MAN7DIR)/nowebstyle.$(MAN7EXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.7 | gzip -9 > $(DESTDIR)$(MAN7DIR)/nowebfilters.$(MAN7EXT).gz ++ (cd $(DESTDIR)$(MANDIR); ln -fs notangle.$(MANEXT).gz noweave.$(MANEXT).gz) ++ (cd $(DESTDIR)$(MANDIR); ln -fs notangle.$(MANEXT).gz nountangle.$(MANEXT).gz) + install-preformat-man: + -echo "Warning: install-preformat-man is obsolete, even on Slackware systems" 1>&2 +- -mkdir $(MAN) $(CATDIR) $(CAT7DIR) 2>/dev/null +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.txt | gzip > $(CATDIR)/cpif.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.txt | gzip > $(CATDIR)/nodefs.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.txt | gzip > $(CATDIR)/noroots.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.txt | gzip > $(CATDIR)/noweb.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.txt | gzip > $(CATDIR)/noindex.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.txt | gzip > $(CATDIR)/nuweb2noweb.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.txt | gzip > $(CATDIR)/notangle.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.txt | gzip > $(CATDIR)/noroff.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.txt | gzip > $(CATDIR)/sl2h.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.txt | gzip > $(CATDIR)/htmltoc.$(MANEXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.txt | gzip > $(CAT7DIR)/nowebstyle.$(MAN7EXT).gz +- sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.txt | gzip > $(CAT7DIR)/nowebfilters.$(MAN7EXT).gz +- rm -f $(CATDIR)/noweave.$(MANEXT).gz +- (cd $(CATDIR); ln notangle.$(MANEXT).gz noweave.$(MANEXT).gz) +- rm -f $(CATDIR)/nountangle.$(MANEXT).gz +- (cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz) ++ mkdir -p $(DESTDIR)$(MAN) $(DESTDIR)$(CATDIR) $(DESTDIR)$(CAT7DIR) ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.txt | gzip > $(DESTDIR)$(CATDIR)/cpif.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nodefs.txt | gzip > $(DESTDIR)$(CATDIR)/nodefs.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroots.txt | gzip > $(DESTDIR)$(CATDIR)/noroots.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noweb.txt | gzip > $(DESTDIR)$(CATDIR)/noweb.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noindex.txt | gzip > $(DESTDIR)$(CATDIR)/noindex.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nuweb2noweb.txt | gzip > $(DESTDIR)$(CATDIR)/nuweb2noweb.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/notangle.txt | gzip > $(DESTDIR)$(CATDIR)/notangle.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/noroff.txt | gzip > $(DESTDIR)$(CATDIR)/noroff.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/sl2h.txt | gzip > $(DESTDIR)$(CATDIR)/sl2h.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/htmltoc.txt | gzip > $(DESTDIR)$(CATDIR)/htmltoc.$(MANEXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebstyle.txt | gzip > $(DESTDIR)$(CAT7DIR)/nowebstyle.$(MAN7EXT).gz ++ sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/nowebfilters.txt | gzip > $(DESTDIR)$(CAT7DIR)/nowebfilters.$(MAN7EXT).gz ++ (cd $(DESTDIR)$(CATDIR); ln -fs notangle.$(MANEXT).gz noweave.$(MANEXT).gz) ++ (cd $(DESTDIR)$(CATDIR); ln -fs notangle.$(MANEXT).gz nountangle.$(MANEXT).gz) install-tex: - -mkdir $(TEXINPUTS) 2>/dev/null - cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS) +- -mkdir $(TEXINPUTS) 2>/dev/null +- cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS) - -texhash || echo "Program texhash not found or failed" ++ mkdir -p $(DESTDIR)$(TEXINPUTS) ++ cp tex/nwmac.tex tex/noweb.sty $(DESTDIR)$(TEXINPUTS) + # we run texhash in the postinst script instead --uhoreg + #texhash || echo "Program texhash not found or failed" uninstall-tex: rm -f $(TEXINPUTS)/nwmac.tex $(TEXINPUTS)/noweb.sty -diff -u noweb/src/xdoc/Makefile noweb/src/xdoc/Makefile ---- noweb/src/xdoc/Makefile -+++ noweb/src/xdoc/Makefile + + install-elisp: +- -mkdir $(ELISP) 2>/dev/null +- cp elisp/noweb-mode.el $(ELISP) ++ mkdir -p $(DESTDIR)$(ELISP) ++ cp elisp/noweb-mode.el $(DESTDIR)$(ELISP) + + uninstall-elisp: + rm -f $(ELISP)/noweb-mode.el +--- a/src/icon/Makefile ++++ b/src/icon/Makefile +@@ -32,9 +32,9 @@ + touch $(SRCS) + + install: $(EXECS) +- cp $(LIBEXECS) $(LIB) +- cp $(BINEXECS) $(BIN) +- cp $(LIBSPECIAL) $(LIB)/autodefs.c ++ cp $(LIBEXECS) $(DESTDIR)$(LIB) ++ cp $(BINEXECS) $(DESTDIR)$(BIN) ++ cp $(LIBSPECIAL) $(DESTDIR)$(LIB)/autodefs.c + + clean: + /bin/rm -f *.tex *.dvi *.aux *.log *.blg *.bbl *~ *.toc *.html *.u1 *.u2 +--- a/src/lib/Makefile ++++ b/src/lib/Makefile +@@ -11,9 +11,9 @@ + chmod +x unmarkup emptydefn toascii nwmtime pipedocs h2a btdefn + + install: all +- cp unmarkup emptydefn toascii nwmtime h2a btdefn $(LIB) +- sed 's@|LIBDIR|@$(LIB)@g' pipedocs > $(LIB)/pipedocs +- chmod +x $(LIB)/pipedocs ++ cp unmarkup emptydefn toascii nwmtime h2a btdefn $(DESTDIR)$(LIB) ++ sed 's@|LIBDIR|@$(LIBNAME)@g' pipedocs > $(DESTDIR)$(LIB)/pipedocs ++ chmod +x $(DESTDIR)$(LIB)/pipedocs + + checkin: + ci -l $(CINAME) $(CIMSG) $(RCSFILES) +--- a/src/xdoc/Makefile ++++ b/src/xdoc/Makefile @@ -19,7 +19,7 @@ RCSFILES=*.nw *.tex Makefile DOVERSION=./doversion @@ -79,4 +268,3 @@ source: $(SRCS) touch: $(SRCS) touch $(SRCS) - diff -Nru noweb-2.11b/debian/patches/02_tmp_fix.dpatch noweb-2.11b/debian/patches/02_tmp_fix.dpatch --- noweb-2.11b/debian/patches/02_tmp_fix.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/02_tmp_fix.dpatch 2020-01-21 12:31:45.000000000 +0100 @@ -1,14 +1,8 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_tmp_fix.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: remove unacceptable uses of /tmp files +Author: <[email protected]> +Description: remove unacceptable uses of /tmp files -@DPATCH@ - -diff -ur noweb/contrib/conrado/d2tex noweb/contrib/conrado/d2tex ---- noweb/contrib/conrado/d2tex 1993-10-27 17:37:11.000000000 +0000 -+++ noweb/contrib/conrado/d2tex 2004-09-13 13:32:11.092886008 +0100 +--- a/contrib/conrado/d2tex ++++ b/contrib/conrado/d2tex @@ -1,5 +1,5 @@ #! /bin/sh -KEYGEN=/tmp/d2tex$$ @@ -16,9 +10,8 @@ trap "rm -f $KEYGEN; exit 1" 1 2 3 15 cat > $KEYGEN <<END_OF_FILE COMMENT#1 -diff -ur noweb/contrib/jobling/correct-refs.nw noweb/contrib/jobling/correct-refs.nw ---- noweb/contrib/jobling/correct-refs.nw 1995-05-24 19:12:48.000000000 +0100 -+++ noweb/contrib/jobling/correct-refs.nw 2004-09-13 13:34:18.617499320 +0100 +--- a/contrib/jobling/correct-refs.nw ++++ b/contrib/jobling/correct-refs.nw @@ -332,11 +332,12 @@ echo Processing HTML nodes foreach f (*.awk) @@ -34,9 +27,8 @@ end @ -diff -ur noweb/contrib/norman/htmlgif/pstopbm noweb/contrib/norman/htmlgif/pstopbm ---- noweb/contrib/norman/htmlgif/pstopbm 1998-08-07 19:29:32.000000000 +0100 -+++ noweb/contrib/norman/htmlgif/pstopbm 2004-09-13 13:33:06.465468096 +0100 +--- a/contrib/norman/htmlgif/pstopbm ++++ b/contrib/norman/htmlgif/pstopbm @@ -36,8 +36,8 @@ shift done @@ -57,9 +49,8 @@ cat > $tmp gs -q -sDEVICE=$device -sOutputFile=- -dNOPAUSE -dMAGSTEP=1.0 $tmp else -diff -ur noweb/src/awk/totex.nw noweb/src/awk/totex.nw ---- noweb/src/awk/totex.nw 1996-05-31 20:04:15.000000000 +0100 -+++ noweb/src/awk/totex.nw 2004-09-13 13:35:25.909269416 +0100 +--- a/src/awk/totex.nw ++++ b/src/awk/totex.nw @@ -24,7 +24,7 @@ @ On an ugly system, we have to put it in a file. @@ -69,9 +60,8 @@ trap 'rm -f $awkfile; exit 1' 0 1 2 15 # clean up files cat > $awkfile << 'EOF' <<awk program for conversion to {\TeX}>> -diff -ur noweb/src/awkname noweb/src/awkname ---- noweb/src/awkname 2000-06-16 21:26:42.000000000 +0100 -+++ noweb/src/awkname 2004-09-13 13:34:41.711988424 +0100 +--- a/src/awkname ++++ b/src/awkname @@ -5,7 +5,7 @@ esac @@ -81,9 +71,8 @@ for file in lib/emptydefn lib/unmarkup lib/toascii lib/btdefn \ awk/noidx awk/totex awk/tohtml awk/noindex \ -diff -ur noweb/src/lib/toascii noweb/src/lib/toascii ---- noweb/src/lib/toascii 2002-07-17 23:50:08.000000000 +0100 -+++ noweb/src/lib/toascii 2004-09-13 13:35:51.058446160 +0100 +--- a/src/lib/toascii ++++ b/src/lib/toascii @@ -7,9 +7,9 @@ *) echo "This can't happen -- $i passed to toascii" 1>&2 ; exit 1 ;; esac @@ -97,9 +86,8 @@ export awkfile textfile tagsfile trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15 nawk 'BEGIN { textfile=ENVIRON["textfile"] -diff -ur noweb/src/shell/cpif noweb/src/shell/cpif ---- noweb/src/shell/cpif 2004-09-13 13:45:46.601909792 +0100 -+++ noweb/src/shell/cpif 2004-09-13 13:36:59.944973816 +0100 +--- a/src/shell/cpif ++++ b/src/shell/cpif @@ -17,7 +17,7 @@ 0) echo 'Usage: '`basename $0`' [ -eq -ne ] file...' 1>&2; exit 2 esac @@ -109,9 +97,8 @@ trap 'rm -f $new; exit 1' 1 2 15 # clean up files cat >$new -diff -ur noweb/src/shell/nonu noweb/src/shell/nonu ---- noweb/src/shell/nonu 1993-08-19 19:46:04.000000000 +0100 -+++ noweb/src/shell/nonu 2004-09-13 13:37:22.126601696 +0100 +--- a/src/shell/nonu ++++ b/src/shell/nonu @@ -2,7 +2,7 @@ LIB=/usr/public/pkg/noweb/lib # attempt to convert nuweb to noweb using sam diff -Nru noweb-2.11b/debian/patches/04_uninstall.dpatch noweb-2.11b/debian/patches/04_uninstall.dpatch --- noweb-2.11b/debian/patches/04_uninstall.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/04_uninstall.dpatch 2020-01-21 12:31:45.000000000 +0100 @@ -1,15 +1,11 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_uninstall.dpatch by Hubert Chan <[email protected]> -## -## All lines beginning with ## DP:' are a description of the patch. -## DP: Add uninstall targets to some makefiles +Author: Hubert Chan <[email protected]> +Description: Add uninstall targets to some makefiles -@DPATCH@ ---- noweb-2.11b.orig/src/icon/Makefile -+++ noweb-2.11b/src/icon/Makefile +--- a/src/icon/Makefile ++++ b/src/icon/Makefile @@ -36,6 +36,11 @@ - cp $(BINEXECS) $(BIN) - cp $(LIBSPECIAL) $(LIB)/autodefs.c + cp $(BINEXECS) $(DESTDIR)$(BIN) + cp $(LIBSPECIAL) $(DESTDIR)$(LIB)/autodefs.c +uninstall: + for i in $(LIBEXECS); do rm -f $(LIB)/$$i; done @@ -19,11 +15,11 @@ clean: /bin/rm -f *.tex *.dvi *.aux *.log *.blg *.bbl *~ *.toc *.html *.u1 *.u2 /bin/rm -f *.[ch] *.ps *.gz ---- noweb-2.11b.orig/src/lib/Makefile -+++ noweb-2.11b/src/lib/Makefile +--- a/src/lib/Makefile ++++ b/src/lib/Makefile @@ -15,6 +15,10 @@ - sed 's@|LIBDIR|@$(LIB)@g' pipedocs > $(LIB)/pipedocs - chmod +x $(LIB)/pipedocs + sed 's@|LIBDIR|@$(LIBNAME)@g' pipedocs > $(DESTDIR)$(LIB)/pipedocs + chmod +x $(DESTDIR)$(LIB)/pipedocs +uninstall: + for i in unmarkup emptydefn toascii nwmtime h2a btdefn; do rm -f $(LIB)/$$i; done diff -Nru noweb-2.11b/debian/patches/05_security_CVE-2005-3342.dpatch noweb-2.11b/debian/patches/05_security_CVE-2005-3342.dpatch --- noweb-2.11b/debian/patches/05_security_CVE-2005-3342.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/05_security_CVE-2005-3342.dpatch 2020-01-21 12:31:45.000000000 +0100 @@ -1,14 +1,8 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05_security_CVE-2005-3342.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: remove unacceptable uses of /tmp files +Author: <[email protected]> +Description: remove unacceptable uses of /tmp files -@DPATCH@ - -diff -Nru noweb/contrib/rsc/rc/cpif.nw noweb/contrib/rsc/rc/cpif.nw ---- noweb/contrib/rsc/rc/cpif.nw 2000-03-28 01:52:18.000000000 +0200 -+++ noweb/contrib/rsc/rc/cpif.nw 2005-10-26 00:50:47.000000000 +0200 +--- a/contrib/rsc/rc/cpif.nw ++++ b/contrib/rsc/rc/cpif.nw @@ -24,7 +24,7 @@ exit usage } @@ -18,9 +12,8 @@ # trap 'rm -f $new; exit 1' 1 2 15 # clean up files -diff -Nru noweb/contrib/rsc/rc/toascii.nw noweb/contrib/rsc/rc/toascii.nw ---- noweb/contrib/rsc/rc/toascii.nw 2000-03-28 01:52:18.000000000 +0200 -+++ noweb/contrib/rsc/rc/toascii.nw 2005-10-26 00:51:38.000000000 +0200 +--- a/contrib/rsc/rc/toascii.nw ++++ b/contrib/rsc/rc/toascii.nw @@ -38,9 +38,9 @@ Also arranged here is a temporary file for storage of the awk program on an ugly system, as discussed below. @@ -34,9 +27,8 @@ @ %def textfile tagsfile awkfile The actual formatting of the text, code, and index entries is done by various unix text processing commands in pipelines. There are four formatting pipes: -diff -Nru noweb/src/lib/h2a noweb/src/lib/h2a ---- noweb/src/lib/h2a 1999-09-16 22:07:47.000000000 +0200 -+++ noweb/src/lib/h2a 2005-10-26 00:42:09.000000000 +0200 +--- a/src/lib/h2a ++++ b/src/lib/h2a @@ -6,7 +6,7 @@ -[0-9]*) opts="$opts -width=`expr 0 - $1`" ; shift ;; esac @@ -46,9 +38,8 @@ trap 'rm -f $html; exit 1' 1 2 15 # clean up files awk ' -diff -Nru noweb/src/shell/roff.mm noweb/src/shell/roff.mm ---- noweb/src/shell/roff.mm 1998-08-18 21:33:04.000000000 +0200 -+++ noweb/src/shell/roff.mm 2005-10-26 00:45:11.000000000 +0200 +--- a/src/shell/roff.mm ++++ b/src/shell/roff.mm @@ -214,7 +214,7 @@ .ADDLIST 1a .PRINTLIST @@ -77,9 +68,8 @@ fi cat "$@") | ($ROFF $opts 2>$tagsfile) -diff -Nru noweb/src/shell/roff.nw noweb/src/shell/roff.nw ---- noweb/src/shell/roff.nw 1998-08-17 02:27:09.000000000 +0200 -+++ noweb/src/shell/roff.nw 2005-10-26 00:46:47.000000000 +0200 +--- a/src/shell/roff.nw ++++ b/src/shell/roff.nw @@ -80,7 +80,8 @@ other, and quoting each quote is ugly. The pragmatic solution is to copy the awk program into a temporary file, using a shell here-document. diff -Nru noweb-2.11b/debian/patches/06_roff_output.dpatch noweb-2.11b/debian/patches/06_roff_output.dpatch --- noweb-2.11b/debian/patches/06_roff_output.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/06_roff_output.dpatch 2020-01-21 12:31:45.000000000 +0100 @@ -1,18 +1,10 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 06_roff_output.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: fix temp things in code generated from roff.nw -## DP: (needed to be moved *after* security update to source) +Author: <[email protected]> +Description: fix temp things in code generated from roff.nw + Needed to be moved *after* security update to source. -@DPATCH@ - -diff -ur noweb/src/shell/noroff noweb/src/shell/noroff ---- noweb/src/shell/noroff 2004-09-13 13:45:46.601909792 +0100 -+++ noweb/src/shell/noroff 2004-09-13 13:42:23.458792240 +0100 -@@ -35,9 +35,10 @@ - - base="`basename $1 | sed '/\./s/\.[^.]*$//'`" +--- a/src/shell/noroff ++++ b/src/shell/noroff +@@ -37,7 +37,8 @@ tagsfile="$base.nwt" (echo ".so $macrodir/tmac.w" if [ -r "$tagsfile" ]; then @@ -22,7 +14,7 @@ $AWK '{ if (sub(/^###TAG### / , "")) tags[$1] = $2 else if (sub(/^###BEGINCHUNKS###/, "")) printf ".de CLIST\n.CLISTBEGIN\n" -@@ -88,8 +93,8 @@ +@@ -88,8 +89,8 @@ # print str3 # print convquote(str3) # } @@ -33,9 +25,8 @@ fi cat "$@") | ($ROFF $opts 2>$tagsfile) -diff -ur noweb/src/shell/toroff noweb/src/shell/toroff ---- noweb/src/shell/toroff 2002-07-17 23:50:08.000000000 +0100 -+++ noweb/src/shell/toroff 2004-09-13 13:42:49.214876720 +0100 +--- a/src/shell/toroff ++++ b/src/shell/toroff @@ -9,7 +9,8 @@ exit 1;; esac diff -Nru noweb-2.11b/debian/patches/08_tmac_dir.dpatch noweb-2.11b/debian/patches/08_tmac_dir.dpatch --- noweb-2.11b/debian/patches/08_tmac_dir.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/08_tmac_dir.dpatch 2020-01-21 12:31:45.000000000 +0100 @@ -1,12 +1,8 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 08_tmac_dir.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: look for noweb's troff macros in the correct directory +Author: <[email protected]> +Description: look for noweb'ss troff macros in the correct directory -@DPATCH@ ---- noweb/src/shell/noroff 2006-06-12 18:38:15.000000000 -0400 -+++ noweb/src/shell/noroff 2006-06-12 18:52:50.352582000 -0400 +--- a/src/shell/noroff ++++ b/src/shell/noroff @@ -4,7 +4,7 @@ ROFF="groff" @@ -25,9 +21,9 @@ if [ -r "$tagsfile" ]; then tagstemp=$(tempfile -p tags) || { echo "$0: Cannot create temporary file" >&2; exit 1; } cp $tagsfile $tagstemp ---- noweb/src/shell/roff.nw 2006-06-12 18:38:15.000000000 -0400 -+++ noweb/src/shell/roff.nw 2006-06-12 18:52:50.352582000 -0400 -@@ -631,7 +631,7 @@ +--- a/src/shell/roff.nw ++++ b/src/shell/roff.nw +@@ -632,7 +632,7 @@ ROFF="groff" AWK=nawk @@ -36,7 +32,7 @@ opts= -@@ -662,7 +662,7 @@ +@@ -663,7 +663,7 @@ base="`basename $1 | sed '/\./s/\.[^.]*$//'`" tagsfile="$base.nwt" diff -Nru noweb-2.11b/debian/patches/09_awk.dpatch noweb-2.11b/debian/patches/09_awk.dpatch --- noweb-2.11b/debian/patches/09_awk.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/09_awk.dpatch 2020-01-21 12:31:45.000000000 +0100 @@ -1,15 +1,12 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 09_awk.dpatch by <[email protected]> based on patch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: support gawk +Author: <[email protected]> +Author: <[email protected]> +Description: support gawk -@DPATCH@ ---- noweb-2.11b.orig/src/awkname -+++ noweb-2.11b/src/awkname +--- a/src/awkname ++++ b/src/awkname @@ -7,12 +7,13 @@ rc=0 - new=/tmp/$$.new; old=/tmp/$$.old + new=$(tempfile -p new); old=$(tempfile -p old) -for file in lib/emptydefn lib/unmarkup lib/toascii lib/btdefn \ +for file in ../examples/sharpline \ @@ -24,8 +21,8 @@ cp $file $old # save original file trap 'trap "" 1 2 15; cp $old $file # ignore signals rm -f $new $old; exit 1' 1 2 15 # during restore ---- noweb-2.11b.orig/src/xdoc/manpage.nw -+++ noweb-2.11b/src/xdoc/manpage.nw +--- a/src/xdoc/manpage.nw ++++ b/src/xdoc/manpage.nw @@ -358,9 +358,7 @@ \".PP \".I noweb @@ -48,34 +45,8 @@ DEC .I nawk has a bug in that that causes problems with braces in ---- noweb-2.11b.orig/src/xdoc/notangle.txt -+++ noweb-2.11b/src/xdoc/notangle.txt -@@ -332,8 +332,6 @@ - - - -- -- - The _-_L option of _n_o_t_a_n_g_l_e puts an implicit initial newline in the for- - mat string. - ---- noweb-2.11b.orig/src/xdoc/noweb.txt -+++ noweb-2.11b/src/xdoc/noweb.txt -@@ -93,9 +93,9 @@ - and use _n_o_w_e_a_v_e and _n_o_t_a_n_g_l_e instead. If the design were better, we - could all use the same commands. - -- _n_o_w_e_b requires the new version of _a_w_k, assumed to be called _n_a_w_k. DEC -- _n_a_w_k has a bug in that that causes problems with braces in _T_e_X output. -- GNU _g_a_w_k is reported to work. -+ _n_o_w_e_b requires the new version of _a_w_k. DEC _n_a_w_k has a bug in that that -+ causes problems with braces in _T_e_X output. GNU _g_a_w_k is reported to -+ work. - - The default _L_a_T_e_X pagestyles don't set the width of the boxes contain- - ing headers and footers. Since _n_o_w_e_b code paragraphs are extra wide, ---- noweb-2.11b.orig/src/xdoc/notangle.1 -+++ noweb-2.11b/src/xdoc/notangle.1 +--- a/src/xdoc/notangle.1 ++++ b/src/xdoc/notangle.1 @@ -584,9 +584,7 @@ \".PP \".I noweb @@ -87,8 +58,19 @@ \"DEC \".I nawk \"has a bug in that that causes ---- noweb-2.11b.orig/src/xdoc/noweb.1 -+++ noweb-2.11b/src/xdoc/noweb.1 +--- a/src/xdoc/notangle.txt ++++ b/src/xdoc/notangle.txt +@@ -332,8 +332,6 @@ + + + +- +- + The _-_L option of _n_o_t_a_n_g_l_e puts an implicit initial newline in the for- + mat string. + +--- a/src/xdoc/noweb.1 ++++ b/src/xdoc/noweb.1 @@ -169,9 +169,7 @@ .PP .I noweb @@ -100,3 +82,18 @@ DEC .I nawk has a bug in that that causes problems with braces in +--- a/src/xdoc/noweb.txt ++++ b/src/xdoc/noweb.txt +@@ -93,9 +93,9 @@ + and use _n_o_w_e_a_v_e and _n_o_t_a_n_g_l_e instead. If the design were better, we + could all use the same commands. + +- _n_o_w_e_b requires the new version of _a_w_k, assumed to be called _n_a_w_k. DEC +- _n_a_w_k has a bug in that that causes problems with braces in _T_e_X output. +- GNU _g_a_w_k is reported to work. ++ _n_o_w_e_b requires the new version of _a_w_k. DEC _n_a_w_k has a bug in that that ++ causes problems with braces in _T_e_X output. GNU _g_a_w_k is reported to ++ work. + + The default _L_a_T_e_X pagestyles don't set the width of the boxes contain- + ing headers and footers. Since _n_o_w_e_b code paragraphs are extra wide, diff -Nru noweb-2.11b/debian/patches/10_vmargin.dpatch noweb-2.11b/debian/patches/10_vmargin.dpatch --- noweb-2.11b/debian/patches/10_vmargin.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/10_vmargin.dpatch 2020-01-21 12:31:45.000000000 +0100 @@ -1,13 +1,9 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_vmargin.dpatch by Hubert Chan <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: use vmargin instead of (obsolete) vpage +Author: Hubert Chan <[email protected]> +Description: use vmargin instead of (obsolete) vpage -@DPATCH@ ---- noweb-2.11b.orig/src/xdoc/onepage.tex -+++ noweb-2.11b/src/xdoc/onepage.tex -@@ -0,7 +0,7 @@ +--- a/src/xdoc/onepage.tex ++++ b/src/xdoc/onepage.tex +@@ -1,7 +1,7 @@ \documentclass{article} \usepackage{alltt,multicol,array,tabularx} \pagestyle{empty} diff -Nru noweb-2.11b/debian/patches/11_german.dpatch noweb-2.11b/debian/patches/11_german.dpatch --- noweb-2.11b/debian/patches/11_german.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/11_german.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_vmargin.dpatch by Hubert Chan <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: use vmargin instead of (obsolete) vpage - -@DPATCH@ ---- noweb-2.11b.orig/src/tex/noweb.sty -+++ noweb-2.11b/src/tex/noweb.sty -@@ -900,7 +900,7 @@ - % This code is used - \def\@nwlangdeprtc{Hauptteil (nicht in diesem Dokument benutzt)}% - % Root chunk (not used in this document) -- \def\@nwlangdepcwf{Dieser Code schreibt man zum File}% -+ \def\@nwlangdepcwf{Dieser Code schreibt man zum File}% - % This code is written to file - \def\@nwlangdepchk{Teil}% - % chunk ---- noweb-2.11b.orig/src/tex/support.nw -+++ noweb-2.11b/src/tex/support.nw -@@ -1716,7 +1716,7 @@ - % This code is used - \def\@nwlangdeprtc{Hauptteil (nicht in diesem Dokument benutzt)}% - % Root chunk (not used in this document) -- \def\@nwlangdepcwf{Dieser Code schreibt man zum File}% -+ \def\@nwlangdepcwf{Dieser Code schreibt man zum File}% - % This code is written to file - \def\@nwlangdepchk{Teil}% - % chunk diff -Nru noweb-2.11b/debian/patches/12_nostrip.dpatch noweb-2.11b/debian/patches/12_nostrip.dpatch --- noweb-2.11b/debian/patches/12_nostrip.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/12_nostrip.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 12_nostrip.dpatch by Hubert Chathi <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Don't strip binaries. This is done by dh_strip. - -@DPATCH@ -diff -urNad noweb~/src/Makefile noweb/src/Makefile ---- noweb~/src/Makefile 2008-04-19 22:24:14.000000000 -0400 -+++ noweb/src/Makefile 2008-06-11 12:46:32.000000000 -0400 -@@ -99,7 +99,7 @@ - - install-code: install-shell - -mkdir $(BIN) $(LIB) 2>/dev/null -- strip c/nt c/markup c/mnt c/finduses -+ #strip c/nt c/markup c/mnt c/finduses - cp c/nt c/markup c/mnt c/finduses $(LIB) - cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install - cd lib; make LIB=$(LIB) install -diff -urNad noweb~/src/Makefile.nw noweb/src/Makefile.nw ---- noweb~/src/Makefile.nw 2008-04-19 22:24:10.000000000 -0400 -+++ noweb/src/Makefile.nw 2008-06-11 12:46:12.000000000 -0400 -@@ -73,7 +73,7 @@ - - install-code: install-shell - -mkdir $(BIN) $(LIB) 2>/dev/null -- strip c/nt c/markup c/mnt c/finduses -+ #strip c/nt c/markup c/mnt c/finduses - cp c/nt c/markup c/mnt c/finduses $(LIB) - cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install - cd lib; make LIB=$(LIB) install diff -Nru noweb-2.11b/debian/patches/13_bashism.dpatch noweb-2.11b/debian/patches/13_bashism.dpatch --- noweb-2.11b/debian/patches/13_bashism.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/13_bashism.dpatch 2020-01-21 12:31:45.000000000 +0100 @@ -1,13 +1,9 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 13_bashism.dpatch by Hubert Chathi <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix unportable backslash in call to echo. (Closes: #486052) +Author: Hubert Chathi <[email protected]> +Description Fix unportable backslash in call to echo. +Bug-Debian: https://bugs.debian.org/486052 -@DPATCH@ -diff -urNad noweb~/src/shell/noweave noweb/src/shell/noweave ---- noweb~/src/shell/noweave 2008-04-19 22:24:10.000000000 -0400 -+++ noweb/src/shell/noweave 2008-06-16 13:14:32.000000000 -0400 +--- a/src/shell/noweave ++++ b/src/shell/noweave @@ -100,7 +100,7 @@ echo " or perform other functions." 1>&2 echo "-autodefs lang Source is in language 'lang'; find definitions automatically." 1>&2 @@ -17,9 +13,8 @@ echo "-delay Delay markup until after first documentation chunk." 1>&2 echo "-tk Expand tab stops every k columns" 1>&2 echo "-t Copy tabs to the output" 1>&2 -diff -urNad noweb~/src/shell/noweave.nw noweb/src/shell/noweave.nw ---- noweb~/src/shell/noweave.nw 2008-04-19 22:24:10.000000000 -0400 -+++ noweb/src/shell/noweave.nw 2008-06-16 13:13:38.000000000 -0400 +--- a/src/shell/noweave.nw ++++ b/src/shell/noweave.nw @@ -347,7 +347,7 @@ if [ "X$newopt" = "Xlongxref" ]; then shortxref="-longxref"; fi <<add [[$newopt]] to [[noweboptions]]>> ;; diff -Nru noweb-2.11b/debian/patches/14_nountangle_filters.dpatch noweb-2.11b/debian/patches/14_nountangle_filters.dpatch --- noweb-2.11b/debian/patches/14_nountangle_filters.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/14_nountangle_filters.dpatch 2020-01-21 12:31:45.000000000 +0100 @@ -1,14 +1,10 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 14_nountangle_filters.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Allow nountangle to accept multiple -filter options. (Closes: #537668) -## DP: - thanks to Anon Sricharoenchai for the patch +Author: <[email protected]> +Author: Anon Sricharoenchai +Description: Allow nountangle to accept multiple -filter options. +Bug-Debian: https://bugs.debian.org/537668 -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' noweb~/src/shell/nountangle noweb/src/shell/nountangle ---- noweb~/src/shell/nountangle 2014-09-12 10:51:45.006473200 -0400 -+++ noweb/src/shell/nountangle 2014-09-12 10:52:11.346877933 -0400 +--- a/src/shell/nountangle ++++ b/src/shell/nountangle @@ -22,7 +22,7 @@ -tex) format='%%%% %%-%ds' ; subst=' ' ;; -L*) ;; # deliberately ignore requests for #line diff -Nru noweb-2.11b/debian/patches/99_touch.dpatch noweb-2.11b/debian/patches/99_touch.dpatch --- noweb-2.11b/debian/patches/99_touch.dpatch 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/patches/99_touch.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -#! /bin/sh -## 99_touch.dpatch by <[email protected]>, <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: update timestamp to avoid needing noweb to build noweb - -# earlier patches hit the noweb file from which these files are derived; -# by touching them, we make it possible to build noweb without already -# having noweb - -case $1 in - -patch) - sleep 1 # so that we have at least a second difference in timestaps - for x in src/shell/tmac.w \ - src/shell/noweave \ - src/shell/noroff \ - src/shell/toroff \ - src/xdoc/notangle.1 \ - src/xdoc/nowebstyle.7 \ - src/xdoc/noweb.1 \ - src/xdoc/cpif.1 \ - src/xdoc/nuweb2noweb.1 \ - src/tex/noweb.sty \ - src/tex/nwmac.tex \ - src/Makefile; do - touch $x; - done - ;; -esac diff -Nru noweb-2.11b/debian/patches/buildflags.diff noweb-2.11b/debian/patches/buildflags.diff --- noweb-2.11b/debian/patches/buildflags.diff 1970-01-01 01:00:00.000000000 +0100 +++ noweb-2.11b/debian/patches/buildflags.diff 2020-01-21 12:31:45.000000000 +0100 @@ -0,0 +1,54 @@ +Description: let Make use CPPFLAGS and LDFLAGS if set + They are detected in the environment and on the command line. +Author: Nicolas Boulenguez <[email protected]> + +--- a/contrib/norman/numarkup/Makefile ++++ b/contrib/norman/numarkup/Makefile +@@ -27,7 +27,7 @@ + $(OBJS): global.h + + $(TARGET): $(OBJS) +- $(CC) -o $(TARGET) $(OBJS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) -o $(TARGET) $(LDFLAGS) $(OBJS) + + numarkup.html: numarkup.nw + noweave -filter l2h -html -index numarkup.nw > numarkup.html +--- a/src/c/Makefile ++++ b/src/c/Makefile +@@ -35,22 +35,22 @@ + .nw.tex: ; noweave $*.nw >$*.tex + .nw.c: ; $(NOTANGLE) -L $*.nw >$*.c + .nw.o: ; $(NOTANGLE) -L $*.nw >$*.c +- $(CC) $(CFLAGS) -c $*.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c + .nw.h: ; $(NOTANGLE) -Rheader $*.nw $(CPIF) $*.h + + all: nt markup mnt finduses + + nt: $(TANGLEOBJS) +- $(CC) $(CFLAGS) -o nt $(TANGLEOBJS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) -o nt $(LDFLAGS) $(TANGLEOBJS) + + finduses: $(FINDUSESOBJS) +- $(CC) $(CFLAGS) -o finduses $(FINDUSESOBJS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) -o finduses $(LDFLAGS) $(FINDUSESOBJS) + + markup: $(MARKUPOBJS) +- $(CC) $(CFLAGS) -o markup $(MARKUPOBJS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) -o markup $(LDFLAGS) $(MARKUPOBJS) + + mnt: $(MNTOBJS) +- $(CC) $(CFLAGS) -o mnt $(MNTOBJS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) -o mnt $(LDFLAGS) $(MNTOBJS) + + source: $(SRCS) + touch: $(SRCS) +@@ -86,7 +86,7 @@ + fakepretty.o: pretty.h + + fakepretty: $(FPOBJS) +- $(CC) $(CFLAGS) -o fakepretty $(FPOBJS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) -o fakepretty $(LDFLAGS) $(FPOBJS) + + + columns.o: columns.h diff -Nru noweb-2.11b/debian/patches/clean.diff noweb-2.11b/debian/patches/clean.diff --- noweb-2.11b/debian/patches/clean.diff 1970-01-01 01:00:00.000000000 +0100 +++ noweb-2.11b/debian/patches/clean.diff 2020-01-21 12:31:45.000000000 +0100 @@ -0,0 +1,14 @@ +Description: clean forgotten files +Author: Nicolas Boulenguez <[email protected]> + +--- a/src/xdoc/Makefile ++++ b/src/xdoc/Makefile +@@ -102,7 +102,7 @@ + guide.html: guide.dvi + sl2h guide.tex | htmltoc > guide.html + +-clean: ; /bin/rm -f *.dvi *.log *.blg *~ wc.tex *.ps *.gz *.uu *.html ++clean: ; /bin/rm -f *.dvi *.log *.blg *~ wc.tex *.ps *.gz *.uu *.html *.aux *.lot *.toc + clobber: clean + rm -f *.1 *.7 *.txt + diff -Nru noweb-2.11b/debian/patches/recursive-make-special-variable.diff noweb-2.11b/debian/patches/recursive-make-special-variable.diff --- noweb-2.11b/debian/patches/recursive-make-special-variable.diff 1970-01-01 01:00:00.000000000 +0100 +++ noweb-2.11b/debian/patches/recursive-make-special-variable.diff 2020-01-21 12:31:45.000000000 +0100 @@ -0,0 +1,132 @@ +Description: pass settings to recursive Makes via the MAKE special variable + For example, the counter for '-jN' is global, + and assignments like CFLAGS=-g is passed to subprocesses. +Author: Nicolas Boulenguez <[email protected]> + +--- a/Makefile ++++ b/Makefile +@@ -9,14 +9,14 @@ + CINAME=-Nv`echo $(VERSION) | tr . _` + CIMSG=-f -m'standard checkin preparing to export version $(VERSION)' + +-source: ; for i in src; do (cd $$i; make source); done +-www: ; for i in src/xdoc examples; do (cd $$i; make www); done ++source: ; $(MAKE) -C src $@ ++www: ; for i in src/xdoc examples; do $(MAKE) -C $$i $@; done + + clean: +- for i in src examples contrib; do (cd $$i; make clean); done ++ for i in src examples contrib; do $(MAKE) -C $$i $@; done + rm -f nwsrcfilter *~ */*~ + clobber: clean +- for i in src examples contrib; do (cd $$i; make clobber); done ++ for i in src examples contrib; do $(MAKE) -C $$i $@; done + + DATE: + (./echo -n "Version $(VERSION) of "; date) > DATE +@@ -51,6 +51,6 @@ + diff src/elisp/noweb-mode.el $(HOME)/emacs/noweb-mode.el + + checkin: +- (cd src; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin) ++ $(MAKE) -C src "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" $@ + + +--- a/contrib/Makefile ++++ b/contrib/Makefile +@@ -5,9 +5,9 @@ + + # don't do kostas; it requires gnu make (ugh) + +-all: ; for i in $(DIRS); do (cd $$i; make ICONC=$(ICONC) all); done +-install: ; for i in $(DIRS); do (cd $$i; make LIB=$(LIB) BIN=$(BIN) install); done +-source: ; for i in $(DIRS); do (cd $$i; make source); done +-clean: ; for i in $(DIRS); do (cd $$i; make clean); done ++all: ; for i in $(DIRS); do $(MAKE) -C $$i ICONC=$(ICONC) $@; done ++install: ; for i in $(DIRS); do $(MAKE) -C $$i LIB=$(LIB) BIN=$(BIN) $@; done ++source: ; for i in $(DIRS); do $(MAKE) -C $$i $@; done ++clean: ; for i in $(DIRS); do $(MAKE) -C $$i $@; done + clobber: clean + +--- a/contrib/norman/Makefile ++++ b/contrib/norman/Makefile +@@ -1,10 +1,10 @@ + LIB=/dev/null # to be overridden + DIRS=numarkup + +-all: ; for i in $(DIRS); do (cd $$i; make ICONC=$(ICONC) ICONT=$(ICONT) all); done +-install: ; for i in $(DIRS); do (cd $$i; make LIB=$(LIB) BIN=$(BIN) install); done +-source: ; for i in $(DIRS); do (cd $$i; make source); done +-clean: ; for i in $(DIRS); do (cd $$i; make clean); done ++all: ; for i in $(DIRS); do $(MAKE) -C $$i ICONC=$(ICONC) ICONT=$(ICONT) $@; done ++install: ; for i in $(DIRS); do $(MAKE) -C $$i LIB=$(LIB) BIN=$(BIN) $@; done ++source: ; for i in $(DIRS); do $(MAKE) -C $$i $@; done ++clean: ; for i in $(DIRS); do $(MAKE) -C $$i $@; done + iconlib: # cheap hack for slackmake + true + +--- a/src/Makefile ++++ b/src/Makefile +@@ -45,9 +45,9 @@ + TEXNAME=$(TEXINPUTS) + + all: +- cd c; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" all +- for i in shell lib xdoc tex; do (cd $$i; make all); done +- cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all ++ $(MAKE) -C c "CC=$(CC)" "CFLAGS=$(CFLAGS)" $@ ++ for i in shell lib xdoc tex; do $(MAKE) -C $$i $@; done ++ $(MAKE) -C $(LIBSRC) "ICONT=$(ICONT)" "ICONC=$(ICONC)" $@ + + FAQ: FAQ.html + sleep 1; html2ascii FAQ.html > FAQ +@@ -104,13 +104,13 @@ + install-code: install-shell + mkdir -p $(DESTDIR)$(BIN) $(DESTDIR)$(LIB) + $(INSTALL_PROGRAM) -s c/nt c/markup c/mnt c/finduses $(DESTDIR)$(LIB) +- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install +- cd lib; make LIB=$(LIB) install ++ $(MAKE) -C $(LIBSRC) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install ++ $(MAKE) -C lib LIB=$(LIB) install + + uninstall-code: uninstall-shell + rm $(LIB)/nt $(LIB)/markup $(LIB)/mnt $(LIB)/finduses +- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall +- cd lib; make LIB=$(LIB) uninstall ++ $(MAKE) -C $(LIBSRC) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall ++ $(MAKE) -C lib LIB=$(LIB) uninstall + install-man: + mkdir -p $(DESTDIR)$(MAN) $(DESTDIR)$(MANDIR) $(DESTDIR)$(MAN7DIR) + sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(DESTDIR)$(MANDIR)/cpif.$(MANEXT) +@@ -191,24 +191,25 @@ + uninstall-elisp: + rm -f $(ELISP)/noweb-mode.el + checkin: +- for i in lib tex xdoc; do (cd $$i; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done ++ for i in lib tex xdoc; do $(MAKE) -C $$i "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" $@; done + for i in c icon awk; do (cd $$i; ci -l $(CINAME) $(CIMSG) *.nw Makefile); done + (cd elisp; ci -l $(CINAME) $(CIMSG) *.el) + ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw + + source: FAQ +- for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done ++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i CPIF=">" $@; done + sleep 1 +- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done ++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i touch; done ++ + touch: + touch FAQ +- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done ++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i $@; done + clean: +- for i in c shell lib xdoc icon awk tex; do (cd $$i; make clean); done ++ for i in c shell lib xdoc icon awk tex; do $(MAKE) -C $$i $@; done + rm -f nwsrcfilter *~ */*~ + + clobber: clean +- for i in c lib icon awk xdoc; do (cd $$i; make clobber); done ++ for i in c lib icon awk xdoc; do $(MAKE) $@ -C $$i; done + + Makefile: Makefile.nw + chmod +w Makefile diff -Nru noweb-2.11b/debian/patches/series noweb-2.11b/debian/patches/series --- noweb-2.11b/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ noweb-2.11b/debian/patches/series 2020-01-21 12:31:45.000000000 +0100 @@ -0,0 +1,13 @@ +01_debian.dpatch +02_tmp_fix.dpatch +04_uninstall.dpatch +05_security_CVE-2005-3342.dpatch +06_roff_output.dpatch +08_tmac_dir.dpatch +09_awk.dpatch +10_vmargin.dpatch +13_bashism.dpatch +14_nountangle_filters.dpatch +buildflags.diff +recursive-make-special-variable.diff +clean.diff diff -Nru noweb-2.11b/debian/rules noweb-2.11b/debian/rules --- noweb-2.11b/debian/rules 2020-01-21 13:22:13.000000000 +0100 +++ noweb-2.11b/debian/rules 2020-01-21 12:31:45.000000000 +0100 @@ -1,161 +1,89 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. +# Sample debian/rules that uses debhelper. # GNU copyright 1997 by Joey Hess. # # Modified to use dbs by Federico Di Gregorio. # Modified to change from dbs to dpatch by Norman Ramsey -package := noweb -version := 2.11a +DEB_BUILD_MAINT_OPTIONS := hardening=+all +DEB_CFLAGS_MAINT_APPEND := -Wall +include /usr/share/dpkg/buildflags.mk ICONC=icont -CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS) -INSTALL = install -INSTALL_DATA := $(INSTALL) -m644 -INSTALL_DIR := $(INSTALL) -p -d -o root -g root -m 755 -INSTALL_FILE := $(INSTALL) -p -o root -g root -m 644 -INSTALL_PROGRAM := $(INSTALL) -m755 -INSTALL_SCRIPT := $(INSTALL) -p -o root -g root -m 755 -DPATCH_DIR = /usr/share/dpatch - -destdir := $(CURDIR)/debian/noweb - -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - MAKE_OPTIONS = LIBSRC=icon ICONC="${ICONC}" CFLAGS="${CFLAGS}"\ - BIN=$(1)/usr/bin LIB=$(1)/usr/lib/noweb \ - LIBNAME=/usr/lib/noweb MAN=$(1)/usr/share/man \ - ELISP=$(1)/usr/share/emacs/site-lisp \ - TEXINPUTS=$(1)/usr/share/texmf/tex/plain/misc \ - TEXNAME=/usr/share/texmf/tex/plain/misc - - -# the dbs rules -DEB_SOURCE_PACKAGE := noweb -include $(DPATCH_DIR)/dpatch.make - -# Some vars needed for clean building the package - -DEBIAN_ROOT := $(CURDIR)/debian/$(package) - + CPPFLAGS='$(CPPFLAGS)' \ + LDFLAGS='$(LDFLAGS)' \ + BIN=/usr/bin LIB=/usr/lib/noweb \ + MAN=/usr/share/man \ + ELISP=/usr/share/emacs/site-lisp \ + TEXINPUTS=/usr/share/texmf/tex/plain/misc -# Make rules +%: + dh $@ --sourcedirectory=src --with=tex -configure: patch patch-awk - -# eventually drop this -BUILD_TREE := $(CURDIR) - -patch-awk: patch-awk-stamp patch-awk-stamp: - cd $(BUILD_TREE)/src && ./awkname awk + cd src && ./awkname awk touch patch-awk-stamp -unpatch-awk: - cd $(BUILD_TREE)/src && ./awkname nawk +# Authors: <[email protected]>, <[email protected]> +# Update timestamp to avoid needing noweb to build noweb + +# earlier patches hit the noweb file from which these files are derived; +# by touching them, we make it possible to build noweb without already +# having noweb. + sleep 1 # so that we have at least a second difference in timestamps + touch \ + src/shell/tmac.w \ + src/shell/noweave \ + src/shell/noroff \ + src/shell/toroff \ + src/xdoc/notangle.1 \ + src/xdoc/nowebstyle.7 \ + src/xdoc/noweb.1 \ + src/xdoc/cpif.1 \ + src/xdoc/nuweb2noweb.1 \ + src/tex/noweb.sty \ + src/tex/nwmac.tex \ + src/Makefile + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: + dh_auto_clean + if test -r patch-awk-stamp; then \ + cd src && ./awkname nawk; \ + fi rm -f patch-awk-stamp + rm -f contrib/norman/scopehack + find . -name "*~" -name "core" -exec rm -f "{}" + + +.PHONY: override_dh_auto_build +override_dh_auto_build: patch-awk-stamp + dh_auto_build -- $(MAKE_OPTIONS) + cd contrib/norman && $(ICONC) scopehack -build-arch: build-arch-stamp -build-arch-stamp: configure - dh_testdir - cd $(BUILD_TREE)/src && \ - $(MAKE) $(call MAKE_OPTIONS,) - cd $(BUILD_TREE)/contrib/norman && $(ICONC) scopehack - touch build-arch-stamp - -build-indep: build-indep-stamp -build-indep-stamp: build-arch-stamp - dh_testdir - cd $(BUILD_TREE)/src/xdoc && latex guide.tex && \ +ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) + cd src/xdoc && latex guide.tex && \ while grep -s 'Rerun to get cross-references right' guide.log; \ do latex guide.tex; done && \ dvips guide.dvi -o guide.ps - cd $(BUILD_TREE)/src/xdoc && latex onepage.tex && \ + cd src/xdoc && latex onepage.tex && \ while grep -s 'Rerun to get cross-references right' onepage.log; \ do latex onepage.tex; done && \ dvips onepage.dvi -o onepage.ps - cd $(BUILD_TREE)/src/xdoc && ../icon/sl2h guide.tex | \ + cd src/xdoc && ../icon/sl2h guide.tex | \ ../icon/htmltoc >guide.html - touch build-indep-stamp - -build: build-arch build-indep +endif -clean: clean-patched unpatch-awk unpatch -clean-patched: - dh_testdir - dh_testroot - rm -fr build-*-stamp - -cd $(BUILD_TREE)/src && $(MAKE) clean - -rm -f $(BUILD_TREE)/contrib/norman/scopehack - -find . -name "*~" -name "core" -exec rm -f "{}" + - -rm -rf debian/files* debian/substvars debian/noweb - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - cd $(BUILD_TREE)/src && \ - $(MAKE) install $(call MAKE_OPTIONS,$(destdir)) - $(INSTALL) $(BUILD_TREE)/contrib/norman/scopehack $(destdir)/usr/lib/noweb - - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installdocs -i - dh_installchangelogs -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installdocs -a $(BUILD_TREE)/src/README $(BUILD_TREE)/src/FAQ \ - $(BUILD_TREE)/src/xdoc/guide.html $(BUILD_TREE)/src/xdoc/guide.ps \ - $(BUILD_TREE)/src/xdoc/guide.dvi \ - $(BUILD_TREE)/src/xdoc/onepage.ps $(BUILD_TREE)/src/xdoc/onepage.dvi - dh_installexamples -a $(BUILD_TREE)/examples/* - dh_installemacsen -a - dh_installman -a - dh_installchangelogs -a - dh_link -a /usr/share/man/man1/notangle.1 \ - /usr/share/man/man1/noweave.1 \ - /usr/share/man/man1/notangle.1 \ - /usr/share/man/man1/nountangle.1 +.PHONY: override_dh_installexamples +override_dh_installexamples: # removes because is in standard tetex (and other not-needed files) - rm debian/noweb/usr/share/doc/noweb/examples/multicol.sty - rm debian/noweb/usr/share/doc/noweb/examples/primes.b?? - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_installtex -a + dh_installexamples -Xmulticol.sty -Xprimes.b examples/* + +.PHONY: override_dh_auto_install +override_dh_auto_install: + dh_auto_install -- $(MAKE_OPTIONS) # gives tmac its name and move it to right directory + mkdir -p debian/noweb/usr/share/groff/tmac mv debian/noweb/usr/lib/noweb/tmac.w \ debian/noweb/usr/share/groff/tmac/noweb.tmac - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff -Nru noweb-2.11b/debian/source/format noweb-2.11b/debian/source/format --- noweb-2.11b/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ noweb-2.11b/debian/source/format 2020-01-21 12:31:45.000000000 +0100 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru noweb-2.11b/debian/watch noweb-2.11b/debian/watch --- noweb-2.11b/debian/watch 1970-01-01 01:00:00.000000000 +0100 +++ noweb-2.11b/debian/watch 2020-01-21 12:31:45.000000000 +0100 @@ -0,0 +1,7 @@ +version=4 + +opts=\ + filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/@PACKAGE@-$1\.tar\.gz/,\ + uversionmangle=s/_/./ \ + https://github.com/nrnrnr/@PACKAGE@/tags \ + .*/v?(\d\S+)\.tar\.gz
