소스 검색

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

Wichert Akkerman 26 년 전
부모
커밋
91125a09a8
13개의 변경된 파일14개의 추가작업 그리고 18개의 파일을 삭제
  1. 1 0
      ChangeLog
  2. 2 7
      debian/changelog
  3. 1 1
      doc/ja/dpkg-deb.1
  4. 1 1
      dpkg-deb/dpkg-deb.1
  5. 1 1
      dpkg-deb/main.c
  6. 1 1
      dselect/main.cc
  7. 1 1
      main/main.c
  8. 1 1
      scripts/cleanup-info.pl
  9. 1 1
      scripts/dpkg-name.1
  10. 1 1
      scripts/dpkg-safefilelist.1
  11. 1 1
      split/dpkg-split.8
  12. 1 1
      split/main.c
  13. 1 1
      utils/start-stop-daemon.c

+ 1 - 0
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
   * dselect/pkgtop.cc: use waddnstr instead of waddch so we don't strip
     the 8th bit of characters
     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>
 Sat Dec 25 02:50:31 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
 

+ 2 - 7
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
 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
   * Don't use \z in dpkg-scansources, Closes: Bug# 53182
   * Correctly unregister internals manual, Closes: Bug# 53200
   * Correctly unregister internals manual, Closes: Bug# 53200
   * dselect helpessages can be translated now, Closes: Bug# 51381
   * 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,
   * Fix segfaults when producing a diff between current and new conffile,
     Closes: Bug# 52197
     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
 dpkg (1.6.4) unstable; urgency=low
 
 

+ 1 - 1
doc/ja/dpkg-deb.1

@@ -11,7 +11,7 @@
 .\"WORD:	maintainer script	管理スクリプト
 .\"WORD:	maintainer script	管理スクリプト
 .\"WORD:	premission		パーミッション
 .\"WORD:	premission		パーミッション
 .\"WORD:	control-file-names	制御ファイル名
 .\"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 名前
 .SH 名前
 dpkg\-deb \- Debian パッケージアーカイブ(.deb) 操作ツール
 dpkg\-deb \- Debian パッケージアーカイブ(.deb) 操作ツール
 .SH 書式
 .SH 書式

+ 1 - 1
dpkg-deb/dpkg-deb.1

@@ -1,6 +1,6 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\" Authors: Ian Jackson
 .\" 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 
 .SH NAME 
 dpkg\-deb \- Debian package archive (.deb) manipulation tool
 dpkg\-deb \- Debian package archive (.deb) manipulation tool
 .SH SYNOPSIS
 .SH SYNOPSIS

+ 1 - 1
dpkg-deb/main.c

@@ -41,7 +41,7 @@
 #include "dpkg-deb.h"
 #include "dpkg-deb.h"
 
 
 static void printversion(void) {
 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(DPKG_VERSION_ARCH ".\n", stdout) < 0) werr("stdout");
   if (fputs(_("Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
   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"
 	      "GNU General Public Licence version 2 or later for copying conditions.\n"

+ 1 - 1
dselect/main.cc

@@ -76,7 +76,7 @@ static const menuentry menuentries[]= {
 };
 };
 
 
 static const char programdesc[]=
 static const char programdesc[]=
-      N_("Debian Linux `%s' package handling frontend.");
+      N_("Debian GNU/Linux `%s' package handling frontend.");
 
 
 static const char copyrightstring[]= N_(
 static const char copyrightstring[]= N_(
       "Version %s.  Copyright (C) 1994-1996 Ian Jackson.   This is\n"
       "Version %s.  Copyright (C) 1994-1996 Ian Jackson.   This is\n"

+ 1 - 1
main/main.c

@@ -41,7 +41,7 @@
 #include "main.h"
 #include "main.h"
 
 
 static void printversion(void) {
 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(DPKG, stdout) < 0) werr("stdout");
   if (fputs(_("' package management program version "), stdout) < 0) werr("stdout");
   if (fputs(_("' package management program version "), stdout) < 0) werr("stdout");
   if (fputs( DPKG_VERSION_ARCH ".\n", stdout) < 0) werr("stdout");
   if (fputs( DPKG_VERSION_ARCH ".\n", stdout) < 0) werr("stdout");

+ 1 - 1
scripts/cleanup-info.pl

@@ -27,7 +27,7 @@
 my $version = '1.1.6'; # This line modified by Makefile
 my $version = '1.1.6'; # This line modified by Makefile
 sub version {
 sub version {
     print STDERR <<END;
     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
 This is free software; see the GNU General Public Licence
 version 2 or later for copying conditions.  There is NO warranty.
 version 2 or later for copying conditions.  There is NO warranty.
 END
 END

+ 1 - 1
scripts/dpkg-name.1

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

+ 1 - 1
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.
 printing symlinks after their targets.
 .SH BUGS?
 .SH BUGS?
 Successfully tested on
 Successfully tested on
-.B Debian Linux 
+.B Debian GNU/Linux 
 systems only.
 systems only.
 .SH SEE ALSO
 .SH SEE ALSO
 .BR dpkg-deb (8),
 .BR dpkg-deb (8),

+ 1 - 1
split/dpkg-split.8

@@ -1,6 +1,6 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\" Authors: Ian Jackson
 .\" Authors: Ian Jackson
-.TH dpkg-split 1 "23rd June 1996" "Debian Linux"
+.TH dpkg-split 1 "23rd June 1996" "Debian GNU/Linux"
 .SH NAME
 .SH NAME
 dpkg\-split \- Debian package archive split/join tool
 dpkg\-split \- Debian package archive split/join tool
 .SH SYNOPSIS
 .SH SYNOPSIS

+ 1 - 1
split/main.c

@@ -35,7 +35,7 @@
 
 
 static void printversion(void) {
 static void printversion(void) {
   if (fputs
   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 (DPKG_VERSION_ARCH ".\n", stdout) < 0) werr ("stdout");
   if (fputs (_("Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
   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"
        "GNU General Public Licence version 2 or later for copying conditions.\n"

+ 1 - 1
utils/start-stop-daemon.c

@@ -161,7 +161,7 @@ static void
 do_help(void)
 do_help(void)
 {
 {
 	printf("\
 	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"
 Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, public domain.\n"
 VERSION "\n\
 VERSION "\n\
 \n\
 \n\