Merge branch 'master' into bug23712-rra

diff --git a/debian-menu-policy.desc b/debian-menu-policy.desc
index d3eb5c227b7b22b42db239ed09d59b156682057d..9757253a69e59735e688c464f9b6d13634dd5dad 100644 (file)
--- a/debian-menu-policy.desc
+++ b/debian-menu-policy.desc
@@ -2,7 +2,7 @@ Document: debian-menu-policy
 Title: Debian Menu Policy Manual
 Author: The Debian Policy Mailing list
 Abstract: This manual describes the policy requirements for the Menu
- system in the Debian GNU/Linux distribution, describing the
+ system in the Debian distribution, describing the
  hierarchical structure of the menu sections.
 Section: Debian
 

diff --git a/debian-mime-policy.desc b/debian-mime-policy.desc
index 92c4e4d3ec958429c17bc676ce65ebf0d79faacb..512e483e8c54a09d52080ba398f351e0857c8de2 100644 (file)
--- a/debian-mime-policy.desc
+++ b/debian-mime-policy.desc
@@ -2,7 +2,7 @@ Document: debian-mime-policy
 Title: Debian MIME Policy Manual
 Author: The Debian Policy Mailing list
 Abstract: This manual describes the policy requirements for the MIME
- system in the Debian GNU/Linux distribution, describing the rules
+ system in the Debian distribution, describing the rules
  regulating the registration of programs that can handle MIME
  content.
 Section: Debian

diff --git a/debian-perl-policy.desc b/debian-perl-policy.desc
index 931e937e8c9536a40ceaa14b91640a135693f33e..cb6337cd80244b4c51edc8ca3d819782fe1b8172 100644 (file)
--- a/debian-perl-policy.desc
+++ b/debian-perl-policy.desc
@@ -2,7 +2,7 @@ Document: debian-perl-policy
 Title: Debian Perl Policy Manual
 Author: The Debian Policy Mailing list
 Abstract: This manual describes the policy requirements for the Perl
- system in the Debian GNU/Linux distribution, describing the rules
+ system in the Debian distribution, describing the rules
  regulating the building and installation of packages providing and
  using Perl and Perl modules.
 Section: Debian

diff --git a/debian-policy.desc b/debian-policy.desc
index a5e22accd37cfba32d7749c4241ae55d37b41a39..745538ef83fa62a75c38d9a8f9dd5947f1cb2646 100644 (file)
--- a/debian-policy.desc
+++ b/debian-policy.desc
@@ -2,7 +2,7 @@ Document: debian-policy
 Title: Debian Policy Manual
 Author: The Debian Policy Mailing list
 Abstract: This manual describes the policy requirements for the Debian
- GNU/Linux distribution. This includes the structure and contents of
+ distribution. This includes the structure and contents of
  the Debian archive, several design issues of the operating system, as
  well as technical requirements that each package must satisfy to be
  included in the distribution.

diff --git a/debian/changelog b/debian/changelog
index dd7e3e076695137630d16de899ff787a9cf65a11..803beb652f21dd5c10bfa3333ef29e6cfbea40e9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ debian-policy (3.9.2.0) UNRELEASED; urgency=low
     the required rules in their own paragraph rather than with the
     paragraph discussing non-interactivity, and explicitly mark all rules
     as either required or optional.  (Closes: #536790)
+  * Change all non-historical references to Debian GNU/Linux to simply
+    Debian since Debian now includes FreeBSD-based architectures.  Patch
+    from Guillem Jover.  (Closes: #594656)
   * Wrap Uploaders in debian/control.
   * Move Build-Depends-Indep to Build-Depends (there's no reason to use
     -Indep in a package that builds only architecture-independent binary

diff --git a/debian/copyright b/debian/copyright
index 2257707a9c4deb1fed56a39e03b0218bede3ddcd..b521cf682b66be426757a6f7ca22cb3fa3a9cab0 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,7 +24,7 @@ fitness for a particular purpose. See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License with
-your Debian GNU/Linux system, in /usr/share/common-licenses/GPL-2, or
+your Debian system, in /usr/share/common-licenses/GPL-2, or
 with the dpkg source package as the file COPYING. If not, write to the
 Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 MA 02110-1301 USA

diff --git a/menu-policy.sgml b/menu-policy.sgml
index 1ad2fab986a0ab030a2506964b286341bc0e0816..c91974064bae9c61f96b28d2201220066f296a5d 100644 (file)
--- a/menu-policy.sgml
+++ b/menu-policy.sgml
@@ -31,7 +31,7 @@
 
       <abstract>
        This manual describes the policy requirements for the Menu
-       system used in the Debian GNU/Linux distribution. This
+       system used in the Debian distribution. This
        document is part of the policy package for Debian.
       </abstract>
 
@@ -54,7 +54,7 @@
        </p>
        <p>
          A copy of the GNU General Public License is available as
-         <tt>/usr/doc/copyright/GPL</tt> in the Debian GNU/Linux
+         <tt>/usr/doc/copyright/GPL</tt> in the Debian
          distribution or on the World Wide Web at 
          <url id="http://www.gnu.org/copyleft/gpl.html"
          name="The GNU General Public Licence">. You can also obtain it by writing to the

diff --git a/mime-policy.sgml b/mime-policy.sgml
index 38db3ef3105f6e1460a2042ae8ed2a004ad14ba7..e05ee4a6398b5c09c41044f9eda1491e63c39acc 100644 (file)
--- a/mime-policy.sgml
+++ b/mime-policy.sgml
@@ -5,7 +5,7 @@
 ]>
 <debiandoc>
   <!--
-  Debian GNU/Linux Menu Sub-Policy Manual.
+  Debian Menu Sub-Policy Manual.
   Copyright (C)1999 ;
 
   released under the terms of the GNU General Public License, version
@@ -32,7 +32,7 @@
 
       <abstract>
        This manual describes the policy requirements for the MIME support
-       system used in the Debian GNU/Linux distribution. This
+       system used in the Debian distribution. This
        document is part of the policy package for Debian. The policy
        package itself is maintained by a group of maintainers that
        have no editorial powers. At the moment, the list of
@@ -69,7 +69,7 @@
        <p>
          A copy of the GNU General Public License is available as
          <tt>/usr/share/common-licenses/GPL</tt> in the Debian
-         GNU/Linux distribution or on the World Wide Web at <url
+         distribution or on the World Wide Web at <url
          id="http://www.gnu.org/copyleft/gpl.html" name="The GNU
          General Public Licence">. You can also obtain it by writing
          to the Free Software Foundation, Inc., 51 Franklin St, Fifth

diff --git a/perl-policy.sgml b/perl-policy.sgml
index 3b76b940ce12086b96b410823568f6deaf672c03..b9f327739b963ae949265ce871f13870ad033368 100644 (file)
--- a/perl-policy.sgml
+++ b/perl-policy.sgml
@@ -22,7 +22,7 @@
 
       <abstract>
        This document describes the packaging of Perl within the Debian
-       GNU/Linux distribution and the policy requirements for packaged
+       distribution and the policy requirements for packaged
        Perl programs and modules.
       </abstract>
 
@@ -44,7 +44,7 @@
        </p>
        <p>
          A copy of the GNU General Public License is available as
-         <tt>/usr/share/common-licenses/GPL</tt> in the Debian GNU/Linux
+         <tt>/usr/share/common-licenses/GPL</tt> in the Debian
          distribution or on the World Wide Web at 
          <url id="http://www.gnu.org/copyleft/gpl.html"
          name="The GNU Public Licence">.

diff --git a/policy.sgml b/policy.sgml
index 3fc844647317a43c5026842c7811f0523888baae..b61ab26140fc17f3735e0e085a67af520c6e4cb5 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -15,7 +15,7 @@
 
       <abstract>
        This manual describes the policy requirements for the Debian
-       GNU/Linux distribution.  This includes the structure and
+       distribution.  This includes the structure and
        contents of the Debian archive and several design issues of
        the operating system, as well as technical requirements that
        each package must satisfy to be included in the distribution.
@@ -50,7 +50,7 @@
 
        <p>
          A copy of the GNU General Public License is available as
-         <file>/usr/share/common-licenses/GPL</file> in the Debian GNU/Linux
+         <file>/usr/share/common-licenses/GPL</file> in the Debian
          distribution or on the World Wide Web at
          <url id="http://www.gnu.org/copyleft/gpl.html"
               name="the GNU General Public Licence">. You can also
@@ -68,7 +68,7 @@
        <heading>Scope</heading>
        <p>
          This manual describes the policy requirements for the Debian
-         GNU/Linux distribution. This includes the structure and
+         distribution. This includes the structure and
          contents of the Debian archive and several design issues of the
          operating system, as well as technical requirements that
          each package must satisfy to be included in the
@@ -314,7 +314,7 @@
       <heading>The Debian Archive</heading>
 
       <p>
-       The Debian GNU/Linux system is maintained and distributed as a
+       The Debian system is maintained and distributed as a
        collection of <em>packages</em>. Since there are so many of
        them (currently well over 15000), they are split into
        <em>sections</em> and given <em>priorities</em> to simplify
@@ -348,8 +348,7 @@
       </p>
 
       <p>
-       The <em>main</em> archive area forms the <em>Debian GNU/Linux
-       distribution</em>.
+       The <em>main</em> archive area forms the <em>Debian distribution</em>.
       </p>
 
       <p>
@@ -796,7 +795,7 @@
       <heading>Binary packages</heading>
 
       <p>
-       The Debian GNU/Linux distribution is based on the Debian
+       The Debian distribution is based on the Debian
        package management system, called <prgn>dpkg</prgn>. Thus,
        all packages in the Debian distribution must be provided
        in the <tt>.deb</tt> file format.
@@ -1168,7 +1167,7 @@
 
        <p>
          The <tt>base system</tt> is a minimum subset of the Debian
-         GNU/Linux system that is installed before everything else
+         system that is installed before everything else
          on a new system. Only very few packages are allowed to form
          part of the base system, in order to keep the required disk
          usage very small.
@@ -9574,8 +9573,7 @@ END-INFO-DIR-ENTRY
        <p>
          Packages in the <em>contrib</em> or <em>non-free</em> archive
          areas should state in the copyright file that the package is not
-         part of the Debian GNU/Linux distribution and briefly explain
-         why.
+         part of the Debian distribution and briefly explain why.
        </p>
 
        <p>
@@ -9746,9 +9744,8 @@ END-INFO-DIR-ENTRY
        <prgn>dpkg</prgn> is a suite of programs for creating binary
        package files and installing and removing them on Unix
        systems.<footnote>
-           <prgn>dpkg</prgn> is targeted primarily at Debian
-           GNU/Linux, but may work on or be ported to other
-           systems.
+           <prgn>dpkg</prgn> is targeted primarily at Debian, but may
+           work on or be ported to other systems.
        </footnote>
       </p>