--- Begin Message ---
- To: submit@bugs.debian.org
- Subject: debian-policy: Refer generically to the Debian distribution
- From: Guillem Jover <guillem@debian.org>
- Date: Sat, 28 Aug 2010 08:40:18 +0200
- Message-id: <20100828064018.GB8662@gaara.hadrons.org>
Source: debian-policy
Source-Version: 3.9.1.0
Severity: wishlist
Tags: patch
Hi!
The attached patch fixes all relevant references to the Debian
distribution (or system) by removing references to the particular
GNU/Linux system.
I've left two references to Debian GNU/Linux as they are historical.
regards,
guillem
>From 4d13fa337774fc540b87e4e607bdb04e7ee94a83 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 28 Aug 2010 08:11:28 +0200
Subject: [PATCH] Refer generically to Debian instead of the GNU/Linux instance
---
debian-menu-policy.desc | 2 +-
debian-mime-policy.desc | 2 +-
debian-perl-policy.desc | 2 +-
debian-policy.desc | 2 +-
debian/copyright | 2 +-
menu-policy.sgml | 4 ++--
mime-policy.sgml | 6 +++---
perl-policy.sgml | 4 ++--
policy.sgml | 23 ++++++++++-------------
9 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/debian-menu-policy.desc b/debian-menu-policy.desc
index d3eb5c2..9757253 100644
--- 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 92c4e4d..512e483 100644
--- 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 931e937..cb6337c 100644
--- 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 a5e22ac..745538e 100644
--- 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/copyright b/debian/copyright
index 2257707..b521cf6 100644
--- 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 1ad2fab..c919740 100644
--- 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 38db3ef..e05ee4a 100644
--- 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 3b76b94..b9f3277 100644
--- 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 9037de8..edd1faf 100644
--- 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.
@@ -9562,8 +9561,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>
@@ -9734,9 +9732,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>
--
1.7.1
--- End Message ---
--- Begin Message ---
Source: debian-policy
Source-Version: 3.9.2.0
We believe that the bug you reported is fixed in the latest version of
debian-policy, which is due to be installed in the Debian FTP archive:
debian-policy_3.9.2.0.dsc
to main/d/debian-policy/debian-policy_3.9.2.0.dsc
debian-policy_3.9.2.0.tar.gz
to main/d/debian-policy/debian-policy_3.9.2.0.tar.gz
debian-policy_3.9.2.0_all.deb
to main/d/debian-policy/debian-policy_3.9.2.0_all.deb
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 594656@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Russ Allbery <rra@debian.org> (supplier of updated debian-policy 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: SHA256
Format: 1.8
Date: Wed, 06 Apr 2011 22:48:55 -0700
Source: debian-policy
Binary: debian-policy
Architecture: source all
Version: 3.9.2.0
Distribution: unstable
Urgency: low
Maintainer: Debian Policy List <debian-policy@lists.debian.org>
Changed-By: Russ Allbery <rra@debian.org>
Description:
debian-policy - Debian Policy Manual and related documents
Closes: 459868 488214 501930 504880 536790 581011 588014 590696 591857 593909 594274 594542 594656 594658 597074 599944 606869 609160 619186
Changes:
debian-policy (3.9.2.0) unstable; urgency=low
.
* Policy: Require human Maintainer or Uploader, clarify Maintainer
Wording: Russ Allbery <rra@debian.org>
Seconded: Charles Plessy <plessy@debian.org>
Seconded: Raphaël Hertzog <hertzog@debian.org>
Closes: #459868, #581011
* Policy: Add an FHS exception on GNU/Hurd for /hurd and /servers
Wording: Russ Allbery <rra@debian.org>
Seconded: Andrew McMillan <andrew@morphoss.com>
Seconded: Guillem Jover <guillem@debian.org>
Closes: #594658
* Policy: Document DM-Upload-Allowed
Wording: Charles Plessy <plessy@debian.org>
Seconded: Andrew McMillan <andrew@morphoss.com>
Seconded: Russ Allbery <rra@debian.org>
Closes: #588014
* Policy: Update multiarch FHS exception for i386 naming
Wording: Steve Langasek <vorlon@debian.org>
Seconded: Aurelien Jarno <aurelien@aurel32.net>
Seconded: Raphael Hertzog <hertzog@debian.org>
Closes: #619186
* Policy: Significant additions to maintainer script documentation
Wording: Russ Allbery <rra@debian.org>
Seconded: Steve Langasek <vorlon@debian.org>
Seconded: Raphaël Hertzog <hertzog@debian.org>
Closes: #504880
* Policy: Clarify format of Debian control fields
Wording: Charles Plessy <plessy@debian.org>
Seconded: Russ Allbery <rra@debian.org>
Seconded: Julien Cristau <jcristau@debian.org>
Closes: #501930, #593909
* Virtual: Added mailx as a new virtual package
Wording: Russ Allbery <rra@debian.org>
Seconded: Raphaël Hertzog <hertzog@debian.org>
Seconded: Giacomo A. Catenazzi <cate@debian.org>
Closes: #488214
* Be more verbose in defining the build architecture and the host
architecture and consistently refer to architecture rather than
machine. (Closes: #591857)
* Correct the name of the Filesystem Hierarchy Standard in the package
description. Patch from Christoph Anton Mitterer. (Closes: #590696)
* Use the word "implemented" to describe required targets in
debian/rules, which is clearer about allowing wildcard rules. List
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)
* Update the ldconfig footnote listing the /etc/ld.so.conf directories
to remove the libc5 compatibility directories and mention the
multiarch triplet directories. Based on a patch by Charles Plessy.
(Closes: #597074)
* Add introductory paragraphs for each archive area explaining briefly
the purpose of that archive area. Based on a proposal by CJ
Fearnley. (Closes: #594542)
* 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)
* Remove references to the obsolete debmake package.
* Update the list of Policy maintainers.
* 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
packages), wrap it, and remove version restrictions that are older
than the version in oldstable.
* Add emacs23 to the build dependencies and remove the files generated
from org source from the revision control repository. Build and clean
files from org source unconditionally. Add Process.{txt,html} to the
list of files generated from org source. (Closes: #594274)
* Fix URLs under www.freedesktop.org to avoid permanent redirects.
Thanks, David Prévot. (Closes: #606869)
* Add a cross-reference to the Pre-Depends requirement in 3.5 to section
7.2 where Pre-Depends is defined. Thanks, Mattias Ellert and Jonathan
Nieder. (Closes: #599944)
* Include the new (optional) copyright format that was drafted as DEP-5.
This is not yet a final version; that's expected to come in the
3.9.3.0 release. Thanks to all the DEP-5 contributors and to Lars
Wirzenius and Charles Plessy for the integration into the Policy
package. (Closes: #609160)
Checksums-Sha1:
3fbe1185dd3abd9f553cefbc2e8b353864bdd99b 1471 debian-policy_3.9.2.0.dsc
f8b59ed7adcaec2dd78b77010eba9f9934e13012 693834 debian-policy_3.9.2.0.tar.gz
3854a70a825272ff6a1e1473eb90369f5c1c6c68 1907938 debian-policy_3.9.2.0_all.deb
Checksums-Sha256:
231893c0f9dd4d8bd20aa5d53e871423c15ce0eb48ebc53652316a0e7eca8f89 1471 debian-policy_3.9.2.0.dsc
8be1c13c6b05b167b356f505cab74f3e6a84be096215e64ad741d672b6f943a6 693834 debian-policy_3.9.2.0.tar.gz
1a587553e9fc5ad93f3ddf8d752131efc737dff7810a6c170fe67cbb8a642eb5 1907938 debian-policy_3.9.2.0_all.deb
Files:
cad30289440ae005513484e7af83039f 1471 doc optional debian-policy_3.9.2.0.dsc
b90105f64bcaedd3b1c182689ac9c6c8 693834 doc optional debian-policy_3.9.2.0.tar.gz
73bef9fc65be0091233daa701e494104 1907938 doc optional debian-policy_3.9.2.0_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQEcBAEBCAAGBQJNnVKxAAoJEH2AMVxXNt51S1kH/19xBm48ZzXnn2tSEHaCWKIz
sh86ppJArmwvxUu0BzwlSg2jr01M3pyynwVzgevGAQ9QlK2bD1MODlq5zQ23JLk8
ZHthYq/f15BkWuwMPVfnWeUtLVe4Xo6LL/LJGMjYiWTGxyv8OtctDVYz0olksmjr
gNp4rTUIzRfL8ucN3ypq0Xct7K2QilXQFdtEpHSRdsSPLC42cQgH/0wqo1PzMT7w
micFsqgGT5ZDUq+y4eNE6AzAZynVJgUAgnG0BMANucFJ8pVnVPmUB8rAEaURPGib
rjwuIHftPliJyI0hoBzWV1AU9t/I7IPekCJx+eqhVnUMF+sQexwHssEWmAZbtwY=
=o5f6
-----END PGP SIGNATURE-----
--- End Message ---