[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#93210: marked as done (diff included closes 72489, 91110, 91375, 91384 & 90947 [PATCH])



Your message dated Mon, 16 Apr 2001 14:52:37 -0400
with message-id <E14pE73-0001xn-00@auric.debian.org>
and subject line Bug#93210: fixed in ascii 3.0-1
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Darren Benham
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 7 Apr 2001 13:03:42 +0000
>From claviola@ajato.com.br Sat Apr 07 08:03:42 2001
Return-path: <claviola@ajato.com.br>
Received: from mail.ajato.com.br [200.212.26.130] 
	by master.debian.org with smtp (Exim 3.12 1 (Debian))
	id 14lsNQ-00081Q-00; Sat, 07 Apr 2001 08:03:41 -0500
Received: from carlos (200.255.115.58) by mail.ajato.com.br (5.1.061)
        id 3ACD99CB0001A3AC; Sat, 7 Apr 2001 10:03:06 -0300
Message-ID: <3ACD99CB0001A3AC@mail.ajato.com.br> (added by postmaster@mail.ajato.com.br)
From: Carlos Laviola <claviola@ajato.com.br>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: diff included closes 72489, 91110, 91375, 91384 & 90947 [PATCH]
X-Reportbug-Version: 1.14
X-Mailer: reportbug 1.14
Date: Sat, 07 Apr 2001 10:03:02 -0300
Bcc: Carlos Laviola <claviola@ajato.com.br>
Delivered-To: submit@bugs.debian.org

Package: ascii
Version: N/A; reported 2001-04-07
Severity: normal

There you go. If you want me to, I can NMU it as soon as you authorize
me. Feel free to change anything in the patch.

*** ascii-2.6-3.0.diff
diff -urN ascii-2.6/Makefile ascii-3.0/Makefile
--- ascii-2.6/Makefile	Sat Apr  7 02:26:23 2001
+++ ascii-3.0/Makefile	Sat Apr  7 09:17:36 2001
@@ -2,12 +2,15 @@
 
 # Note: When the version changes, you also have to change
 # the RPM spec file and LSM
-V=2.6
+VERS=3.0
 
 CFLAGS = -O
 
-ascii: ascii.o 
-ascii.o: ascii.c splashscreen.h
+# Edited for the Debian GNU/Linux system.
+DESTDIR =
+
+ascii: ascii.c splashscreen.h
+	$(CC) -DREVISION=$(VERS) ascii.c -o ascii
 
 splashscreen.h: splashscreen
 	sed <splashscreen >splashscreen.h -e 's/\\/\\\\/g' -e 's/"/\\"/' -e 's/.*/P("&");/' 
@@ -15,29 +18,33 @@
 clean:
 	rm -f ascii ascii.tar* ascii.shar ascii.o splashscreen.h
 
-SOURCES = Makefile ascii.c ascii.1 ascii.lsm ascii.spec splashscreen
+install:
+	cp ascii $(DESTDIR)/usr/bin/ascii
+#	cp ascii.1 /usr/man/man1
 
-ascii-$(V).tar.gz: $(SOURCES)
-	@ls $(SOURCES) | sed s:^:ascii-$(V)/: >MANIFEST
-	@(cd ..; ln -s ascii ascii-$(V))
-	(cd ..; tar -czvf ascii/ascii-$(V).tar.gz `cat ascii/MANIFEST`)
-	@(cd ..; rm ascii-$(V))
+uninstall:
+	rm $(DESTDIR)/usr/bin/ascii
+#	rm /usr/man/man1
 
-ascii-$(V).shar:
-	shar $(SOURCES) >ascii-$(V).shar
+SOURCES = README Makefile ascii.c ascii.1 ascii.lsm ascii.spec splashscreen ascii.cgi
 
-dist: ascii-$(V).tar.gz
+ascii-$(VERS).tar.gz: $(SOURCES)
+	@ls $(SOURCES) | sed s:^:ascii-$(VERS)/: >MANIFEST
+	@(cd ..; ln -s ascii ascii-$(VERS))
+	(cd ..; tar -czvf ascii/ascii-$(VERS).tar.gz `cat ascii/MANIFEST`)
+	@(cd ..; rm ascii-$(VERS))
 
-install:
-	install -s ascii $(DESTDIR)/usr/bin
+ascii-$(VERS).shar:
+	shar $(SOURCES) >ascii-$(VERS).shar
 
+dist: ascii-$(VERS).tar.gz
 
 RPMROOT=/usr/src/redhat
 RPM = rpm
 RPMFLAGS = -ba
 rpm: dist
-	cp ascii-$(V).tar.gz $(RPMROOT)/SOURCES;
+	cp ascii-$(VERS).tar.gz $(RPMROOT)/SOURCES;
 	cp ascii.spec $(RPMROOT)/SPECS
 	cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) ascii.spec	
-	cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/ascii-$(V)*.rpm .
-	cp $(RPMROOT)/SRPMS/ascii-$(V)*.src.rpm .
+	cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/ascii-$(VERS)*.rpm .
+	cp $(RPMROOT)/SRPMS/ascii-$(VERS)*.src.rpm .
diff -urN ascii-2.6/README ascii-3.0/README
--- ascii-2.6/README	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/README	Thu Jul 27 19:49:35 2000
@@ -0,0 +1,14 @@
+				ascii
+
+This is a handy little utility that recognizes many different ways of
+naming an ASCII character (hex, octal, binary, decimal, C escape, ISO
+character table pair, slang names, and others) and prints out all the
+equivalents.  A CGI script that can be used to enable access over the
+Web is included.
+
+The latest sources for this utility live at 
+
+	http://www.tuxedo.org/~esr/ascii/
+
+							Eric S. Raymond
+							esr@thyrsus.com
Binary files ascii-2.6/ascii and ascii-3.0/ascii differ
diff -urN ascii-2.6/ascii.1 ascii-3.0/ascii.1
--- ascii-2.6/ascii.1	Sun Jun 13 10:29:16 1999
+++ ascii-3.0/ascii.1	Thu Jul 27 19:41:14 2000
@@ -54,6 +54,9 @@
 Its ISO/ECMA code table reference.
 .TP 3
 *
+Its name as an HTML/SGML entity.
+.TP 3
+*
 Slang and other names in wide use for it among hackers.
 .P
 This utility accepts command-line strings and tries to interpret them as
@@ -124,10 +127,12 @@
 An official ASCII or slang name.
 .P
 The slang names recognized and printed out are from a rather comprehensive
-list that appeared on USENET in early 1990.
+list that first appeared on USENET in early 1990 and has been
+continuously updated since.
 Mnemonics recognized and printed include the official ASCII set,
 some official ISO names (where those differ)
 and a few common-use alternatives (such as NL for LF).
+HTML/SGML entity names are also printed when applicable.
 All comparisons are
 case-insensitive, and dashes are mapped to spaces.
 Any unrecognized arguments or out of range values are silently ignored.
@@ -153,3 +158,5 @@
 man page.
 David N. Welton <davidw@efn.org> added the -s option.
 Matej Vela corrected the ISO names.
+Dave Capella contributed the idea of listing HTML/SGML entities.
+
diff -urN ascii-2.6/ascii.c ascii-3.0/ascii.c
--- ascii-2.6/ascii.c	Wed Jun 16 21:08:10 1999
+++ ascii-3.0/ascii.c	Thu Jul 27 19:41:42 2000
@@ -11,7 +11,9 @@
  *      v2.3 November 1997  -- incorporated Colin Plumb's splash-screen idea.
  *	v2.4 December 1998  -- additions by Brian Ginsbach.
  *	v2.5 December 1998  -- -s option by David N. Welton.
- *      v2.6 June 1999      -- bug fixes by M.R. van Schouwen.
+ *	v2.6 June 1999      -- bug fixes by M.R. van Schouwen.
+ *	v2.7 October 1999   -- minor packaging and option changes.
+ *	v3.0 July 2000	    -- added HTML/SGML entity sames
  *
  * Tries to interpret arguments as names or aliases of ascii characters
  * and dumps out *all* the aliases of each. Accepts literal characters,
@@ -27,9 +29,6 @@
  * your improvements, please.
  */
 
-
-#define REVISION "$Revision: 1.15 $"
-
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -45,7 +44,7 @@
 
 void print_table(unsigned short delivery);
 
-static string cnames[128][15] =
+static string cnames[128][16] =
 {
     {"NUL",		"Null", 		(char *)NULL},
     {"SOH",		"Start Of Heading", 	(char *)NULL},
@@ -88,6 +87,7 @@
     {"\"",		"Quotation Mark",
 				"Double Quote", "Quote", "String Quote",
 				"Dirk", "Literal Mark", "Double Glitch",
+     				"&quot;",
 				"# See ' and ` for matching names.",
 				(char *)NULL},
     {"#",		"Number Sign",
@@ -100,7 +100,7 @@
     {"%",		"Percent Sign",
 	 			"Mod", (char *)NULL},
     {"&",		"Ampersand",
-				"Amper", "And", (char *)NULL},
+				"Amper", "And", "&amp;", (char *)NULL},
     {"'",		"Apostrophe",
 				"Single Quote", "Close Quote",  "Prime",
 				"Tick", "Pop", "Spark", "Glitch",
@@ -151,7 +151,7 @@
     {"<",		"Less-than Sign",
 				"Left Angle Bracket", "Read From", "In",
 				"From", "Comesfrom", "Left Funnel",
-				"Left Broket", "Crunch", "Suck",
+				"Left Broket", "Crunch", "Suck", "&lt;", 
 				"# See `<' for matching names.",
 	 			 (char *)NULL},
     {"=",		"Equals Sign",
@@ -160,7 +160,7 @@
     {">",		"Greater-than sign",
 				"Right Angle" , "Write To", "Into", "Toward",
 				"Out", "To", "Gozinta", "Right Funnel",
-				"Right Broket", "Zap", "Blow",
+				"Right Broket", "Zap", "Blow", "&gt;",
 				"# See `>' for matching names.",
 	 			 (char *)NULL},
     {"?",		"Question Mark",
@@ -328,7 +328,7 @@
 	    help = 1;
 	    break;
 	case 'v':
-	    printf("%s\n",REVISION); exit(0) ;
+	    printf("ascii %2.1f\n",REVISION); exit(0) ;
 	    break;
 	default :
 	    help = 1;
diff -urN ascii-2.6/ascii.cgi ascii-3.0/ascii.cgi
--- ascii-2.6/ascii.cgi	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/ascii.cgi	Sun Sep 26 08:43:31 1999
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+cat << EOM
+Content-type: text/html
+
+<HTML>
+<HEAD>
+<TITLE>Ascii Character Codes</TITLE>
+</HEAD>
+
+<BODY>
+<H1>Ascii Character Codes</H1>
+
+<ISINDEX>
+
+<pre>
+EOM
+
+/usr/local/bin/ascii $*
+
+cat << EOM
+</pre>
+</BODY>
+</HTML>
+EOM
diff -urN ascii-2.6/ascii.lsm ascii-3.0/ascii.lsm
--- ascii-2.6/ascii.lsm	Wed Jun 16 21:09:18 1999
+++ ascii-3.0/ascii.lsm	Thu Jul 27 19:44:32 2000
@@ -1,7 +1,7 @@
 Begin3
 Title:		ascii
-Version:	2.6
-Entered-date:	16JUN99
+Version:	3.0
+Entered-date:	27JUL2000
 Description:	A handy little utility that recognizes many different ways of
 		naming an ASCII character (hex, octal, binary, decimal,
 		C escape, ISO character table pair, slang names, and others)
@@ -10,7 +10,7 @@
 Author: 	esr@snark.thyrsus.com (Eric S. Raymond)
 Maintained-by:	esr@snark.thyrsus.com (Eric S. Raymond)
 Primary-site:	locke.ccil.org /pub/esr
-		7K ascii-2.6.tar.gz
+		7K ascii-3.0.tar.gz
 Platforms:	All
 Copying-policy:	BSD-like
 End
diff -urN ascii-2.6/ascii.spec ascii-3.0/ascii.spec
--- ascii-2.6/ascii.spec	Wed Jun 16 21:11:02 1999
+++ ascii-3.0/ascii.spec	Thu Jul 27 19:50:59 2000
@@ -1,7 +1,7 @@
 Name: ascii
-Version: 2.6
+Version: 3.0
 Release: 1
-Source: locke.ccil.org:/pub/esr/ascii-2.6.tar.gz
+Source: locke.ccil.org:/pub/esr/ascii-3.0.tar.gz
 Copyright: distributable
 Group: Utilities/Text
 Summary: interactive ASCII name and synonym chart
diff -urN ascii-2.6/debian/README.debian ascii-3.0/debian/README.debian
--- ascii-2.6/debian/README.debian	Sat Apr  7 02:26:23 2001
+++ ascii-3.0/debian/README.debian	Wed Dec 31 21:00:00 1969
@@ -1,7 +0,0 @@
-ascii for Debian
-----------------------
-
-This package was downloaded from ESR's homepage at 
-http://www.tuxedo.org/~esr/software.html
-
- <ioannis@debian.org>, Sun, 27 Jun 1999 05:03:43 -0400
diff -urN ascii-2.6/debian/ascii/DEBIAN/control ascii-3.0/debian/ascii/DEBIAN/control
--- ascii-2.6/debian/ascii/DEBIAN/control	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/debian/ascii/DEBIAN/control	Sat Apr  7 09:53:47 2001
@@ -0,0 +1,13 @@
+Package: ascii
+Version: 3.0-1
+Section: utils
+Priority: optional
+Architecture: i386
+Depends: libc6 (>= 2.2.2-2)
+Installed-Size: 53
+Maintainer: Ioannis Tambouras <ioannis@debian.org>
+Description: Prints aliases and tables for ASCII character.
+ A programmer's utility that recognizes different ways of naming
+ ASCII characters (hex, octal, binary, decimal, C escape, ISO
+ character table pair, slang names, and others) and prints out all
+ equivalent aliases.
diff -urN ascii-2.6/debian/ascii/DEBIAN/md5sums ascii-3.0/debian/ascii/DEBIAN/md5sums
--- ascii-2.6/debian/ascii/DEBIAN/md5sums	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/debian/ascii/DEBIAN/md5sums	Sat Apr  7 09:53:47 2001
@@ -0,0 +1,5 @@
+11d00748eeab563907793422a0691172  usr/bin/ascii
+9da7d90ad92929e144f67121b86399bc  usr/share/doc/ascii/README
+3c64ad8c92e79f461e27403acc852d8b  usr/share/doc/ascii/copyright
+93a26b1731d6a0718ff33c564b917988  usr/share/doc/ascii/changelog.Debian.gz
+f2dc9ce4c468116b5ee3b6240272960c  usr/share/man/man1/ascii.1.gz
diff -urN ascii-2.6/debian/ascii/DEBIAN/postinst ascii-3.0/debian/ascii/DEBIAN/postinst
--- ascii-2.6/debian/ascii/DEBIAN/postinst	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/debian/ascii/DEBIAN/postinst	Sat Apr  7 09:53:41 2001
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+# Automatically added by dh_installdocs
+if [ "$1" = "configure" ]; then
+	if [ -d /usr/doc -a ! -e /usr/doc/ascii -a -d /usr/share/doc/ascii ]; then
+		ln -sf ../share/doc/ascii /usr/doc/ascii
+	fi
+fi
+# End automatically added section
diff -urN ascii-2.6/debian/ascii/DEBIAN/prerm ascii-3.0/debian/ascii/DEBIAN/prerm
--- ascii-2.6/debian/ascii/DEBIAN/prerm	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/debian/ascii/DEBIAN/prerm	Sat Apr  7 09:53:42 2001
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+# Automatically added by dh_installdocs
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/ascii ]; then
+	rm -f /usr/doc/ascii
+fi
+# End automatically added section
Binary files ascii-2.6/debian/ascii/usr/bin/ascii and ascii-3.0/debian/ascii/usr/bin/ascii differ
diff -urN ascii-2.6/debian/ascii/usr/share/doc/ascii/README ascii-3.0/debian/ascii/usr/share/doc/ascii/README
--- ascii-2.6/debian/ascii/usr/share/doc/ascii/README	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/debian/ascii/usr/share/doc/ascii/README	Thu Jul 27 19:49:35 2000
@@ -0,0 +1,14 @@
+				ascii
+
+This is a handy little utility that recognizes many different ways of
+naming an ASCII character (hex, octal, binary, decimal, C escape, ISO
+character table pair, slang names, and others) and prints out all the
+equivalents.  A CGI script that can be used to enable access over the
+Web is included.
+
+The latest sources for this utility live at 
+
+	http://www.tuxedo.org/~esr/ascii/
+
+							Eric S. Raymond
+							esr@thyrsus.com
Binary files ascii-2.6/debian/ascii/usr/share/doc/ascii/changelog.Debian.gz and ascii-3.0/debian/ascii/usr/share/doc/ascii/changelog.Debian.gz differ
diff -urN ascii-2.6/debian/ascii/usr/share/doc/ascii/copyright ascii-3.0/debian/ascii/usr/share/doc/ascii/copyright
--- ascii-2.6/debian/ascii/usr/share/doc/ascii/copyright	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/debian/ascii/usr/share/doc/ascii/copyright	Sat Apr  7 09:53:12 2001
@@ -0,0 +1,14 @@
+This package was debianized by Ioannis Tambouras <ioannis@debian.org> on
+Sun, 27 Jun 1999 05:03:43 -0400.
+
+It was downloaded from <http://www.tuxedo.org/~esr/ascii/ascii-3.0.tar.gz>
+
+Upstream Author(s): Eric S. Raymond <esr@thyrsus.com>
+
+Copyright:
+
+ In file ascii.c, the author states the following:
+
+ * Reproduce, use, and modify this as you like, as long as you don't
+ * remove the authorship notice and clearly mark your changes. Send me
+ * your improvements, please.
Binary files ascii-2.6/debian/ascii/usr/share/man/man1/ascii.1.gz and ascii-3.0/debian/ascii/usr/share/man/man1/ascii.1.gz differ
diff -urN ascii-2.6/debian/changelog ascii-3.0/debian/changelog
--- ascii-2.6/debian/changelog	Sat Apr  7 02:26:23 2001
+++ ascii-3.0/debian/changelog	Sat Apr  7 09:09:06 2001
@@ -1,3 +1,12 @@
+ascii (3.0-1) unstable; urgency=low
+
+  * NMU
+  * Package uses debhelper now, which makes the FHS transition
+  for us. (Closes: #72489, #91110, #91375, #91384)
+  * New upstream release. (Closes: #90947)
+
+ -- Carlos Laviola <claviola@ajato.com.br>  Sat,  7 Apr 2001 02:32:05 -0300
+
 ascii (2.6) unstable; urgency=low
 
   * New upstream version. 
diff -urN ascii-2.6/debian/control ascii-3.0/debian/control
--- ascii-2.6/debian/control	Sat Apr  7 02:27:04 2001
+++ ascii-3.0/debian/control	Sat Apr  7 09:16:59 2001
@@ -2,13 +2,14 @@
 Section: utils
 Priority: optional
 Maintainer: Ioannis Tambouras <ioannis@debian.org>
+Build-Depends: debhelper (>> 3.0.0)
 Standards-Version: 3.5.2
 
 Package: ascii
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Prints aliases and tables for ASCII character.
- A programmer's utility that recognizes different ways of naming ASCII
- characters (hex, octal, binary, decimal, C escape, ISO character table pair,
- slang names, and others) and prints out all equivalent aliases.
-
+ A programmer's utility that recognizes different ways of naming
+ ASCII characters (hex, octal, binary, decimal, C escape, ISO
+ character table pair, slang names, and others) and prints out all
+ equivalent aliases.
diff -urN ascii-2.6/debian/copyright ascii-3.0/debian/copyright
--- ascii-2.6/debian/copyright	Sat Apr  7 02:26:23 2001
+++ ascii-3.0/debian/copyright	Sat Apr  7 09:53:12 2001
@@ -1,7 +1,9 @@
-This package was debianized by  ioannis@debian.org on
+This package was debianized by Ioannis Tambouras <ioannis@debian.org> on
 Sun, 27 Jun 1999 05:03:43 -0400.
 
-It was downloaded from <http://www.tuxedo.org/~esr/software.html>
+It was downloaded from <http://www.tuxedo.org/~esr/ascii/ascii-3.0.tar.gz>
+
+Upstream Author(s): Eric S. Raymond <esr@thyrsus.com>
 
 Copyright:
 
@@ -10,4 +12,3 @@
  * Reproduce, use, and modify this as you like, as long as you don't
  * remove the authorship notice and clearly mark your changes. Send me
  * your improvements, please.
-
diff -urN ascii-2.6/debian/dirs ascii-3.0/debian/dirs
--- ascii-2.6/debian/dirs	Sat Apr  7 02:26:23 2001
+++ ascii-3.0/debian/dirs	Sat Apr  7 09:09:22 2001
@@ -1 +1,2 @@
 usr/bin
+usr/share/man/man1
diff -urN ascii-2.6/debian/docs ascii-3.0/debian/docs
--- ascii-2.6/debian/docs	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/debian/docs	Sat Apr  7 02:32:07 2001
@@ -0,0 +1 @@
+README
diff -urN ascii-2.6/debian/files ascii-3.0/debian/files
--- ascii-2.6/debian/files	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/debian/files	Sat Apr  7 09:53:47 2001
@@ -0,0 +1 @@
+ascii_3.0-1_i386.deb utils optional
diff -urN ascii-2.6/debian/postinst.debhelper ascii-3.0/debian/postinst.debhelper
--- ascii-2.6/debian/postinst.debhelper	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/debian/postinst.debhelper	Sat Apr  7 09:53:36 2001
@@ -0,0 +1,7 @@
+# Automatically added by dh_installdocs
+if [ "$1" = "configure" ]; then
+	if [ -d /usr/doc -a ! -e /usr/doc/ascii -a -d /usr/share/doc/ascii ]; then
+		ln -sf ../share/doc/ascii /usr/doc/ascii
+	fi
+fi
+# End automatically added section
diff -urN ascii-2.6/debian/prerm.debhelper ascii-3.0/debian/prerm.debhelper
--- ascii-2.6/debian/prerm.debhelper	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/debian/prerm.debhelper	Sat Apr  7 09:53:36 2001
@@ -0,0 +1,5 @@
+# Automatically added by dh_installdocs
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/ascii ]; then
+	rm -f /usr/doc/ascii
+fi
+# End automatically added section
diff -urN ascii-2.6/debian/rules ascii-3.0/debian/rules
--- ascii-2.6/debian/rules	Sat Apr  7 02:26:23 2001
+++ ascii-3.0/debian/rules	Sat Apr  7 09:12:59 2001
@@ -1,50 +1,70 @@
 #!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
 
-package=ascii
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-build:
-	$(checkdir)
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
 	
-	$(MAKE) CFLAGS="-O2 -g -Wall"
-	touch build
+
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch build-stamp
 
 clean:
-	$(checkdir)
-	-rm -f build
-	-$(MAKE) clean
-	-rm -f `find . -name "*~"`
-	-rm -rf debian/tmp debian/files* core debian/substvars
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
 
-binary-indep: checkroot build
-	$(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
-
-binary-arch: checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp
-	install -d debian/tmp
-	cd debian/tmp && install -d `cat ../dirs`
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp
-# Must have debmake installed for this to work. Otherwise please copy
-# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
-	debstd 
-	dpkg-gencontrol 
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
-
-define checkdir
-	test -f debian/rules
-endef
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
 
-binary: binary-indep binary-arch
+	dh_clean
 
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/ascii.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/ascii
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installman ascii.1
+	dh_installchangelogs 
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
-.PHONY: binary binary-arch binary-indep clean checkroot
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff -urN ascii-2.6/debian/substvars ascii-3.0/debian/substvars
--- ascii-2.6/debian/substvars	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/debian/substvars	Sat Apr  7 09:53:44 2001
@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.2.2-2)
diff -urN ascii-2.6/splashscreen.h ascii-3.0/splashscreen.h
--- ascii-2.6/splashscreen.h	Wed Dec 31 21:00:00 1969
+++ ascii-3.0/splashscreen.h	Sat Apr  7 09:53:31 2001
@@ -0,0 +1,22 @@
+P("   -t = one-line output  -d = Decimal table  -o = octal table  -x = hex table");
+P("   -h = This help screen -v = version information");
+P("Prints all aliases of an ASCII character. Args may be chars, C \\-escapes,");
+P("English names, ^-escapes, ASCII mnemonics, or numerics in decimal/octal/hex.");
+P("");
+P("Dec Hex    Dec Hex    Dec Hex  Dec Hex  Dec Hex  Dec Hex   Dec Hex   Dec Hex  ");
+P("  0 00 NUL  16 10 DLE  32 20    48 30 0  64 40 @  80 50 P   96 60 `  112 70 p");
+P("  1 01 SOH  17 11 DC1  33 21 !  49 31 1  65 41 A  81 51 Q   97 61 a  113 71 q");
+P("  2 02 STX  18 12 DC2  34 22 \"  50 32 2  66 42 B  82 52 R   98 62 b  114 72 r");
+P("  3 03 ETX  19 13 DC3  35 23 #  51 33 3  67 43 C  83 53 S   99 63 c  115 73 s");
+P("  4 04 EOT  20 14 DC4  36 24 $  52 34 4  68 44 D  84 54 T  100 64 d  116 74 t");
+P("  5 05 ENQ  21 15 NAK  37 25 %  53 35 5  69 45 E  85 55 U  101 65 e  117 75 u");
+P("  6 06 ACK  22 16 SYN  38 26 &  54 36 6  70 46 F  86 56 V  102 66 f  118 76 v");
+P("  7 07 BEL  23 17 ETB  39 27 '  55 37 7  71 47 G  87 57 W  103 67 g  119 77 w");
+P("  8 08 BS   24 18 CAN  40 28 (  56 38 8  72 48 H  88 58 X  104 68 h  120 78 x");
+P("  9 09 HT   25 19 EM   41 29 )  57 39 9  73 49 I  89 59 Y  105 69 i  121 79 y");
+P(" 10 0A LF   26 1A SUB  42 2A *  58 3A :  74 4A J  90 5A Z  106 6A j  122 7A z");
+P(" 11 0B VT   27 1B ESC  43 2B +  59 3B ;  75 4B K  91 5B [  107 6B k  123 7B {");
+P(" 12 0C FF   28 1C FS   44 2C ,  60 3C <  76 4C L  92 5C \\  108 6C l  124 7C |");
+P(" 13 0D CR   29 1D GS   45 2D -  61 3D =  77 4D M  93 5D ]  109 6D m  125 7D }");
+P(" 14 0E SO   30 1E RS   46 2E .  62 3E >  78 4E N  94 5E ^  110 6E n  126 7E ~");
+P(" 15 0F SI   31 1F US   47 2F /  63 3F ?  79 4F O  95 5F _  111 6F o  127 7F DEL");


-- System Information
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux carlos 2.4.3 #2 Thu Apr 5 23:04:18 UTC 2001 i586



---------------------------------------
Received: (at 93210-close) by bugs.debian.org; 16 Apr 2001 19:12:32 +0000
>From troup@auric.debian.org Mon Apr 16 14:12:32 2001
Return-path: <troup@auric.debian.org>
Received: from auric.debian.org [206.246.226.45] 
	by master.debian.org with esmtp (Exim 3.12 1 (Debian))
	id 14pEQK-0001yO-00; Mon, 16 Apr 2001 14:12:32 -0500
Received: from troup by auric.debian.org with local (Exim 3.12 1 (Debian))
	id 14pE73-0001xn-00; Mon, 16 Apr 2001 14:52:37 -0400
From: gbechly@debian.org (Dr. Guenter Bechly)
To: 93210-close@bugs.debian.org
X-Katie: $Revision: 1.40 $
Subject: Bug#93210: fixed in ascii 3.0-1
Message-Id: <E14pE73-0001xn-00@auric.debian.org>
Sender: James Troup <troup@auric.debian.org>
Date: Mon, 16 Apr 2001 14:52:37 -0400
Delivered-To: 93210-close@bugs.debian.org

We believe that the bug you reported is fixed in the latest version of
ascii, which has been installed in the Debian FTP archive:

ascii_3.0-1_i386.deb
  to pool/main/a/ascii/ascii_3.0-1_i386.deb
ascii_3.0-1.diff.gz
  to pool/main/a/ascii/ascii_3.0-1.diff.gz
ascii_3.0-1.dsc
  to pool/main/a/ascii/ascii_3.0-1.dsc



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 93210@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Dr. Guenter Bechly <gbechly@debian.org> (supplier of updated ascii package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Sat, 14 Apr 2001 09:43:15 +0200
Source: ascii
Binary: ascii
Architecture: source i386
Version: 3.0-1
Distribution: unstable
Urgency: low
Maintainer: Dr. Guenter Bechly <gbechly@debian.org>
Changed-By: Dr. Guenter Bechly <gbechly@debian.org>
Description: 
 ascii      - Prints aliases and tables for ASCII character.
Closes: 41184 72489 90947 91110 91375 91384 93210 93865
Changes: 
 ascii (3.0-1) unstable; urgency=low
 .
   * Adopted by new maintainer;
     closes: #93865, #93210, #72489, #91110, #91375, #91384, #90947
   * Corrected some incorrect notes in ascii.c; closes: #41184
Files: 
 a8f00e1ac905d383ec792d9ec0c0dd39 603 utils optional ascii_3.0-1.dsc
 ee2aec09618cc266fcfb888a226a15db 2984 utils optional ascii_3.0-1.diff.gz
 12b59bfc83c9d02133dd38826c1b0856 14720 utils optional ascii_3.0-1_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.4 (GNU/Linux)
Comment: Weitere Infos: siehe http://www.gnupg.org

iD8DBQE62pwu7u8Z25Yy7ZkRAgZGAJ933Hp9M0UElkRX/BY8wmrrXXiC3QCfccl/
o7D1SCA9AMqUWYL9wV6LxL0=
=kQlR
-----END PGP SIGNATURE-----



Reply to: