Clarify licensing: "GNU General Public License" not s/General //.

CVS patchset: 3214
CVS date: 1999/08/04 18:07:18

diff --git a/aclocal.m4 b/aclocal.m4
index 1b0a992..a78a377 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -666,9 +666,9 @@ AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
 # This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.  Please note that the actual code is *not* freely available.
 
 # serial 5
 
@@ -982,9 +982,9 @@ strdup __argz_count __argz_stringify __argz_next])
 # Ulrich Drepper <drepper@cygnus.com>, 1996.
 #
 # This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.  Please note that the actual code is *not* freely available.
 
 # serial 1
 
@@ -1030,9 +1030,9 @@ AC_SUBST($1)dnl
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
 # This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.  Please note that the actual code is *not* freely available.
 
 # serial 1
 

diff --git a/autodeps/aix.req b/autodeps/aix.req
index 31a6c85..63938db 100755 (executable)
--- a/autodeps/aix.req
+++ b/autodeps/aix.req
@@ -2,7 +2,7 @@
 
 # Original Author: Ralph Goers(rgoer@Candle.Com)
 # Borrowed heavily from Tim Mooney's HP version.
-# This file is distributed under the terms of the GNU Public License
+# This file is distributed under the terms of the GNU General Public License
 #
 # find-requires is part of RPM, the RedHat Package Manager.  find-requires
 # reads a list of full pathnames (in a package) on stdin, and outputs all

diff --git a/autodeps/hpux.prov b/autodeps/hpux.prov
index 1b6dffe..8619813 100644 (file)
--- a/autodeps/hpux.prov
+++ b/autodeps/hpux.prov
@@ -1,9 +1,9 @@
 #! /usr/bin/ksh
 
 # Original Author: Tim Mooney (mooney@plains.nodak.edu)
-# $Id: hpux.prov,v 1.3 1998/06/14 16:03:14 ewt Exp $
+# $Id: hpux.prov,v 1.4 1999/08/04 18:07:18 jbj Exp $
 #
-# This file is distributed under the terms of the GNU Public License
+# This file is distributed under the terms of the GNU General Public License
 #
 # find-provides is part of RPM, the Red Hat Package Manager.  find-provides
 # reads a list of full pathnames (in a package) on stdin, and outputs all

diff --git a/autodeps/hpux.req b/autodeps/hpux.req
index 37896eb..f9d7e5d 100644 (file)
--- a/autodeps/hpux.req
+++ b/autodeps/hpux.req
@@ -1,9 +1,9 @@
 #! /usr/bin/ksh
 
 # Original Author: Tim Mooney (mooney@plains.nodak.edu)
-# $Id: hpux.req,v 1.3 1998/06/14 16:03:14 ewt Exp $
+# $Id: hpux.req,v 1.4 1999/08/04 18:07:18 jbj Exp $
 #
-# This file is distributed under the terms of the GNU Public License
+# This file is distributed under the terms of the GNU General Public License
 #
 # find-requires is part of RPM, the Red Hat Package Manager.  find-requires
 # reads a list of full pathnames (in a package) on stdin, and outputs all

diff --git a/autodeps/irix6.prov b/autodeps/irix6.prov
index ab2226b..c95afb5 100644 (file)
--- a/autodeps/irix6.prov
+++ b/autodeps/irix6.prov
@@ -1,9 +1,9 @@
 #! /usr/bin/ksh
 
 # Original Author: Tim Mooney (mooney@plains.nodak.edu)
-# $Id: irix6.prov,v 1.3 1999/01/22 00:25:26 jbj Exp $
+# $Id: irix6.prov,v 1.4 1999/08/04 18:07:18 jbj Exp $
 #
-# This file is distributed under the terms of the GNU Public License
+# This file is distributed under the terms of the GNU General Public License
 #
 # find-provides is part of RPM, the Red Hat Package Manager.  find-provides
 # reads a list of full pathnames (in a package) on stdin, and outputs all

diff --git a/autodeps/irix6.req b/autodeps/irix6.req
index 1648975..e62bb63 100644 (file)
--- a/autodeps/irix6.req
+++ b/autodeps/irix6.req
@@ -1,9 +1,9 @@
 #! /usr/bin/ksh
 
 # Original Author: Tim Mooney (mooney@plains.nodak.edu)
-# $Id: irix6.req,v 1.3 1999/01/22 00:25:27 jbj Exp $
+# $Id: irix6.req,v 1.4 1999/08/04 18:07:18 jbj Exp $
 #
-# This file is distributed under the terms of the GNU Public License
+# This file is distributed under the terms of the GNU General Public License
 #
 # find-requires is part of RPM, the Red Hat Package Manager.  find-requires
 # reads a list of full pathnames (in a package) on stdin, and outputs all

diff --git a/autodeps/osf.prov b/autodeps/osf.prov
index 45a213a..f1150d5 100644 (file)
--- a/autodeps/osf.prov
+++ b/autodeps/osf.prov
@@ -3,7 +3,7 @@
 # Original Author: Tim Mooney (mooney@plains.nodak.edu)
 # $Id: osf.prov,v 1.2 1998/05/29 16:34:27 mooney Exp mooney $
 #
-# This file is distributed under the terms of the GNU Public License
+# This file is distributed under the terms of the GNU General Public License
 #
 # find-provides is part of RPM, the Red Hat Package Manager.  find-provides
 # reads a list of full pathnames (in a package) on stdin, and outputs all

diff --git a/autodeps/osf.req b/autodeps/osf.req
index fe2f766..4bf6104 100644 (file)
--- a/autodeps/osf.req
+++ b/autodeps/osf.req
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # Original Author: Tim Mooney (mooney@plains.nodak.edu)
-# $Id: osf.req,v 1.4 1999/07/07 14:28:07 jbj Exp $
+# $Id: osf.req,v 1.5 1999/08/04 18:07:18 jbj Exp $
 #
-# This file is distributed under the terms of the GNU Public License
+# This file is distributed under the terms of the GNU General Public License
 #
 # find-requires is part of RPM, the Red Hat Package Manager.  find-requires
 # reads a list of full pathnames (in a package) on stdin, and outputs all

diff --git a/po/cs.po b/po/cs.po
index f837b12..6520dbb 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -449,9 +449,9 @@ msgstr "Copyright (c) 1998 - Red Hat Software"
 
 #: ../rpm.c:176
 msgid ""
-"This may be freely redistributed under the terms of the GNU Public License"
+"This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
-"Tento program lze volnì roz¹iøovat podle podmínek GPL (GNU Public License)."
+"Tento program lze volnì roz¹iøovat podle podmínek GNU GPL."
 
 #: ../rpm.c:185
 msgid "usage: rpm {--help}"

diff --git a/po/de.po b/po/de.po
index 35864d7..ba1d60d 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -491,9 +491,9 @@ msgstr "Copyright 
 
 #: ../rpm.c:176
 msgid ""
-"This may be freely redistributed under the terms of the GNU Public License"
+"This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
-"Dies darf unter den Bedingungen der »GNU Public License« frei verteilt werden"
+"Dies darf unter den Bedingungen der »GNU GPL« frei verteilt werden"
 
 #: ../rpm.c:185
 msgid "usage: rpm {--help}"

diff --git a/po/fi.po b/po/fi.po
index e0fd749..97748ef 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -458,8 +458,8 @@ msgstr ""
 
 #: ../rpm.c:176
 msgid ""
-"This may be freely redistributed under the terms of the GNU Public License"
-msgstr "Tätä ohjelmaa voi vapaasti levittää GNU Public Licence:n puittessa"
+"This may be freely redistributed under the terms of the GNU GPL"
+msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa"
 
 #: ../rpm.c:185
 msgid "usage: rpm {--help}"

diff --git a/po/fr.po b/po/fr.po
index 911499d..5c6dfb6 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -428,9 +428,9 @@ msgstr ""
 
 #: ../rpm.c:176
 msgid ""
-"This may be freely redistributed under the terms of the GNU Public License"
+"This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
-"Peut être redistribué librement selon les termes de la GNU Public License"
+"Peut être redistribué librement selon les termes de la GNU GPL"
 
 #: ../rpm.c:185
 msgid "usage: rpm {--help}"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 341ee7a..f93ba10 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -457,7 +457,7 @@ msgstr ""
 
 #: ../rpm.c:176
 msgid ""
-"This may be freely redistributed under the terms of the GNU Public License"
+"This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 "Este Software pode ser livremente redistribuido sob os termos da Licensa "
 "Pública GNU (GPL)"

diff --git a/po/rpm.pot b/po/rpm.pot
index 9649c8b..7b26402 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -179,7 +179,7 @@ msgstr ""
 
 #: ../rpm.c:175
 msgid ""
-"This may be freely redistributed under the terms of the GNU Public License"
+"This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
 #: ../rpm.c:184

diff --git a/po/ru.po b/po/ru.po
index b5d8a3a..94fd415 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -417,8 +417,8 @@ msgstr "Copyright (C) 1998 - Red Hat Software"
 
 #: ../rpm.c:175
 msgid ""
-"This may be freely redistributed under the terms of the GNU Public License"
-msgstr "íÏÖÅÔ Ó×ÏÂÏÄÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÔØÓÑ ÎÁ ÕÓÌÏ×ÉÑÈ GPL (GNU Public License)."
+"This may be freely redistributed under the terms of the GNU GPL"
+msgstr "íÏÖÅÔ Ó×ÏÂÏÄÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÔØÓÑ ÎÁ ÕÓÌÏ×ÉÑÈ GNU GPL."
 
 #: ../rpm.c:184
 msgid "usage: rpm {--help}"

diff --git a/po/sk.po b/po/sk.po
index 3cd9603..85e274c 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -429,10 +429,9 @@ msgstr "Copyright (C) 1998 - Red Hat Software"
 
 #: ../rpm.c:176
 msgid ""
-"This may be freely redistributed under the terms of the GNU Public License"
+"This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
-"Program mô¾e by» voµne redistribuovaný v súlade s podmienkami GPL (GNU "
-"Public License)"
+"Program mô¾e by» voµne redistribuovaný v súlade s podmienkami GNU GPL"
 
 #: ../rpm.c:185
 msgid "usage: rpm {--help}"

diff --git a/po/sr.po b/po/sr.po
index 48c52ec..d0a6faf 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -456,8 +456,8 @@ msgstr ""
 
 #: ../rpm.c:176
 msgid ""
-"This may be freely redistributed under the terms of the GNU Public License"
-msgstr "Mo¾ete slobodno distribuirati dalje pod odredbama GNU javne licence"
+"This may be freely redistributed under the terms of the GNU GPL"
+msgstr "Mo¾ete slobodno distribuirati dalje pod odredbama GNU GPL"
 
 #: ../rpm.c:185
 msgid "usage: rpm {--help}"

diff --git a/po/sv.po b/po/sv.po
index eda4d61..178651c 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -435,10 +435,9 @@ msgstr "Copyright (C) 1995 - Red Hat Software"
 
 #: ../rpm.c:176
 msgid ""
-"This may be freely redistributed under the terms of the GNU Public License"
+"This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
-"Den här programvaran kan distribueras fritt med hänsyn till GNU Public "
-"License"
+"Den här programvaran kan distribueras fritt med hänsyn till GNU GPL"
 
 #: ../rpm.c:185
 msgid "usage: rpm {--help}"

diff --git a/po/tr.po b/po/tr.po
index 531b463..0f1d538 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -466,8 +466,8 @@ msgstr "Copyright (C) 1998 - Red Hat Software"
 
 #: ../rpm.c:176
 msgid ""
-"This may be freely redistributed under the terms of the GNU Public License"
-msgstr "Bu ðrogram GNU Kamu lisansý uyarýnca serbestçe daðýtýlabilir."
+"This may be freely redistributed under the terms of the GNU GPL"
+msgstr "Bu ðrogram GNU GPL uyarýnca serbestçe daðýtýlabilir."
 
 #: ../rpm.c:185
 msgid "usage: rpm {--help}"

diff --git a/rpm.c b/rpm.c
index ccac019..cf699b1 100755 (executable)
--- a/rpm.c
+++ b/rpm.c
@@ -172,8 +172,7 @@ static void printVersion(void) {
 
 static void printBanner(void) {
     puts(_("Copyright (C) 1998 - Red Hat Software"));
-    puts(_("This may be freely redistributed under the terms of the GNU "
-          "Public License"));
+    puts(_("This may be freely redistributed under the terms of the GNU GPL"));
 }
 
 static void printUsage(void) {

diff --git a/scripts/vpkg-provides.sh b/scripts/vpkg-provides.sh
index 998846d..df47467 100755 (executable)
--- a/scripts/vpkg-provides.sh
+++ b/scripts/vpkg-provides.sh
@@ -3,7 +3,7 @@
 #
 # Original Author: Tim Mooney (mooney@plains.NoDak.edu)
 # 
-# This file is distributed under the terms of the GNU Public License
+# This file is distributed under the terms of the GNU General Public License
 #
 # non-linux-provides is part of RPM, the Red Hat Package Manager.
 # non-linux-provides searches a list of directories (based on what OS it's