dselect/pkgtop.cc: use waddnstr instead of waddch so we don't strip the 8th bit of...

Replace `Debian Linux' with `Debian GNU/Linux' in some more places

diff --git a/ChangeLog b/ChangeLog
index 03d3af9f86c77b6e1bfa7a502a8263a149ea8264..1e5f7c69ccc1ab7d4afcac635ea21f46b6e0df4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Sat Dec 25 04:04:48 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * dselect/pkgtop.cc: use waddnstr instead of waddch so we don't strip
     the 8th bit of characters
+  * Replace `Debian Linux' with `Debian GNU/Linux' in some more places
 
 Sat Dec 25 02:50:31 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index 2cb2fd7d0d1c6eb32c6781311530b7b817c388b7..9c5badd5d9ffd9d95dc77637602aa50f6afd1b17 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,6 @@
-dpkg (1.6.6) unstable; urgency=low
-
-  * Don't strip 8th bit in dselect packagelists
-
- -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
-
 dpkg (1.6.5) unstable; urgency=low
 
+  * Don't strip 8th bit in dselect packagelists
   * Don't use \z in dpkg-scansources, Closes: Bug# 53182
   * Correctly unregister internals manual, Closes: Bug# 53200
   * dselect helpessages can be translated now, Closes: Bug# 51381
@@ -18,7 +13,7 @@ dpkg (1.6.5) unstable; urgency=low
   * Fix segfaults when producing a diff between current and new conffile,
     Closes: Bug# 52197
 
- -- Wichert Akkerman <wakkerma@debian.org>  Sat, 25 Dec 1999 02:53:25 +0100
+ -- Wichert Akkerman <wakkerma@debian.org>  Sat, 25 Dec 1999 04:12:05 +0100
 
 dpkg (1.6.4) unstable; urgency=low
 

diff --git a/doc/ja/dpkg-deb.1 b/doc/ja/dpkg-deb.1
index c7ad6f4de2d148b38618891fc6d060ffdf18db02..e2c1513a4c673b5cddc59fe2f0ed2a409f6324b0 100644 (file)
--- a/doc/ja/dpkg-deb.1
+++ b/doc/ja/dpkg-deb.1
@@ -11,7 +11,7 @@
 .\"WORD:       maintainer script       ´ÉÍý¥¹¥¯¥ê¥×¥È
 .\"WORD:       premission              ¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó
 .\"WORD:       control-file-names      À©¸æ¥Õ¥¡¥¤¥ë̾
-.TH DPKG\-DEB 1 "1st June 1996" "Debian Project" "Debian Linux manual"
+.TH DPKG\-DEB 1 "1st June 1996" "Debian Project" "Debian GNU/Linux manual"
 .SH ̾Á°
 dpkg\-deb \- Debian ¥Ñ¥Ã¥±¡¼¥¸¥¢¡¼¥«¥¤¥Ö(.deb) Áàºî¥Ä¡¼¥ë
 .SH ½ñ¼°

diff --git a/dpkg-deb/dpkg-deb.1 b/dpkg-deb/dpkg-deb.1
index 589e5c5750821b1531934e0721e8378fe079c546..d3bdf474bb9a0dcae73336306bf0d1525fe596bd 100644 (file)
--- a/dpkg-deb/dpkg-deb.1
+++ b/dpkg-deb/dpkg-deb.1
@@ -1,6 +1,6 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\" Authors: Ian Jackson
-.TH DPKG\-DEB 1 "1st June 1996" "Debian Project" "Debian Linux manual"
+.TH DPKG\-DEB 1 "1st June 1996" "Debian Project" "Debian GNU/Linux manual"
 .SH NAME 
 dpkg\-deb \- Debian package archive (.deb) manipulation tool
 .SH SYNOPSIS

diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 9eea6204d292cf84f99db7174fb7e1e6e122d2b9..6334e517ac79f65b641fb36036bebc45a7b0d33d 100644 (file)
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -41,7 +41,7 @@
 #include "dpkg-deb.h"
 
 static void printversion(void) {
-  if (fputs(_("Debian Linux `" BACKEND "' package archive backend version "), stdout) < 0) werr("stdout");
+  if (fputs(_("Debian GNU/Linux `" BACKEND "' package archive backend version "), stdout) < 0) werr("stdout");
   if (fputs(DPKG_VERSION_ARCH ".\n", stdout) < 0) werr("stdout");
   if (fputs(_("Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
              "GNU General Public Licence version 2 or later for copying conditions.\n"

diff --git a/dselect/main.cc b/dselect/main.cc
index a1637ef2028668b61df353e7bf3b26b8fecdbd4d..bf683cdd05b8d291ae9a27c250a45bbfeb1eb84f 100644 (file)
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -76,7 +76,7 @@ static const menuentry menuentries[]= {
 };
 
 static const char programdesc[]=
-      N_("Debian Linux `%s' package handling frontend.");
+      N_("Debian GNU/Linux `%s' package handling frontend.");
 
 static const char copyrightstring[]= N_(
       "Version %s.  Copyright (C) 1994-1996 Ian Jackson.   This is\n"

diff --git a/main/main.c b/main/main.c
index c1148f92337729b942cb02b7134278699c863b2e..acff3685b0014bff9cd00bc44dd7562c50b3ab7b 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -41,7 +41,7 @@
 #include "main.h"
 
 static void printversion(void) {
-  if (fputs(_("Debian Linux `"), stdout) < 0) werr("stdout");
+  if (fputs(_("Debian GNU/Linux `"), stdout) < 0) werr("stdout");
   if (fputs(DPKG, stdout) < 0) werr("stdout");
   if (fputs(_("' package management program version "), stdout) < 0) werr("stdout");
   if (fputs( DPKG_VERSION_ARCH ".\n", stdout) < 0) werr("stdout");

diff --git a/scripts/cleanup-info.pl b/scripts/cleanup-info.pl
index e6bfcc31932288304c550bf9b1b65bbee25b5484..d16e3ce909b2a2221216ff62e06ffea6f0b6deba 100755 (executable)
--- a/scripts/cleanup-info.pl
+++ b/scripts/cleanup-info.pl
@@ -27,7 +27,7 @@
 my $version = '1.1.6'; # This line modified by Makefile
 sub version {
     print STDERR <<END;
-Debian Linux cleanup-info $version.  Copyright (C)1996 Kim-Minh Kaplan.
+Debian GNU/Linux cleanup-info $version.  Copyright (C)1996 Kim-Minh Kaplan.
 This is free software; see the GNU General Public Licence
 version 2 or later for copying conditions.  There is NO warranty.
 END

diff --git a/scripts/dpkg-name.1 b/scripts/dpkg-name.1
index ee964c98ba80fd9672d1e3df3f75236c04e1f201..b7732d88e65e8ee307aa1e95b79d65dfbb9b86b9 100644 (file)
--- a/scripts/dpkg-name.1
+++ b/scripts/dpkg-name.1
@@ -80,7 +80,7 @@ Print copyright information and (a reference to GNU) license
 information and exit successfully.
 .SH BUGS?
 Successfully tested on
-.B Debian Linux 
+.B Debian GNU/Linux 
 systems only. Some packages don't follow the name structure
 <package>_<version>_<architecture>.deb. Packages renamed by dpkg-name
 will follow this structure. Generally this will have no impact on how

diff --git a/scripts/dpkg-safefilelist.1 b/scripts/dpkg-safefilelist.1
index 7a5b8bbff849e4accd9c8da5dceb165d242e3846..6c0621c49e0ee0ea8f6c0adff0f5bf8ae50ee3c3 100644 (file)
--- a/scripts/dpkg-safefilelist.1
+++ b/scripts/dpkg-safefilelist.1
@@ -23,7 +23,7 @@ This will find all files in the current directory, and sort them,
 printing symlinks after their targets.
 .SH BUGS?
 Successfully tested on
-.B Debian Linux 
+.B Debian GNU/Linux 
 systems only.
 .SH SEE ALSO
 .BR dpkg-deb (8),

diff --git a/split/dpkg-split.8 b/split/dpkg-split.8
index e004eaaff913e0ef70b7ced597ec46243cefb494..72c1dad04f7e4bfe46f8770c39e30c24f7d41ec2 100644 (file)
--- a/split/dpkg-split.8
+++ b/split/dpkg-split.8
@@ -1,6 +1,6 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\" Authors: Ian Jackson
-.TH dpkg-split 1 "23rd June 1996" "Debian Linux"
+.TH dpkg-split 1 "23rd June 1996" "Debian GNU/Linux"
 .SH NAME
 dpkg\-split \- Debian package archive split/join tool
 .SH SYNOPSIS

diff --git a/split/main.c b/split/main.c
index b90818b75d5c8dd5a46245350349f36805c3ded1..88c2dd99c171f603c7c1b55de5da23023bba4f5c 100644 (file)
--- a/split/main.c
+++ b/split/main.c
@@ -35,7 +35,7 @@
 
 static void printversion(void) {
   if (fputs
-      (_("Debian Linux `dpkg-split' package split/join tool; version "), stdout) < 0) werr ("stdout");
+      (_("Debian GNU/Linux `dpkg-split' package split/join tool; version "), stdout) < 0) werr ("stdout");
   if (fputs (DPKG_VERSION_ARCH ".\n", stdout) < 0) werr ("stdout");
   if (fputs (_("Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
        "GNU General Public Licence version 2 or later for copying conditions.\n"

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index dc5b487073b2f2282a340f100468821e99aa317d..def1026d13d11861420abba6f52e8d8871445c98 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -161,7 +161,7 @@ static void
 do_help(void)
 {
        printf("\
-start-stop-daemon for Debian Linux - small and fast C version written by\n\
+start-stop-daemon for Debian GNU/Linux - small and fast C version written by\n\
 Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, public domain.\n"
 VERSION "\n\
 \n\