Bug#1035710: unblock: doc-debian/11.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package doc-debian
[ Reason ]
The doc-debian package claims to ship the Constitution for the Debian Project,
the Debian Social Contract and other Debian documents. The versions of those
documents are obsolete [obsolete], which makes the package as now in testing
very buggy.
[ Impact ]
Shipping obsolete foundational documents is misleading and therefore might
lead to confusion.
[ Tests ]
None. (The package ships documentation only, no code is shipped in the
binary package.)
[ Risks ]
None. The doc-debian package is a key package due to Priority: standard. It
acts as a leaf package: Its only true reverse depends is the live-task-standard
package.[reverse-depends]
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[ ] attach debdiff against the package in testing
[ Other info ] I made a mistake uploading doc-debian 11.0 to unstable; that got
accepted. The version 11.1 is now available from
http://mdcc.cx/tmp/doc-debian/ . I've incorporated some small cosmetic changes
next to the much needed document updates. Attached is a 161 kB
doc-debian_6.5-11.1.dsc-debdiff , as well as a summarizing 13kB
doc-debian_6.5-11.1.dsc-debdiff-tldr .
unblock doc-debian/11.1
Thanks a lot! Bye,
Joost
[reverse-depends]
% apt rdepends doc-debian
doc-debian
Reverse Depends:
Suggests: dwww
Suggests: sash
Depends: live-task-standard
Recommends: live-task-extra
[obsolete] doc-debian 6.5 which is in testing now ships Constitution Version
1.7 from August 2016 and Social Contract 1.1 from April 2004. doc-debian >=
11.0 ships current Constitution Version 1.9 from March 2022 and Social Contract
1.2 from Oct 2022.
unblock doc-debian/11.1
diff -Nru doc-debian-6.5/debian/changelog doc-debian-11.1/debian/changelog
--- doc-debian-6.5/debian/changelog 2021-01-01 14:27:12.000000000 +0100
+++ doc-debian-11.1/debian/changelog 2023-05-08 07:21:32.000000000 +0200
@@ -1,3 +1,54 @@
+doc-debian (11.1) unstable; urgency=high
+
+ * Properly close relevant bugreports in previous changelog entries.
+
+ -- Joost van Baal-Ilić <joostvb@debian.org> Mon, 08 May 2023 07:21:32 +0200
+
+doc-debian (11.0) unstable; urgency=high
+
+ * urgency set to high in order to get this shipped with upcoming
+ Debian 12 bookworm release.
+
+ [ Changes by Joost van Baal-Ilić ]
+ * debian/doc-debian.doc-base.debian-social-contract: Fix typo:
+ s/DFGS/DFSG/. Thanks Legimet. (Closes: #843449)
+ * debian/control: get rid of useless "Suggests: postscript-viewer,
+ www-browser". Thanks Jakub Wilk. (Closes: #798013)
+ * doc/*wml, doc/*inc: updated with latest content as found in webwml git
+ sources at https://salsa.debian.org/webmaster-team/webwml.git:
+ - doc/constitution.1.{0..6}.wml, doc/constitution.wml,
+ doc/social-contract.{1.0,}wml: update URLs: minor fixes in wml
+ syntax / layout, change http to https; in introduction, refer to
+ constitution versions 1.5 (jan 2015), 1.6 (dec 2015) and
+ 1.7 (aug 2016)
+ - bug-log-{access,mailserver}.wml, bug-maint-{info,mailcontrol}.wml,
+ bug-{mailserver-refcard,reporting}.wml, bug-pkgreport-opts.inc:
+ various updates. Thanks Jakub Wilk. (Closes: #1031294)
+ * Add Debian Social Contract version 1.2:
+ - doc/Makefile: add support for social-contract.1.1.wml (apr 2004).
+ - doc/social-contract.*: renamed: social-contract.wml ->
+ social-contract.1.1.wml
+ - doc/social-contract.1.1.wml: updated header
+ - doc/social-contract.wml: we now ship Debian Social Contract, Version
+ 1.2 ratified on October 1st, 2022.
+ * Add Debian Constitution 1.9 (mar 2022) and 1.8 (jan 2022). Thanks Raúl
+ Benencia. (Closes: #1020509)
+ - doc/constitution.*: renamed: constitution.wml ->
+ constitution.1.7.wml
+ - doc/constitution.1.8.wml: we now ship Debian Constitution 1.8 (jan
+ 2022)
+ - doc/constitution.wml: we now ship Debian Constitution 1.9 (mar 2022)
+ * doc/mailing-lists.txt: Update with nov 2021 content from web pages.
+ * doc/Makefile: fix/update error message for missing $(WEBWML).
+ * debian/README.source: website content (since long) moved from cvs to
+ git; update our instructions. Add hint on how one might want to
+ perform a 'git clone'.
+ * debian/{compat,control}: update debhelper compatibility version from
+ deprecated 9 to 10.
+ * tnx _jwilk for prodding me to finally upload.
+
+ -- Joost van Baal-Ilić <joostvb@debian.org> Thu, 04 May 2023 04:09:36 +0200
+
doc-debian (6.5) unstable; urgency=medium
[ Changes by Joost van Baal-Ilić ]
@@ -60,7 +111,7 @@
* Update the contents to the latest available at the website:
- the whole content is now in UTF-8 as the website (Closes: #737120)
* Restore list of tags and severities (Closes: #711248)
- * Update Vcs-* fields
+ * Update Vcs-* fields
* Drop useless GNU/Linux from description
* Use dh 9 short rules instead of CDBS
* Use format 3.0 (quilt)
@@ -70,9 +121,9 @@
doc-debian (6.1) unstable; urgency=low
- * Update the contents to the latest available at the website
- * Simplify debian/rules using CDBS
- - Use standard build process. This build now ensures that we provide
+ * Update the contents to the latest available at the website
+ * Simplify debian/rules using CDBS
+ - Use standard build process. This build now ensures that we provide
a md5sums file (Closes: #672319)
- Text files are now compressed
- Some Lintian bugs now go away
@@ -85,7 +136,7 @@
doc-debian (6.0) unstable; urgency=low
- * Update the contents to the latest available at the website
+ * Update the contents to the latest available at the website
* Remove Pierre Machard as Uploader (Closes: 576557)
* doc/source-unpack.txt: Apply patch provided by Colin Watson to improve
the document. This patch documents all formats currently in use in the
@@ -106,11 +157,11 @@
- Updated bug-maint-mailcontrol.txt which now describes
the 'unarchive' option (Closes: 489517)
- Update the constitution version to 1.4 (Closes: #520684, #367787)
- - Update bug-maint-mailcontrol.txt which now describes
+ - Update bug-maint-mailcontrol.txt which now describes
the possibility of forwarding to URLs (Closes: #457715)
* Fix doc/Makefile so that the social contract file is not overwritten
with version 1.0 (Closes: #512251)
- * Modify doc/Makefile so that the constitution.wml file is changed
+ * Modify doc/Makefile so that the constitution.wml file is changed
by introducing a heading style before the table of content, this way
the formatting of headings is improved (Closes: #520960)
@@ -164,7 +215,7 @@
as the latest releas e]
* Updated the contents under doc/ with the latest version from the website
* Synchronise the FAQ contents with CVS:
- - Update the numbers
+ - Update the numbers
- Add 'lenny' into the list of codenames
- Update and expand the contents of the standard task (no longer includes
developer tools)
diff -Nru doc-debian-6.5/debian/compat doc-debian-11.1/debian/compat
--- doc-debian-6.5/debian/compat 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/debian/compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-9
diff -Nru doc-debian-6.5/debian/control doc-debian-11.1/debian/control
--- doc-debian-6.5/debian/control 2021-01-01 10:33:00.000000000 +0100
+++ doc-debian-11.1/debian/control 2023-05-04 07:03:35.000000000 +0200
@@ -4,6 +4,7 @@
Maintainer: Javier Fernández-Sanguino Peña <jfs@debian.org>
Uploaders: Josip Rodin <joy-packages@debian.org>, Joost van Baal-Ilić <joostvb@debian.org>
Standards-Version: 3.9.8
+Build-Depends: debhelper-compat (= 10)
Build-Depends-Indep: debhelper (>= 9), lynx, wml
Vcs-Browser: https://salsa.debian.org/ddp-team/doc-debian
Vcs-Git: https://salsa.debian.org/ddp-team/doc-debian.git
@@ -11,7 +12,6 @@
Package: doc-debian
Architecture: all
Depends: ${misc:Depends}
-Suggests: postscript-viewer, www-browser
Recommends: debian-faq
Description: Debian Project documentation and other documents
The Debian Project is an association of individuals who have made
diff -Nru doc-debian-6.5/debian/doc-debian.doc-base.debian-social-contract doc-debian-11.1/debian/doc-debian.doc-base.debian-social-contract
--- doc-debian-6.5/debian/doc-debian.doc-base.debian-social-contract 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/debian/doc-debian.doc-base.debian-social-contract 2021-11-22 10:04:19.000000000 +0100
@@ -2,7 +2,7 @@
Title: The Debian Social Contract, and the Debian Free Software Guidelines
Author: The Debian Project
Abstract: This is the "social contract" (v1.1) we offer to the free software
- community. The Debian Free Software Guidelines (DFGS) are the set of
+ community. The Debian Free Software Guidelines (DFSG) are the set of
license conditions to be met for packages to be part of the Debian system.
The version 1.1 ratified on April 26, 2004. This version supersedes version
1.0, ratified on April 5, 1997.
diff -Nru doc-debian-6.5/debian/README.source doc-debian-11.1/debian/README.source
--- doc-debian-6.5/debian/README.source 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/debian/README.source 2023-05-04 07:22:53.000000000 +0200
@@ -1,8 +1,7 @@
- The documents under doc/ can be auto-updated if you have a local
- website CVS copy from e.g.
- :pserver:anonymous@anonscm.debian.org:/cvs/webwml . (See
- https://www.debian.org/devel/website/using_cvs .)
+ website VCS copy from e.g. https://salsa.debian.org/webmaster-team/webwml
+ (See https://www.debian.org/devel/website .)
Once you've set up some symlinks, and you've updated doc/Makefile,
you should be able to run e.g.
@@ -11,12 +10,12 @@
to get a copy of constitution.1.6.wml. Once that's there, run
- % svn add constitution.1.6.wml
- % svn commit -m 'imported constitution.1.6.wml'
+ % git add constitution.1.6.wml
+ % git commit -m 'imported constitution.1.6.wml'
. Or use the "update" make target.
---Joost van Baal-Ilić, august 2016
+--Joost van Baal-Ilić, august 2016, may 2023
@@ -34,9 +33,32 @@
Build instructions:
+ joostvb@dazbog:~/git/debian% git clone git@salsa.debian.org:webmaster-team/webwml.git
+
+(or, e.g. if you're low on disk space / network bandwidth:
+
+ git clone --depth 1 --no-single-branch git@salsa.debian.org:webmaster-team/webwml.git
+
+)
+
root@nagy:~# aptitude update && aptitude -V install wml
- joostvb@nagy:~/debian% ln -s ../cvs/cvs.debian.org/webwml www
+ joostvb@dazbog:~/debian/www% ln -s ../../git/debian/webwml
+
+ joostvb@dazbog:~/git/doc-debian/doc-debian% debuild
+
+ (test, install, ...)
+
+ joostvb@dazbog:~/git/doc-debian/doc-debian% debclean
+
+ joostvb@dazbog:~/git/doc-debian/doc-debian% debuild -kB8FAC2E250475B8CE940A91957930DAB0B86B067 -S
+
+ joostvb@dazbog:~/git/doc-debian/doc-debian% dupload --to debian-ftp ../doc-debian_11.0_source.changes
+
+--Joost van Baal-Ilić, may 2023
+
+
+Obsolete svn era build instructions (fixme: we should git tag our builds)
joostvb@nagy:~/sv...ackages/trunk/doc-debian% cat ~/bin/svn-prebuild
#!/bin/sh
diff -Nru doc-debian-6.5/doc/bug-log-access.wml doc-debian-11.1/doc/bug-log-access.wml
--- doc-debian-6.5/doc/bug-log-access.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/bug-log-access.wml 2023-05-04 06:52:17.000000000 +0200
@@ -41,8 +41,8 @@
bugs that have been closed for a while and thus archived), and
bts-spool-index (for the bug index files).</p>
-<p>At the time of writing, the active spool is about 2.5GB and the archived
-spool is about 10GB. If you only need a sample for testing purposes, please
+<p>As of August 2020, the active spool is about 18GB and the archived
+spool is about 105GB. If you only need a sample for testing purposes, please
consider downloading only part of the active spool rather than the whole
thing.</p>
diff -Nru doc-debian-6.5/doc/bug-log-mailserver.wml doc-debian-11.1/doc/bug-log-mailserver.wml
--- doc-debian-6.5/doc/bug-log-mailserver.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/bug-log-mailserver.wml 2023-05-04 06:52:18.000000000 +0200
@@ -282,7 +282,7 @@
above</a>. This is described in another document, available on the
<a href="server-control">WWW</a>,
in the file <code>bug-maint-mailcontrol.txt</code>, or by
-sending <code>help</code> to <code>control@bugs</code>.</p>
+sending <code>help</code> to <code>control@bugs.debian.org</code>.</p>
<p>In case you are reading this as a plain text file or via email: an
HTML version is available via the bug system main contents page
diff -Nru doc-debian-6.5/doc/bug-mailserver-refcard.wml doc-debian-11.1/doc/bug-mailserver-refcard.wml
--- doc-debian-6.5/doc/bug-mailserver-refcard.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/bug-mailserver-refcard.wml 2023-05-04 06:52:18.000000000 +0200
@@ -52,7 +52,7 @@
<li><code>merge</code> <var>bugnumber</var> <var>bugnumber</var> ...</li>
<li><code>unmerge</code> <var>bugnumber</var></li>
<li><code>forcemerge</code> <var>bugnumber</var> <var>bugnumber</var> ...</li>
-<li><code>tag</code> <var>bugnumber</var>
+<li><code>tags</code> <var>bugnumber</var>
[ <code>+</code> | <code>-</code> | <code>=</code> ] <var>tag</var> [ <var>tag</var> ... ]</li>
<li><code>block</code> <var>bugnumber</var> <code>by</code> <var>bug</var> ...</li>
<li><code>unblock</code> <var>bugnumber</var> <code>by</code> <var>bug</var> ...</li>
diff -Nru doc-debian-6.5/doc/bug-maint-info.wml doc-debian-11.1/doc/bug-maint-info.wml
--- doc-debian-6.5/doc/bug-maint-info.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/bug-maint-info.wml 2023-05-04 06:52:18.000000000 +0200
@@ -39,7 +39,10 @@
<p>Normally, the only people that should close a bug report are the
submitter of the bug and the maintainer(s) of the package against which the
bug is filed. There are exceptions to this rule, for example, the bugs filed
-against unknown packages or certain generic pseudo-packages. When in doubt,
+against unknown packages or certain generic pseudo-packages. A bug can also
+be closed by any contributor if the bug is for an <strong>orphaned</strong>
+package or if the maintainer of a package has missed closing it. It is very
+important to mention the version in which the bug was fixed. When in doubt,
don't close bugs, first ask for advice on the debian-devel mailing list.</p>
<p>Bug reports should be closed by sending email to
@@ -272,6 +275,19 @@
<dt><code>l10n</code></dt>
<dd>This bug is relevant to the localisation of the package.</dd>
+<dt><code>a11y</code></dt>
+ <dd>This bug affects accessibility for users with disabilities. It
+ particularly impacts usability by people who rely on assistive (or
+ other adaptive) technology to use the system/package.</dd>
+
+<dt><code>ftbfs</code></dt>
+ <dd>The package fails to build from source. If the bug is assigned to a
+ source package, that package fails to build. If the bug is assigned
+ to a binary package, the affected source packages fail to build. The
+ tag is applicable to non-standard build environments (e.g. using
+ Build-Depends from experimental), but the severity should be below
+ serious (release critical) in such cases.</dd>
+
<dt><bts_release_tags></dt>
<dd>These are release tags, which have two effects. When set on a bug,
the bug can only affect the particular release (though it may also affect
@@ -384,8 +400,8 @@
<p>The bug tracking system also allows bug submitters, developers and other
interested third parties to subscribe to individual bugs. This feature can be
used by those wishing to keep an eye on a bug, without having to subscribe to a
-package through the <a href="https://packages.qa.debian.org";>PTS</a>.
-All messages that are received at
+package through the <a href="https://tracker.debian.org";>Debian Package
+Tracker</a>. All messages that are received at
<var>nnn</var><code>@bugs.debian.org</code>, are sent to subscribers.</p>
<p>Subscribing to a bug can be done by sending an email to
diff -Nru doc-debian-6.5/doc/bug-maint-mailcontrol.wml doc-debian-11.1/doc/bug-maint-mailcontrol.wml
--- doc-debian-6.5/doc/bug-maint-mailcontrol.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/bug-maint-mailcontrol.wml 2023-05-04 06:52:18.000000000 +0200
@@ -129,7 +129,7 @@
[ <var>originator-address</var> | <code>=</code> | <code>!</code> ]</a></dt>
<dd>
<p>
- Reopens #<var>bugnumber</var> if it is closed.
+ Reopens #<var>bugnumber</var> and clears all fixed versions if it is closed.
</p>
<p>
diff -Nru doc-debian-6.5/doc/bug-pkgreport-opts.inc doc-debian-11.1/doc/bug-pkgreport-opts.inc
--- doc-debian-6.5/doc/bug-pkgreport-opts.inc 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/bug-pkgreport-opts.inc 2023-05-04 06:52:17.000000000 +0200
@@ -3,11 +3,9 @@
<code>important</code>, <code>normal</code>, <code>minor</code>,
<code>wishlist</code></define-tag>
<define-tag bts_tags>
-<code>patch</code>, <code>wontfix</code>, <code>moreinfo</code>,
-<code>unreproducible</code>, <code>help</code>, <code>newcomer</code>, <code>pending</code>,
-<code>security</code>, <code>upstream</code>, <code>confirmed</code>,
-<code>fixed</code>, <code>fixed-upstream</code>,
-<code>fixed-in-experimental</code>, <code>d-i</code>, <code>ipv6</code>,
-<code>lfs</code>, <code>l10n</code>,
+<code>patch</code>, <code>wontfix</code>, <code>moreinfo</code>, <code>unreproducible</code>,
+<code>help</code>, <code>security</code>, <code>upstream</code>, <code>pending</code>, <code>confirmed</code>,
+<code>ipv6</code>, <code>lfs</code>, <code>d-i</code>, <code>l10n</code>, <code>newcomer</code>, <code>a11y</code>, <code>ftbfs</code>,
+<code>fixed-upstream</code>, <code>fixed</code>, <code>fixed-in-experimental</code>,
<bts_release_tags>,
<bts_release_ignore_tags></define-tag>
diff -Nru doc-debian-6.5/doc/bug-reporting.wml doc-debian-11.1/doc/bug-reporting.wml
--- doc-debian-6.5/doc/bug-reporting.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/bug-reporting.wml 2023-05-04 06:52:18.000000000 +0200
@@ -5,12 +5,18 @@
<p>We strongly recommend that you report bugs in Debian using the
<code><a
href="https://packages.debian.org/stable/utils/reportbug";>reportbug</a></code>
-program. To install and start it, simply run:</p>
+program.</p>
-<blockquote>
- <p># <kbd>apt-get install reportbug</kbd><br/>
- $ <kbd>reportbug</kbd></p>
-</blockquote>
+<p>
+reportbug is installed by default on most systems.
+If it is not available, it can be installed using the
+package management tool available on your system.
+</p>
+
+<p>
+reportbug can be started from the system section of the menu or
+by running <code>reportbug</code> via the command-line.
+</p>
<p>It will guide you through the bug reporting process step by step.</p>
@@ -132,8 +138,8 @@
Include the complete text of its configuration files.</li>
<li>The versions of any packages on which the buggy package depends.</li>
<li>What kernel version you're using (type <code>uname -a</code>), your
-shared C library (type <code>ls -l /lib/libc.so.6</code> or
-<code>dpkg -s libc6 | grep ^Version</code>), and any other details about
+shared C library (type <code>ls -l /lib/*/libc.so.6</code> or
+<code>apt show libc6 | grep ^Version</code>), and any other details about
your Debian system, if it seems appropriate. For example, if you had a
problem with a Perl script, you would want to provide the version of the
`perl' binary (type <code>perl -v</code> or <code>dpkg -s perl | grep
@@ -145,7 +151,7 @@
<li>If you have <a
href="https://packages.debian.org/stable/utils/reportbug";>reportbug</a>
installed the output of
- <code>reportbug -q --template -T none -s none -S normal -b --list-cc
+ <code>reportbug --template -T none -s none -S normal -b --list-cc
none -q <package></code>
will also be useful, as it contains the output of maintainer specific
scripts and version information.</li>
@@ -158,7 +164,7 @@
available on a publicly available website if possible.)</p>
<p>For more advice on how to help the developers solve your problem,
-please read <a href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html";>
+please read <a href="https://www.chiark.greenend.org.uk/~sgtatham/bugs.html";>
How to Report Bugs Effectively</a>.</p>
@@ -278,6 +284,22 @@
<<var>username</var>>, that user's tags will be set. Otherwise,
the e-mail address of the sender will be used as the username.</p>
+<p>You can set usertags for multiple users at bug submission time by
+including multiple User pseudo-headers; each Usertags pseudo-header
+sets the usertags for the preceding User pseudo-header. This is especially
+useful for setting usertags for a team with multiple users, setting
+usertags for multiple teams, or setting the
+<a href="https://wiki.debian.org/Teams/Debbugs/ArchitectureTags";>architecture usertags</a>
+for bugs affecting multiple architectures.
+</p>
+
+<pre>
+User: <<var>first-username</var>>
+Usertags: <<var>first-username usertags</var>>
+User: <<var>second-username</var>>
+Usertags: <<var>second-username usertags</var>>
+</pre>
+
<h2>Setting Forwarded</h2>
<pre>
Forwarded: <var>foo@example.com</var>
@@ -332,7 +354,7 @@
Control: retitle -1 this is the title
Control: severity -1 normal
Control: summary -1 0
-Control: forward -1 https://bugs.debian.org/nnn
+Control: forwarded -1 https://bugs.debian.org/nnn
</pre>
<p>would cause 12345 to be retitled, its severity changed, summary set,
@@ -401,7 +423,7 @@
utilizing addresses which match procmail's FROM_DAEMON, which
includes mail from addresses like <code>mail@foobar.com</code>. If
you suspect your mail matches FROM_DAEMON,
- see <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=procmailrc";>procmailrc(5)</a>
+ see <a href="https://manpages.debian.org/cgi-bin/man.cgi?query=procmailrc";>procmailrc(5)</a>
to verify, and then resend the mail using an address which does not
match FROM_DAEMON.</p>
diff -Nru doc-debian-6.5/doc/constitution.1.0.wml doc-debian-11.1/doc/constitution.1.0.wml
--- doc-debian-6.5/doc/constitution.1.0.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/constitution.1.0.wml 2023-05-04 06:52:18.000000000 +0200
@@ -1,14 +1,19 @@
<h1>Historical version of the Constitution for the Debian Project (v1.0)</h1>
-<p>Version 1.0 ratified on December 2nd, 1998. Superseded by
-<a href="constitution.1.1">Version 1.1</a> ratified on June 21st,
-2003, which is itself superseded by <a href="constitution.1.2">version 1.2</a>,
-ratified on October 29th, 2003. Version 1.2 was again superseded by
-<a href="constitution.1.3">version 1.3</a> ratified on September 24th, 2006.
-That was superseded by the <a href="constitution">current version</a>
-ratified on October 7th, 2007.
-</p>
+<p>Version 1.0 ratified on December 2nd, 1998.</p>
+
+<p>Superseded by
+<a href="constitution.1.1">Version 1.1</a> ratified on June 21st, 2003,
+<a href="constitution.1.2">Version 1.2</a> ratified on October 29th, 2003,
+<a href="constitution.1.3">Version 1.3</a> ratified on September 24th, 2006,
+<a href="constitution.1.4">Version 1.4</a> ratified on October 7th, 2007,
+<a href="constitution.1.5">Version 1.5</a> ratified on January 9th, 2015,
+<a href="constitution.1.6">Version 1.6</a> ratified on December 13th, 2015,
+<a href="constitution.1.7">Version 1.7</a> ratified on August 14th, 2016,
+<a href="constitution.1.8">Version 1.8</a> ratified on January 28th, 2022,
+and the <a href="constitution">current version 1.9</a> ratified on March 26th,
+2022.</p>
<h2>1. Introduction</h2>
@@ -635,7 +640,7 @@
<h2>9. Software in the Public Interest</h2>
-<p><a href="http://www.spi-inc.org/";>SPI</a> and Debian are separate
+<p><a href="https://www.spi-inc.org/";>SPI</a> and Debian are separate
organisations who share some goals. Debian is grateful for the legal
support framework offered by SPI. <cite>Debian's Developers are
currently members of SPI by virtue of their status as
diff -Nru doc-debian-6.5/doc/constitution.1.1.wml doc-debian-11.1/doc/constitution.1.1.wml
--- doc-debian-6.5/doc/constitution.1.1.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/constitution.1.1.wml 2023-05-04 06:52:19.000000000 +0200
@@ -1,14 +1,22 @@
<h1>Historical version of the Constitution for the Debian Project (v1.1)</h1>
-<p>Version 1.1 ratified on June 21st, 2003. Supersedes
+<p>Version 1.1 ratified on June 21st, 2003.</p>
+
+<p>Superseded by
+<a href="constitution.1.2">Version 1.2</a> ratified on October 29th, 2003,
+<a href="constitution.1.3">Version 1.3</a> ratified on September 24th, 2006,
+<a href="constitution.1.4">Version 1.4</a> ratified on October 7th, 2007,
+<a href="constitution.1.5">Version 1.5</a> ratified on January 9th, 2015,
+<a href="constitution.1.6">Version 1.6</a> ratified on December 13th, 2015,
+<a href="constitution.1.7">Version 1.7</a> ratified on August 14th, 2016,
+<a href="constitution.1.8">Version 1.8</a> ratified on January 28th, 2022,
+and the <a href="constitution">current version 1.9</a> ratified on March 26th,
+2022.</p>
+
+<p>Supersedes
<a href="constitution.1.0">Version 1.0</a> ratified on December 2nd,
-1998. Superseded by <a href="constitution.1.2">version 1.2</a>, ratified on October
-29th, 2003, which was again superseded by <a href="constitution.1.3">version 1.3</a>
-ratified on September 24th, 2006.
-That was superseded by the <a href="constitution">current version, 1.4</a>
-ratified on October 7th, 2007.
-</p>
+1998.</p>
<h2>1. Introduction</h2>
@@ -641,7 +649,7 @@
<h2>9. Software in the Public Interest</h2>
-<p><a href="http://www.spi-inc.org/";>SPI</a> and Debian are separate
+<p><a href="https://www.spi-inc.org/";>SPI</a> and Debian are separate
organisations who share some goals.
Debian is grateful for the legal support framework offered by SPI.
<cite>Debian's Developers are currently members of SPI by virtue of
diff -Nru doc-debian-6.5/doc/constitution.1.2.wml doc-debian-11.1/doc/constitution.1.2.wml
--- doc-debian-6.5/doc/constitution.1.2.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/constitution.1.2.wml 2023-05-04 06:52:19.000000000 +0200
@@ -1,15 +1,22 @@
<h1>Historical version of the Constitution for the Debian Project (v1.2)</h1>
-<p>Version 1.2 ratified on October 29th, 2003. Supersedes
-<a href="constitution.1.1">Version 1.1</a> ratified on June 21st,
-2003, which itself supersedes <a href="constitution.1.0">Version 1.0</a>
-ratified on December 2nd, 1998.
-Superseded by <a href="constitution.1.3">version 1.3</a>, ratified on September
-24th, 2006.
-That was superseded by the <a href="constitution">current version, 1.4</a>
-ratified on October 7th, 2007.
-</p>
+<p>Version 1.2 ratified on October 29th, 2003.</p>
+
+<p>Superseded by
+<a href="constitution.1.3">Version 1.3</a> ratified on September 24th, 2006,
+<a href="constitution.1.4">Version 1.4</a> ratified on October 7th, 2007,
+<a href="constitution.1.5">Version 1.5</a> ratified on January 9th, 2015,
+<a href="constitution.1.6">Version 1.6</a> ratified on December 13th, 2015,
+<a href="constitution.1.7">Version 1.7</a> ratified on August 14th, 2016,
+<a href="constitution.1.8">Version 1.8</a> ratified on January 28th, 2022,
+and the <a href="constitution">current version 1.9</a> ratified on March 26th,
+2022.</p>
+
+<p>Supersedes
+<a href="constitution.1.1">Version 1.1</a> ratified on June 21st, 2003,
+and <a href="constitution.1.0">Version 1.0</a> ratified on December 2nd,
+1998.</p>
<h2>1. Introduction</h2>
@@ -655,7 +662,7 @@
<h2>9. Software in the Public Interest</h2>
-<p><a href="http://www.spi-inc.org/";>SPI</a> and Debian are separate
+<p><a href="https://www.spi-inc.org/";>SPI</a> and Debian are separate
organisations who share some goals.
Debian is grateful for the legal support framework offered by SPI.
<cite>Debian's Developers are currently members of SPI by virtue of
diff -Nru doc-debian-6.5/doc/constitution.1.3.wml doc-debian-11.1/doc/constitution.1.3.wml
--- doc-debian-6.5/doc/constitution.1.3.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/constitution.1.3.wml 2023-05-04 06:52:19.000000000 +0200
@@ -1,15 +1,22 @@
<h1>Historical version of the Constitution for the Debian Project (v1.3)</h1>
-<p>Version 1.3 ratified on September 24th, 2006. Supersedes
-<a href="constitution.1.2">Version 1.2</a> ratified on October 29th,
-2003 and
-<a href="constitution.1.1">Version 1.1</a> ratified on June 21st,
-2003, which itself supersedes <a href="constitution.1.0">Version 1.0</a>
-ratified on December 2nd, 1998.
-That was superseded by the <a href="constitution">current version, 1.4</a>
-ratified on October 7th, 2007.
-</p>
+<p>Version 1.3 ratified on September 24th, 2006.</p>
+
+<p>Superseded by
+<a href="constitution.1.4">Version 1.4</a> ratified on October 7th, 2007,
+<a href="constitution.1.5">Version 1.5</a> ratified on January 9th, 2015,
+<a href="constitution.1.6">Version 1.6</a> ratified on December 13th, 2015,
+<a href="constitution.1.7">Version 1.7</a> ratified on August 14th, 2016,
+<a href="constitution.1.8">Version 1.8</a> ratified on January 28th, 2022,
+and the <a href="constitution">current version 1.9</a> ratified on March 26th,
+2022.</p>
+
+<p>Supersedes
+<a href="constitution.1.2">Version 1.2</a> ratified on October 29th, 2003,
+<a href="constitution.1.1">Version 1.1</a> ratified on June 21st, 2003,
+and <a href="constitution.1.0">Version 1.0</a> ratified on December 2nd,
+1998.</p>
<toc-display />
@@ -685,7 +692,7 @@
property and monies for the Debian Project. SPI was created in
the U.S. to hold money in trust there.</p>
-<p><a href="http://www.spi-inc.org/";>SPI</a> and Debian are separate
+<p><a href="https://www.spi-inc.org/";>SPI</a> and Debian are separate
organisations who share some goals.
Debian is grateful for the legal support framework offered by SPI.</p>
diff -Nru doc-debian-6.5/doc/constitution.1.4.wml doc-debian-11.1/doc/constitution.1.4.wml
--- doc-debian-6.5/doc/constitution.1.4.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/constitution.1.4.wml 2023-05-04 06:52:19.000000000 +0200
@@ -1,19 +1,26 @@
-<h1>Constitution for the Debian Project (v1.4)</h1>
-
+<h1>Historical version of the Constitution for the Debian Project (v1.4)</h1>
-<p>Version 1.4 ratified on October 7th, 2007. Supersedes
-<a href="constitution.1.3">Version 1.3</a> ratified on September 24th,
-2006,
-<a href="constitution.1.2">Version 1.2</a> ratified on October 29th,
-2003 and
-<a href="constitution.1.1">Version 1.1</a> ratified on June 21st,
-2003, which itself supersedes <a href="constitution.1.0">Version 1.0</a>
-ratified on December 2nd, 1998.</p>
+<p>Version 1.4 ratified on October 7th, 2007.</p>
+
+<p>Superseded by
+<a href="constitution.1.5">Version 1.5</a> ratified on January 9th, 2015,
+<a href="constitution.1.6">Version 1.6</a> ratified on December 13th, 2015,
+<a href="constitution.1.7">Version 1.7</a> ratified on August 14th, 2016,
+<a href="constitution.1.8">Version 1.8</a> ratified on January 28th, 2022,
+and the <a href="constitution">current version 1.9</a> ratified on March 26th,
+2022.</p>
+
+<p>Supersedes
+<a href="constitution.1.3">Version 1.3</a> ratified on September 24th, 2006,
+<a href="constitution.1.2">Version 1.2</a> ratified on October 29th, 2003,
+<a href="constitution.1.1">Version 1.1</a> ratified on June 21st, 2003,
+and <a href="constitution.1.0">Version 1.0</a> ratified on December 2nd,
+1998.</p>
<toc-display />
-<h2><toc-add-entry name="item-1">1. Introduction</toc-add-entry></h2>
+<toc-add-entry name="item-1">1. Introduction</toc-add-entry>
<p><cite>The Debian Project is an association of individuals who have
made common cause to create a free operating system.</cite></p>
@@ -23,7 +30,7 @@
Project or how it achieves them, or contain any policies except those
directly related to the decision-making process.</p>
-<h2><toc-add-entry name="item-2">2. Decision-making bodies and individuals</toc-add-entry></h2>
+<toc-add-entry name="item-2">2. Decision-making bodies and individuals</toc-add-entry>
<p>Each decision in the Project is made by one or more of the
following:</p>
@@ -76,7 +83,7 @@
</li>
</ol>
-<h2><toc-add-entry name="item-3">3. Individual Developers</toc-add-entry></h2>
+<toc-add-entry name="item-3">3. Individual Developers</toc-add-entry>
<h3>3.1. Powers</h3>
@@ -117,7 +124,7 @@
<p>Developers may make these decisions as they see fit.</p>
-<h2><toc-add-entry name="item-4">4. The Developers by way of General Resolution or election</toc-add-entry></h2>
+<toc-add-entry name="item-4">4. The Developers by way of General Resolution or election</toc-add-entry>
<h3>4.1. Powers</h3>
@@ -255,7 +262,7 @@
</li>
</ol>
-<h2><toc-add-entry name="item-5">5. Project Leader</toc-add-entry></h2>
+<toc-add-entry name="item-5">5. Project Leader</toc-add-entry>
<h3>5.1. Powers</h3>
@@ -393,7 +400,7 @@
<p>The Project Leader should avoid overemphasizing their own point of
view when making decisions in their capacity as Leader.</p>
-<h2><toc-add-entry name="item-6">6. Technical committee</toc-add-entry></h2>
+<toc-add-entry name="item-6">6. Technical committee</toc-add-entry>
<h3>6.1. Powers</h3>
@@ -583,7 +590,7 @@
</li>
</ol>
-<h2><toc-add-entry name="item-7">7. The Project Secretary</toc-add-entry></h2>
+<toc-add-entry name="item-7">7. The Project Secretary</toc-add-entry>
<h3>7.1. Powers</h3>
@@ -645,7 +652,7 @@
make decisions only when absolutely necessary and only when consistent
with the consensus of the Developers.</p>
-<h2><toc-add-entry name="item-8">8. The Project Leader's Delegates</toc-add-entry></h2>
+<toc-add-entry name="item-8">8. The Project Leader's Delegates</toc-add-entry>
<h3>8.1. Powers</h3>
@@ -674,7 +681,7 @@
<p>Delegates may make decisions as they see fit, but should attempt to
implement good technical decisions and/or follow consensus opinion.</p>
-<h2><toc-add-entry name="item-9">9. Assets held in trust for Debian</toc-add-entry></h2>
+<toc-add-entry name="item-9">9. Assets held in trust for Debian</toc-add-entry>
<p>In most jurisdictions around the world, the Debian project is not
in a position to directly hold funds or other property. Therefore,
@@ -685,7 +692,7 @@
property and monies for the Debian Project. SPI was created in
the U.S. to hold money in trust there.</p>
-<p><a href="http://www.spi-inc.org/";>SPI</a> and Debian are separate
+<p><a href="https://www.spi-inc.org/";>SPI</a> and Debian are separate
organisations who share some goals.
Debian is grateful for the legal support framework offered by SPI.</p>
@@ -738,7 +745,7 @@
that includes the commitments those organisations have made as
to how those assets will be handled.</p>
-<h2><toc-add-entry name="item-A">A. Standard Resolution Procedure</toc-add-entry></h2>
+<toc-add-entry name="item-A">A. Standard Resolution Procedure</toc-add-entry>
<p>These rules apply to communal decision-making by committees and
plebiscites, where stated above.</p>
@@ -957,7 +964,7 @@
supermajority and/or the quorum (and default option) to be
used.</cite></p>
-<h2><toc-add-entry name="item-B">B. Use of language and typography</toc-add-entry></h2>
+<toc-add-entry name="item-B">B. Use of language and typography</toc-add-entry>
<p>The present indicative (<q>is</q>, for example) means that the statement
is a rule in this constitution. <q>May</q> or <q>can</q> indicates that the
diff -Nru doc-debian-6.5/doc/constitution.1.5.wml doc-debian-11.1/doc/constitution.1.5.wml
--- doc-debian-6.5/doc/constitution.1.5.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/constitution.1.5.wml 2023-05-04 06:52:19.000000000 +0200
@@ -1,23 +1,22 @@
<h1>Historical version of the Constitution for the Debian Project (v1.5)</h1>
-<p>Version 1.5 ratified on January 9th, 2015. Supersedes
-<a href="constitution.1.4">Version 1.4</a> ratified on October 7th, 2007,
-<a href="constitution.1.3">Version 1.3</a> ratified on September 24th,
-2006,
-<a href="constitution.1.2">Version 1.2</a> ratified on October 29th,
-2003 and
-<a href="constitution.1.1">Version 1.1</a> ratified on June 21st,
-2003, which itself supersedes <a href="constitution.1.0">Version 1.0</a>
-ratified on December 2nd, 1998.
-That was superseded by the
-<a href="constitution.1.6">version 1.6</a>, ratified on December 13th, 2015.
-That was superseeded by the <a href="constitution">current version 1.7</a>,
-ratified on August 14th, 2016.
-</p>
+<p>Version 1.5 ratified on January 9th, 2015.</p>
+<p>Superseded by
+<a href="constitution.1.6">Version 1.6</a> ratified on December 13th, 2015,
+<a href="constitution.1.7">Version 1.7</a> ratified on August 14th, 2016,
+<a href="constitution.1.8">Version 1.8</a> ratified on January 28th, 2022,
+and the <a href="constitution">current version 1.9</a> ratified on March 26th,
+2022.</p>
-</p>
+<p>Supersedes
+<a href="constitution.1.4">Version 1.4</a> ratified on October 7th, 2007,
+<a href="constitution.1.3">Version 1.3</a> ratified on September 24th, 2006,
+<a href="constitution.1.2">Version 1.2</a> ratified on October 29th, 2003,
+<a href="constitution.1.1">Version 1.1</a> ratified on June 21st, 2003,
+and <a href="constitution.1.0">Version 1.0</a> ratified on December 2nd,
+1998.</p>
<toc-display />
@@ -719,7 +718,7 @@
property and monies for the Debian Project. SPI was created in
the U.S. to hold money in trust there.</p>
-<p><a href="http://www.spi-inc.org/";>SPI</a> and Debian are separate
+<p><a href="https://www.spi-inc.org/";>SPI</a> and Debian are separate
organisations who share some goals.
Debian is grateful for the legal support framework offered by SPI.</p>
diff -Nru doc-debian-6.5/doc/constitution.1.6.wml doc-debian-11.1/doc/constitution.1.6.wml
--- doc-debian-6.5/doc/constitution.1.6.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/constitution.1.6.wml 2023-05-04 06:45:12.000000000 +0200
@@ -1,7 +1,7 @@
<h1>Historical version of the Constitution for the Debian Project (v1.6)</h1>
-<p>Version 1.6</a> ratified on December 13th, 2015. Supersedes
+<p>Version 1.6 ratified on December 13th, 2015. Supersedes
<a href="constitution.1.5">Version 1.5</a> ratified on January 9th, 2015,
<a href="constitution.1.4">Version 1.4</a> ratified on October 7th, 2007,
<a href="constitution.1.3">Version 1.3</a> ratified on September 24th,
@@ -11,7 +11,7 @@
<a href="constitution.1.1">Version 1.1</a> ratified on June 21st,
2003, which itself supersedes <a href="constitution.1.0">Version 1.0</a>
ratified on December 2nd, 1998.
-Superseeded by the <a href="constitution">current version 1.7</a>,
+Superseded by the <a href="constitution">current version 1.7</a>,
ratified on August 14th, 2016.
</p>
@@ -715,7 +715,7 @@
property and monies for the Debian Project. SPI was created in
the U.S. to hold money in trust there.</p>
-<p><a href="http://www.spi-inc.org/";>SPI</a> and Debian are separate
+<p><a href="https://www.spi-inc.org/";>SPI</a> and Debian are separate
organisations who share some goals.
Debian is grateful for the legal support framework offered by SPI.</p>
diff -Nru doc-debian-6.5/doc/constitution.1.7.wml doc-debian-11.1/doc/constitution.1.7.wml
--- doc-debian-6.5/doc/constitution.1.7.wml 1970-01-01 01:00:00.000000000 +0100
+++ doc-debian-11.1/doc/constitution.1.7.wml 2023-05-04 06:52:20.000000000 +0200
@@ -0,0 +1,1002 @@
+
+<h1>Historical version of the Constitution for the Debian Project (v1.7)</h1>
+
+<p>Version 1.7 ratified on August 14th, 2016.</p>
+
+<p>Superseded by
+<a href="constitution.1.8">Version 1.8</a> ratified on January 28th, 2022,
+and the <a href="constitution">current version 1.9</a> ratified on March 26th,
+2022.</p>
+
+<p>Supersedes
+<a href="constitution.1.6">Version 1.6</a> ratified on December 13th, 2015,
+<a href="constitution.1.5">Version 1.5</a> ratified on January 9th, 2015,
+<a href="constitution.1.4">Version 1.4</a> ratified on October 7th, 2007,
+<a href="constitution.1.3">Version 1.3</a> ratified on September 24th, 2006,
+<a href="constitution.1.2">Version 1.2</a> ratified on October 29th, 2003,
+<a href="constitution.1.1">Version 1.1</a> ratified on June 21st, 2003,
+and <a href="constitution.1.0">Version 1.0</a> ratified on December 2nd,
+1998.</p>
+
+<toc-display />
+
+<toc-add-entry name="item-1">1. Introduction</toc-add-entry>
+
+<p><cite>The Debian Project is an association of individuals who have
+made common cause to create a free operating system.</cite></p>
+
+<p>This document describes the organisational structure for formal
+decision-making in the Project. It does not describe the goals of the
+Project or how it achieves them, or contain any policies except those
+directly related to the decision-making process.</p>
+
+<toc-add-entry name="item-2">2. Decision-making bodies and individuals</toc-add-entry>
+
+<p>Each decision in the Project is made by one or more of the
+following:</p>
+
+<ol>
+ <li>The Developers, by way of General Resolution or an election;</li>
+
+ <li>The Project Leader;</li>
+
+ <li>The Technical Committee and/or its Chair;</li>
+
+ <li>The individual Developer working on a particular task;</li>
+
+ <li>Delegates appointed by the Project Leader for specific
+ tasks;</li>
+
+ <li>The Project Secretary.</li>
+</ol>
+
+<p>Most of the remainder of this document will outline the powers of
+these bodies, their composition and appointment, and the procedure for
+their decision-making. The powers of a person or body may be subject to
+review and/or limitation by others; in this case the reviewing body or
+person's entry will state this. <cite>In the list above, a person or
+body is usually listed before any people or bodies whose decisions they
+can overrule or who they (help) appoint - but not everyone listed
+earlier can overrule everyone listed later.</cite></p>
+
+<h3>2.1. General rules</h3>
+
+<ol>
+ <li>
+ <p>Nothing in this constitution imposes an obligation on anyone to
+ do work for the Project. A person who does not want to do a task
+ which has been delegated or assigned to them does not need to do
+ it. However, they must not actively work against these rules and
+ decisions properly made under them.</p>
+ </li>
+
+ <li>
+ <p>A person may hold several posts, except that the Project Leader,
+ Project Secretary and the Chair of the Technical Committee must
+ be distinct, and that the Leader cannot appoint themselves as their
+ own Delegate.</p>
+ </li>
+
+ <li>
+ <p>A person may leave the Project or resign from a particular post
+ they hold, at any time, by stating so publicly.</p>
+ </li>
+</ol>
+
+<toc-add-entry name="item-3">3. Individual Developers</toc-add-entry>
+
+<h3>3.1. Powers</h3>
+
+<p>An individual Developer may</p>
+
+<ol>
+ <li>make any technical or nontechnical decision with regard to their
+ own work;</li>
+
+ <li>propose or sponsor draft General Resolutions;</li>
+
+ <li>propose themselves as a Project Leader candidate in
+ elections;</li>
+
+ <li>vote on General Resolutions and in Leadership elections.</li>
+</ol>
+
+<h3>3.2. Composition and appointment</h3>
+
+<ol>
+ <li>
+ <p>Developers are volunteers who agree to further the aims of the
+ Project insofar as they participate in it, and who maintain
+ package(s) for the Project or do other work which the Project
+ Leader's Delegate(s) consider worthwhile.</p>
+ </li>
+
+ <li>
+ <p>The Project Leader's Delegate(s) may choose not to admit new
+ Developers, or expel existing Developers. <cite>If the Developers
+ feel that the Delegates are abusing their authority they can of
+ course override the decision by way of General Resolution - see
+ §4.1(3), §4.2.</cite></p>
+ </li>
+</ol>
+
+<h3>3.3. Procedure</h3>
+
+<p>Developers may make these decisions as they see fit.</p>
+
+<toc-add-entry name="item-4">4. The Developers by way of General Resolution or election</toc-add-entry>
+
+<h3>4.1. Powers</h3>
+
+<p>Together, the Developers may:</p>
+
+<ol>
+ <li>
+ <p>Appoint or recall the Project Leader.</p>
+ </li>
+
+ <li>
+ <p>Amend this constitution, provided they agree with a 3:1
+ majority.</p>
+ </li>
+
+ <li>
+ <p>Make or override any decision authorised by the powers of the Project
+ Leader or a Delegate.</p>
+ </li>
+
+ <li>
+ <p>Make or override any decision authorised by the powers of the Technical
+ Committee, provided they agree with a 2:1 majority.</p>
+ </li>
+
+ <li>
+ <p>Issue, supersede and withdraw nontechnical policy documents and
+ statements.</p>
+
+ <p>These include documents describing the goals of the project, its
+ relationship with other free software entities, and nontechnical
+ policies such as the free software licence terms that Debian
+ software must meet.</p>
+
+ <p>They may also include position statements about issues of the
+ day.</p>
+
+ <ol style="list-style: decimal;">
+ <li>A Foundation Document is a document or statement regarded as
+ critical to the Project's mission and purposes.</li>
+ <li>The Foundation Documents are the works entitled <q>Debian
+ Social Contract</q> and <q>Debian Free Software Guidelines</q>.</li>
+ <li>A Foundation Document requires a 3:1 majority for its
+ supersession. New Foundation Documents are issued and
+ existing ones withdrawn by amending the list of Foundation
+ Documents in this constitution.</li>
+ </ol>
+
+ </li>
+
+ <li>
+ <p>Make decisions about property held in trust for purposes
+ related to Debian. (See §9.).</p>
+ </li>
+
+ <li>
+ <p>In case of a disagreement between the project leader and
+ the incumbent secretary, appoint a new secretary.</p>
+ </li>
+</ol>
+
+<h3>4.2. Procedure</h3>
+
+<ol>
+ <li>
+ <p>The Developers follow the Standard Resolution Procedure, below.
+ A resolution or amendment is introduced if proposed by any
+ Developer and sponsored by at least K other Developers, or if
+ proposed by the Project Leader or the Technical Committee.</p>
+ </li>
+
+ <li>
+ <p>Delaying a decision by the Project Leader or their Delegate:</p>
+
+ <ol>
+ <li>If the Project Leader or their Delegate, or the Technical
+ Committee, has made a decision, then Developers can override them
+ by passing a resolution to do so; see §4.1(3).</li>
+
+ <li>If such a resolution is sponsored by at least 2K Developers,
+ or if it is proposed by the Technical Committee, the resolution
+ puts the decision immediately on hold (provided that resolution
+ itself says so).</li>
+
+ <li>If the original decision was to change a discussion period or
+ a voting period, or the resolution is to override the Technical
+ Committee, then only K Developers need to sponsor the resolution
+ to be able to put the decision immediately on hold.</li>
+
+ <li>If the decision is put on hold, an immediate vote is held to
+ determine whether the decision will stand until the full vote on
+ the decision is made or whether the implementation of the
+ original decision will be delayed until then. There is no
+ quorum for this immediate procedural vote.</li>
+
+ <li>If the Project Leader (or the Delegate) withdraws the
+ original decision, the vote becomes moot, and is no longer
+ conducted.</li>
+ </ol>
+ </li>
+
+ <li>
+ <p>
+ Votes are taken by the Project Secretary. Votes, tallies, and
+ results are not revealed during the voting period; after the
+ vote the Project Secretary lists all the votes cast. The voting
+ period is 2 weeks, but may be varied by up to 1 week by the
+ Project Leader.
+ </p>
+ </li>
+
+ <li>
+ <p>The minimum discussion period is 2 weeks, but may be varied by
+ up to 1 week by the Project Leader. The Project Leader has a
+ casting vote. There is a quorum of 3Q.</p>
+ </li>
+
+ <li>
+ <p>Proposals, sponsors, amendments, calls for votes and other
+ formal actions are made by announcement on a publicly-readable
+ electronic mailing list designated by the Project Leader's
+ Delegate(s); any Developer may post there.</p>
+ </li>
+
+ <li>
+ <p>Votes are cast by email in a manner suitable to the Secretary.
+ The Secretary determines for each poll whether voters can change
+ their votes.</p>
+ </li>
+
+ <li>
+ <p>Q is half of the square root of the number of current
+ Developers. K is Q or 5, whichever is the smaller. Q and K need not
+ be integers and are not rounded.</p>
+ </li>
+</ol>
+
+<toc-add-entry name="item-5">5. Project Leader</toc-add-entry>
+
+<h3>5.1. Powers</h3>
+
+<p>The <a href="leader">Project Leader</a> may:</p>
+
+<ol>
+ <li>
+ <p>Appoint Delegates or delegate decisions to the Technical
+ Committee.</p>
+
+ <p>The Leader may define an area of ongoing responsibility or a
+ specific decision and hand it over to another Developer or to the
+ Technical Committee.</p>
+
+ <p>Once a particular decision has been delegated and made the
+ Project Leader may not withdraw that delegation; however, they may
+ withdraw an ongoing delegation of particular area of
+ responsibility.</p>
+ </li>
+
+ <li>
+ <p>Lend authority to other Developers.</p>
+
+ <p>The Project Leader may make statements of support for points of
+ view or for other members of the project, when asked or otherwise;
+ these statements have force if and only if the Leader would be
+ empowered to make the decision in question.</p>
+ </li>
+
+ <li>
+ <p>Make any decision which requires urgent action.</p>
+
+ <p>This does not apply to decisions which have only become
+ gradually urgent through lack of relevant action, unless there is a
+ fixed deadline.</p>
+ </li>
+
+ <li>
+ <p>Make any decision for whom noone else has responsibility.</p>
+ </li>
+
+ <li>
+ <p>Propose draft General Resolutions and amendments.</p>
+ </li>
+
+ <li>
+ <p>Together with the Technical Committee, appoint new members to
+ the Committee. (See §6.2.)</p>
+ </li>
+
+ <li>
+ <p>Use a casting vote when Developers vote.</p>
+
+ <p>The Project Leader also has a normal vote in such ballots.</p>
+ </li>
+
+ <li>
+ <p>Vary the discussion period for Developers' votes (as above).</p>
+ </li>
+
+ <li>
+ <p>Lead discussions amongst Developers.</p>
+
+ <p>The Project Leader should attempt to participate in discussions
+ amongst the Developers in a helpful way which seeks to bring the
+ discussion to bear on the key issues at hand. The Project Leader
+ should not use the Leadership position to promote their own
+ personal views.</p>
+ </li>
+
+ <li>
+ <p>In consultation with the developers, make decisions affecting
+ property held in trust for purposes related to Debian. (See
+ §9.). Such decisions are communicated to the members by the
+ Project Leader or their Delegate(s). Major expenditures
+ should be proposed and debated on the mailing list before
+ funds are disbursed.</p>
+ </li>
+ <li>
+ <p>Add or remove organizations from the list of trusted
+ organizations (see §9.3) that are authorized to accept and
+ hold assets for Debian. The evaluation and discussion leading
+ up to such a decision occurs on an electronic mailing list
+ designated by the Project Leader or their Delegate(s), on
+ which any developer may post. There is a minimum discussion
+ period of two weeks before an organization may be added to
+ the list of trusted organizations.</p>
+ </li>
+</ol>
+
+<h3>5.2. Appointment</h3>
+
+<ol>
+ <li>The Project Leader is elected by the Developers.</li>
+
+ <li>The election begins six weeks before the leadership post becomes
+ vacant, or (if it is too late already) immediately.</li>
+
+ <li>For the first week any Developer may nominate
+ themselves as a candidate Project Leader, and summarize their plans for their term.</li>
+
+ <li>For three weeks after that no more candidates may be nominated;
+ candidates should use this time for campaigning and discussion. If
+ there are no candidates at the end of the nomination period then the
+ nomination period is extended for an additional week, repeatedly if
+ necessary.</li>
+
+ <li>The next two weeks are the polling period during which
+ Developers may cast their votes. Votes in leadership elections are
+ kept secret, even after the election is finished.</li>
+
+ <li>The options on the ballot will be those candidates who have
+ nominated themselves and have not yet withdrawn, plus None Of The
+ Above. If None Of The Above wins the election then the election
+ procedure is repeated, many times if necessary.</li>
+
+ <li>
+ The decision will be made using the method specified in section
+ §A.6 of the Standard Resolution Procedure. The quorum is the
+ same as for a General Resolution (§4.2) and the default
+ option is <q>None Of The Above</q>.
+ </li>
+
+ <li>The Project Leader serves for one year from their election.</li>
+</ol>
+
+<h3>5.3. Procedure</h3>
+
+<p>The Project Leader should attempt to make decisions which are
+consistent with the consensus of the opinions of the Developers.</p>
+
+<p>Where practical the Project Leader should informally solicit the
+views of the Developers.</p>
+
+<p>The Project Leader should avoid overemphasizing their own point of
+view when making decisions in their capacity as Leader.</p>
+
+<toc-add-entry name="item-6">6. Technical committee</toc-add-entry>
+
+<h3>6.1. Powers</h3>
+
+<p>The <a href="tech-ctte">Technical Committee</a> may:</p>
+
+<ol>
+ <li>
+ <p>Decide on any matter of technical policy.</p>
+
+ <p>This includes the contents of the technical policy manuals,
+ developers' reference materials, example packages and the behaviour
+ of non-experimental package building tools. (In each case the usual
+ maintainer of the relevant software or documentation makes
+ decisions initially, however; see 6.3(5).)</p>
+ </li>
+
+ <li>
+ <p>Decide any technical matter where Developers' jurisdictions
+ overlap.</p>
+
+ <p>In cases where Developers need to implement compatible
+ technical policies or stances (for example, if they disagree about
+ the priorities of conflicting packages, or about ownership of a
+ command name, or about which package is responsible for a bug that
+ both maintainers agree is a bug, or about who should be the
+ maintainer for a package) the technical committee may decide the
+ matter.</p>
+ </li>
+
+ <li>
+ <p>Make a decision when asked to do so.</p>
+
+ <p>Any person or body may delegate a decision of their own to the
+ Technical Committee, or seek advice from it.</p>
+ </li>
+
+ <li>
+ <p>Overrule a Developer (requires a 3:1 majority).</p>
+
+ <p>The Technical Committee may ask a Developer to take a
+ particular technical course of action even if the Developer does
+ not wish to; this requires a 3:1 majority. For example, the
+ Committee may determine that a complaint made by the submitter of a
+ bug is justified and that the submitter's proposed solution should
+ be implemented.</p>
+ </li>
+
+ <li>
+ <p>Offer advice.</p>
+
+ <p>The Technical Committee may make formal announcements about its
+ views on any matter. <cite>Individual members may of course make
+ informal statements about their views and about the likely views of
+ the committee.</cite></p>
+ </li>
+
+ <li>
+ <p>Together with the Project Leader, appoint new members to itself
+ or remove existing members. (See §6.2.)</p>
+ </li>
+
+ <li>
+ <p>Appoint the Chair of the Technical Committee.</p>
+
+ <p>
+ The Chair is elected by the Committee from its members. All
+ members of the committee are automatically nominated; the
+ committee votes starting one week before the post will become
+ vacant (or immediately, if it is already too late). The members
+ may vote by public acclamation for any fellow committee member,
+ including themselves; there is no default option. The vote
+ finishes when all the members have voted, or when the voting
+ period has ended. The result is determined using the method
+ specified in section A.6 of the Standard Resolution Procedure.
+ </p>
+ </li>
+
+ <li>
+ <p>The Chair can stand in for the Leader, together with the
+ Secretary</p>
+
+ <p>As detailed in §7.1(2), the Chair of the Technical
+ Committee and the Project Secretary may together stand in for the
+ Leader if there is no Leader.</p>
+ </li>
+</ol>
+
+<h3>6.2. Composition</h3>
+
+<ol>
+ <li>
+ <p>The Technical Committee consists of up to 8 Developers, and
+ should usually have at least 4 members.</p>
+ </li>
+
+ <li>
+ <p>When there are fewer than 8 members the Technical Committee may
+ recommend new member(s) to the Project Leader, who may choose
+ (individually) to appoint them or not.</p>
+ </li>
+
+ <li>
+ <p>When there are 5 members or fewer the Technical Committee may
+ appoint new member(s) until the number of members reaches 6.</p>
+ </li>
+
+ <li>
+ <p>When there have been 5 members or fewer for at least one week
+ the Project Leader may appoint new member(s) until the number of
+ members reaches 6, at intervals of at least one week per
+ appointment.</p>
+ </li>
+
+ <li>
+ <p>A Developer is not eligible to be (re)appointed to the Technical
+ Committee if they have been a member within the previous 12
+ months.</p>
+ </li>
+
+ <li>
+ <p>If the Technical Committee and the Project Leader agree they
+ may remove or replace an existing member of the Technical
+ Committee.</p>
+ </li>
+
+ <li>
+ <p>Term limit:</p>
+ <ol>
+ <li>
+ <p>On January 1st of each year the term of any Committee member
+ who has served more than 42 months (3.5 years) and who is one
+ of the two most senior members is set to expire on December
+ 31st of that year.</p>
+ </li>
+ <li>
+ <p>A member of the Technical Committee is said to be more
+ senior than another if they were appointed earlier, or were
+ appointed at the same time and have been a member of the
+ Debian Project longer. In the event that a member has been
+ appointed more than once, only the most recent appointment is
+ relevant.</p>
+ </li>
+ </ol>
+ </li>
+</ol>
+
+<h3>6.3. Procedure</h3>
+
+<ol>
+ <li>
+ <p>The Technical Committee uses the Standard Resolution
+ Procedure.</p>
+
+ <p>A draft resolution or amendment may be proposed by any member
+ of the Technical Committee. There is no minimum discussion period;
+ the voting period lasts for up to one week, or until the outcome is
+ no longer in doubt. Members may change their votes. There is a
+ quorum of two.</p>
+ </li>
+
+ <li>
+ <p>Details regarding voting</p>
+
+ <p>The Chair has a casting vote. When the Technical Committee
+ votes whether to override a Developer who also happens to be a
+ member of the Committee, that member may not vote (unless they are
+ the Chair, in which case they may use only their casting
+ vote).</p>
+ </li>
+
+ <li>
+ <p>Public discussion and decision-making.</p>
+
+ <p>Discussion, draft resolutions and amendments, and votes by
+ members of the committee, are made public on the Technical
+ Committee public discussion list. There is no separate secretary
+ for the Committee.</p>
+ </li>
+
+ <li>
+ <p>Confidentiality of appointments.</p>
+
+ <p>The Technical Committee may hold confidential discussions via
+ private email or a private mailing list or other means to discuss
+ appointments to the Committee. However, votes on appointments must
+ be public.</p>
+ </li>
+
+ <li>
+ <p>No detailed design work.</p>
+
+ <p>The Technical Committee does not engage in design of new
+ proposals and policies. Such design work should be carried out by
+ individuals privately or together and discussed in ordinary
+ technical policy and design forums.</p>
+
+ <p>The Technical Committee restricts itself to choosing from or
+ adopting compromises between solutions and decisions which have
+ been proposed and reasonably thoroughly discussed elsewhere.</p>
+
+ <p><cite>Individual members of the technical committee may of
+ course participate on their own behalf in any aspect of design and
+ policy work.</cite></p>
+ </li>
+
+ <li>
+ <p>Technical Committee makes decisions only as last resort.</p>
+
+ <p>The Technical Committee does not make a technical decision
+ until efforts to resolve it via consensus have been tried and
+ failed, unless it has been asked to make a decision by the person
+ or body who would normally be responsible for it.</p>
+ </li>
+</ol>
+
+<toc-add-entry name="item-7">7. The Project Secretary</toc-add-entry>
+
+<h3>7.1. Powers</h3>
+
+<p>The <a href="secretary">Secretary</a>:</p>
+
+<ol>
+ <li>
+ <p>Takes votes amongst the Developers, and determines the number
+ and identity of Developers, whenever this is required by the
+ constitution.</p>
+ </li>
+
+ <li>
+ <p>Can stand in for the Leader, together with the Chair of the
+ Technical Committee.</p>
+
+ <p>If there is no Project Leader then the Chair of the
+ Technical Committee and the Project Secretary may by joint
+ agreement make decisions if they consider it imperative to do
+ so.</p>
+ </li>
+
+ <li>
+ <p>Adjudicates any disputes about interpretation of the
+ constitution.</p>
+ </li>
+
+ <li>
+ <p>May delegate part or all of their authority to someone else, or
+ withdraw such a delegation at any time.</p>
+ </li>
+</ol>
+
+<h3>7.2. Appointment</h3>
+
+<p>The Project Secretary is appointed by the Project Leader and the
+current Project Secretary.</p>
+
+<p>If the Project Leader and the current Project Secretary cannot agree
+on a new appointment, they must ask the Developers by way of
+General Resolution to appoint a Secretary.</p>
+
+<p>If there is no Project Secretary or the current Secretary is
+unavailable and has not delegated authority for a decision then the
+decision may be made or delegated by the Chair of the Technical
+Committee, as Acting Secretary.</p>
+
+<p>The Project Secretary's term of office is 1 year, at which point
+they or another Secretary must be (re)appointed.</p>
+
+<h3>7.3. Procedure</h3>
+
+<p>The Project Secretary should make decisions which are fair and
+reasonable, and preferably consistent with the consensus of the
+Developers.</p>
+
+<p>When acting together to stand in for an absent Project Leader the
+Chair of the Technical Committee and the Project Secretary should
+make decisions only when absolutely necessary and only when consistent
+with the consensus of the Developers.</p>
+
+<toc-add-entry name="item-8">8. The Project Leader's Delegates</toc-add-entry>
+
+<h3>8.1. Powers</h3>
+
+<p>The Project Leader's Delegates:</p>
+
+<ol>
+ <li>have powers delegated to them by the Project Leader;</li>
+
+ <li>may make certain decisions which the Leader may not make
+ directly, including approving or expelling Developers or designating
+ people as Developers who do not maintain packages. <cite>This is to
+ avoid concentration of power, particularly over membership as a
+ Developer, in the hands of the Project Leader.</cite></li>
+</ol>
+
+<h3>8.2. Appointment</h3>
+
+<p>The Delegates are appointed by the Project Leader and may be
+replaced by the Leader at the Leader's discretion. The Project Leader
+may not make the position as a Delegate conditional on particular
+decisions by the Delegate, nor may they override a decision made by a
+Delegate once made.</p>
+
+<h3>8.3. Procedure</h3>
+
+<p>Delegates may make decisions as they see fit, but should attempt to
+implement good technical decisions and/or follow consensus opinion.</p>
+
+<toc-add-entry name="item-9">9. Assets held in trust for Debian</toc-add-entry>
+
+<p>In most jurisdictions around the world, the Debian project is not
+in a position to directly hold funds or other property. Therefore,
+property has to be owned by any of a number of organisations as
+detailed in §9.2.</p>
+
+<p>Traditionally, SPI was the sole organisation authorized to hold
+property and monies for the Debian Project. SPI was created in
+the U.S. to hold money in trust there.</p>
+
+<p><a href="https://www.spi-inc.org/";>SPI</a> and Debian are separate
+organisations who share some goals.
+Debian is grateful for the legal support framework offered by SPI.</p>
+
+<h3>9.1. Relationship with Associated Organizations</h3>
+
+<ol>
+ <li>
+ <p>Debian Developers do not become agents or employees of
+ organisations holding assets in trust for Debian, or of
+ each other, or of persons in authority in the Debian Project,
+ solely by the virtue of being Debian Developers. A person
+ acting as a Developer does so as an individual, on their own
+ behalf. Such organisations may, of their own accord,
+ establish relationships with individuals who are also Debian
+ developers.</p>
+ </li>
+</ol>
+
+<h3>9.2. Authority</h3>
+
+<ol>
+ <li>
+ <p>An organisation holding assets for Debian has no authority
+ regarding Debian's technical or nontechnical decisions, except
+ that no decision by Debian with respect to any property held
+ by the organisation shall require it to act outside its legal
+ authority.</p>
+ </li>
+ <li>
+ <p>Debian claims no authority over an organisation that holds
+ assets for Debian other than that over the use of property
+ held in trust for Debian.</p>
+ </li>
+</ol>
+
+<h3>9.3. Trusted organisations</h3>
+
+<p>Any donations for the Debian Project must be made to any one of a
+set of organisations designated by the Project leader (or a
+delegate) to be authorized to handle assets to be used for the
+Debian Project.</p>
+
+<p>Organisations holding assets in trust for Debian should
+undertake reasonable obligations for the handling of such
+assets.</p>
+
+<p>Debian maintains a public List of Trusted Organisations that
+accept donations and hold assets in trust for Debian
+(including both tangible property and intellectual property)
+that includes the commitments those organisations have made as
+to how those assets will be handled.</p>
+
+<toc-add-entry name="item-A">A. Standard Resolution Procedure</toc-add-entry>
+
+<p>These rules apply to communal decision-making by committees and
+plebiscites, where stated above.</p>
+
+<h3>A.0. Proposal</h3>
+
+<p>The formal procedure begins when a draft resolution is proposed and
+sponsored, as required.</p>
+
+<h3>A.1. Discussion and Amendment</h3>
+
+<ol>
+ <li>Following the proposal, the resolution may be discussed.
+ Amendments may be made formal by being proposed and sponsored
+ according to the requirements for a new resolution, or directly by
+ the proposer of the original resolution.</li>
+
+ <li>A formal amendment may be accepted by the resolution's proposer,
+ in which case the formal resolution draft is immediately changed to
+ match.</li>
+
+ <li>If a formal amendment is not accepted, or one of the sponsors of
+ the resolution does not agree with the acceptance by the proposer of
+ a formal amendment, the amendment remains as an amendment and will be
+ voted on.</li>
+
+ <li>If an amendment accepted by the original proposer is not to the
+ liking of others, they may propose another amendment to reverse the
+ earlier change (again, they must meet the requirements for proposer
+ and sponsor(s).)</li>
+
+ <li>The proposer of a resolution may suggest changes to the wordings
+ of amendments; these take effect if the proposer of the amendment
+ agrees and none of the sponsors object. In this case the changed
+ amendments will be voted on instead of the originals.</li>
+
+ <li>The proposer of a resolution may make changes to correct minor
+ errors (for example, typographical errors or inconsistencies) or
+ changes which do not alter the meaning, providing noone objects
+ within 24 hours. In this case the minimum discussion period is not
+ restarted.</li>
+</ol>
+
+<h3>A.2. Calling for a vote</h3>
+
+<ol>
+ <li>The proposer or a sponsor of a motion or an amendment may call
+ for a vote, providing that the minimum discussion period (if any) has
+ elapsed.</li>
+
+ <li>
+ The proposer or any sponsor of a resolution may call for a vote on that
+ resolution and all related amendments.
+ </li>
+
+ <li>The person who calls for a vote states what they believe the
+ wordings of the resolution and any relevant amendments are, and
+ consequently what form the ballot should take. However, the final
+ decision on the form of ballot(s) is the Secretary's - see 7.1(1),
+ 7.1(3) and A.3(4).</li>
+
+ <li>
+ The minimum discussion period is counted from the time the last
+ formal amendment was accepted, or since the whole resolution
+ was proposed if no amendments have been proposed and accepted.
+ </li>
+</ol>
+
+<h3>A.3. Voting procedure</h3>
+
+<ol>
+ <li>
+ Each resolution and its related amendments is voted on in a
+ single ballot that includes an option for the original
+ resolution, each amendment, and the default option (where
+ applicable).
+ </li>
+
+ <li>
+ The default option must not have any supermajority requirements.
+ Options which do not have an explicit supermajority requirement
+ have a 1:1 majority requirement.
+ </li>
+
+ <li>
+ The votes are counted according to the rules in A.6. The
+ default option is <q>Further Discussion</q>, unless specified
+ otherwise.
+ </li>
+
+ <li>In cases of doubt the Project Secretary shall decide on matters
+ of procedure.</li>
+</ol>
+
+<h3>A.4. Withdrawing resolutions or unaccepted amendments</h3>
+
+<p>The proposer of a resolution or unaccepted amendment may withdraw
+it. In this case new proposers may come forward keep it alive, in which
+case the first person to do so becomes the new proposer and any others
+become sponsors if they aren't sponsors already.</p>
+
+<p>A sponsor of a resolution or amendment (unless it has been
+accepted) may withdraw.</p>
+
+<p>If the withdrawal of the proposer and/or sponsors means that a
+resolution has no proposer or not enough sponsors it will not be voted
+on unless this is rectified before the resolution expires.</p>
+
+<h3>A.5. Expiry</h3>
+
+<p>
+ If a proposed resolution has not been discussed, amended, voted on or
+ otherwise dealt with for 4 weeks the secretary may issue a statement
+ that the issue is being withdrawn. If none of the sponsors of any
+ of the proposals object within a week, the issue is withdrawn.
+</p>
+
+<p>
+ The secretary may also include suggestions on how to proceed,
+ if appropriate.
+</p>
+
+<h3>A.6. Vote Counting</h3>
+
+<ol>
+ <li> Each voter's ballot ranks the options being voted on. Not all
+ options need be ranked. Ranked options are considered
+ preferred to all unranked options. Voters may rank options
+ equally. Unranked options are considered to be ranked equally
+ with one another. Details of how ballots may be filled out
+ will be included in the Call For Votes.
+ </li>
+ <li> If the ballot has a quorum requirement R any options other
+ than the default option which do not receive at least R votes
+ ranking that option above the default option are dropped from
+ consideration.
+ </li>
+ <li> Any (non-default) option which does not defeat the default option
+ by its required majority ratio is dropped from consideration.
+ <ol>
+ <li>
+ Given two options A and B, V(A,B) is the number of voters
+ who prefer option A over option B.
+ </li>
+ <li>
+ An option A defeats the default option D by a majority
+ ratio N, if V(A,D) is greater or equal to N * V(D,A) and V(A,D) is strictly greater than V(D,A).
+ </li>
+ <li>
+ If a supermajority of S:1 is required for A, its majority ratio
+ is S; otherwise, its majority ratio is 1.
+ </li>
+ </ol>
+ </li>
+ <li> From the list of undropped options, we generate a list of
+ pairwise defeats.
+ <ol>
+ <li>
+ An option A defeats an option B, if V(A,B) is strictly greater
+ than V(B,A).
+ </li>
+ </ol>
+ </li>
+ <li> From the list of [undropped] pairwise defeats, we generate a
+ set of transitive defeats.
+ <ol>
+ <li>
+ An option A transitively defeats an option C if A defeats
+ C or if there is some other option B where A defeats B AND
+ B transitively defeats C.
+ </li>
+ </ol>
+ </li>
+ <li> We construct the Schwartz set from the set of transitive defeats.
+ <ol>
+ <li>
+ An option A is in the Schwartz set if for all options B,
+ either A transitively defeats B, or B does not transitively
+ defeat A.
+ </li>
+ </ol>
+ </li>
+ <li> If there are defeats between options in the Schwartz set,
+ we drop the weakest such defeats from the list of pairwise
+ defeats, and return to step 5.
+ <ol>
+ <li>
+ A defeat (A,X) is weaker than a defeat (B,Y) if V(A,X)
+ is less than V(B,Y). Also, (A,X) is weaker than (B,Y) if
+ V(A,X) is equal to V(B,Y) and V(X,A) is greater than V(Y,B).
+ </li>
+ <li>
+ A weakest defeat is a defeat that has no other defeat weaker
+ than it. There may be more than one such defeat.
+ </li>
+ </ol>
+ </li>
+ <li> If there are no defeats within the Schwartz set, then the winner
+ is chosen from the options in the Schwartz set. If there is
+ only one such option, it is the winner. If there are multiple
+ options, the elector with the casting vote chooses which of those
+ options wins.
+ </li>
+</ol>
+
+<p>
+ <strong>Note:</strong> Options which the voters rank above the default option
+ are options they find acceptable. Options ranked below the default
+ options are options they find unacceptable.
+</p>
+
+<p><cite>When the Standard Resolution Procedure is to be used, the text
+which refers to it must specify what is sufficient to have a draft
+resolution proposed and/or sponsored, what the minimum discussion
+period is, and what the voting period is. It must also specify any
+supermajority and/or the quorum (and default option) to be
+used.</cite></p>
+
+<toc-add-entry name="item-B">B. Use of language and typography</toc-add-entry>
+
+<p>The present indicative (<q>is</q>, for example) means that the statement
+is a rule in this constitution. <q>May</q> or <q>can</q> indicates that the
+person or body has discretion. <q>Should</q> means that it would be
+considered a good thing if the sentence were obeyed, but it is not
+binding. <cite>Text marked as a citation, such as this, is rationale
+and does not form part of the constitution. It may be used only to aid
+interpretation in cases of doubt.</cite></p>
+
diff -Nru doc-debian-6.5/doc/constitution.1.8.wml doc-debian-11.1/doc/constitution.1.8.wml
--- doc-debian-6.5/doc/constitution.1.8.wml 1970-01-01 01:00:00.000000000 +0100
+++ doc-debian-11.1/doc/constitution.1.8.wml 2023-05-04 06:42:59.000000000 +0200
@@ -0,0 +1,1065 @@
+
+<h1>Historical version of the Constitution for the Debian Project (v1.8)</h1>
+
+<p>Version 1.8 ratified on January 28th, 2022.</p>
+
+<p>Superseded by
+the <a href="constitution">current version 1.9</a> ratified on March 26th,
+2022.</p>
+
+<p>Supersedes
+<a href="constitution.1.7">Version 1.7</a> ratified on August 14th, 2016,
+<a href="constitution.1.6">Version 1.6</a> ratified on December 13th, 2015,
+<a href="constitution.1.5">Version 1.5</a> ratified on January 9th, 2015,
+<a href="constitution.1.4">Version 1.4</a> ratified on October 7th, 2007,
+<a href="constitution.1.3">Version 1.3</a> ratified on September 24th, 2006,
+<a href="constitution.1.2">Version 1.2</a> ratified on October 29th, 2003,
+<a href="constitution.1.1">Version 1.1</a> ratified on June 21st, 2003,
+and <a href="constitution.1.0">Version 1.0</a> ratified on December 2nd,
+1998.</p>
+
+<toc-display />
+
+<toc-add-entry name="item-1">1. Introduction</toc-add-entry>
+
+<p><cite>The Debian Project is an association of individuals who have
+made common cause to create a free operating system.</cite></p>
+
+<p>This document describes the organisational structure for formal
+decision-making in the Project. It does not describe the goals of the
+Project or how it achieves them, or contain any policies except those
+directly related to the decision-making process.</p>
+
+<toc-add-entry name="item-2">2. Decision-making bodies and individuals</toc-add-entry>
+
+<p>Each decision in the Project is made by one or more of the
+following:</p>
+
+<ol>
+ <li>The Developers, by way of General Resolution or an election;</li>
+
+ <li>The Project Leader;</li>
+
+ <li>The Technical Committee and/or its Chair;</li>
+
+ <li>The individual Developer working on a particular task;</li>
+
+ <li>Delegates appointed by the Project Leader for specific
+ tasks;</li>
+
+ <li>The Project Secretary.</li>
+</ol>
+
+<p>Most of the remainder of this document will outline the powers of
+these bodies, their composition and appointment, and the procedure for
+their decision-making. The powers of a person or body may be subject to
+review and/or limitation by others; in this case the reviewing body or
+person's entry will state this. <cite>In the list above, a person or
+body is usually listed before any people or bodies whose decisions they
+can overrule or who they (help) appoint - but not everyone listed
+earlier can overrule everyone listed later.</cite></p>
+
+<h3>2.1. General rules</h3>
+
+<ol>
+ <li>
+ <p>Nothing in this constitution imposes an obligation on anyone to
+ do work for the Project. A person who does not want to do a task
+ which has been delegated or assigned to them does not need to do
+ it. However, they must not actively work against these rules and
+ decisions properly made under them.</p>
+ </li>
+
+ <li>
+ <p>A person may hold several posts, except that the Project Leader,
+ Project Secretary and the Chair of the Technical Committee must
+ be distinct, and that the Leader cannot appoint themselves as their
+ own Delegate.</p>
+ </li>
+
+ <li>
+ <p>A person may leave the Project or resign from a particular post
+ they hold, at any time, by stating so publicly.</p>
+ </li>
+</ol>
+
+<toc-add-entry name="item-3">3. Individual Developers</toc-add-entry>
+
+<h3>3.1. Powers</h3>
+
+<p>An individual Developer may</p>
+
+<ol>
+ <li>make any technical or nontechnical decision with regard to their
+ own work;</li>
+
+ <li>propose or sponsor draft General Resolutions;</li>
+
+ <li>propose themselves as a Project Leader candidate in
+ elections;</li>
+
+ <li>vote on General Resolutions and in Leadership elections.</li>
+</ol>
+
+<h3>3.2. Composition and appointment</h3>
+
+<ol>
+ <li>
+ <p>Developers are volunteers who agree to further the aims of the
+ Project insofar as they participate in it, and who maintain
+ package(s) for the Project or do other work which the Project
+ Leader's Delegate(s) consider worthwhile.</p>
+ </li>
+
+ <li>
+ <p>The Project Leader's Delegate(s) may choose not to admit new
+ Developers, or expel existing Developers. <cite>If the Developers
+ feel that the Delegates are abusing their authority they can of
+ course override the decision by way of General Resolution - see
+ §4.1(3), §4.2.</cite></p>
+ </li>
+</ol>
+
+<h3>3.3. Procedure</h3>
+
+<p>Developers may make these decisions as they see fit.</p>
+
+<toc-add-entry name="item-4">4. The Developers by way of General Resolution or election</toc-add-entry>
+
+<h3>4.1. Powers</h3>
+
+<p>Together, the Developers may:</p>
+
+<ol>
+ <li>
+ <p>Appoint or recall the Project Leader.</p>
+ </li>
+
+ <li>
+ <p>Amend this constitution, provided they agree with a 3:1
+ majority.</p>
+ </li>
+
+ <li>
+ <p>Make or override any decision authorised by the powers of the Project
+ Leader or a Delegate.</p>
+ </li>
+
+ <li>
+ <p>Make or override any decision authorised by the powers of the Technical
+ Committee, provided they agree with a 2:1 majority.</p>
+ </li>
+
+ <li>
+ <p>Issue, supersede and withdraw nontechnical policy documents and
+ statements.</p>
+
+ <p>These include documents describing the goals of the project, its
+ relationship with other free software entities, and nontechnical
+ policies such as the free software licence terms that Debian
+ software must meet.</p>
+
+ <p>They may also include position statements about issues of the
+ day.</p>
+
+ <ol style="list-style: decimal;">
+ <li>A Foundation Document is a document or statement regarded as
+ critical to the Project's mission and purposes.</li>
+ <li>The Foundation Documents are the works entitled <q>Debian
+ Social Contract</q> and <q>Debian Free Software Guidelines</q>.</li>
+ <li>A Foundation Document requires a 3:1 majority for its
+ supersession. New Foundation Documents are issued and
+ existing ones withdrawn by amending the list of Foundation
+ Documents in this constitution.</li>
+ </ol>
+
+ </li>
+
+ <li>
+ <p>Make decisions about property held in trust for purposes
+ related to Debian. (See §9.).</p>
+ </li>
+
+ <li>
+ <p>In case of a disagreement between the project leader and
+ the incumbent secretary, appoint a new secretary.</p>
+ </li>
+</ol>
+
+<h3>4.2. Procedure</h3>
+
+<ol>
+ <li>
+ <p>The Developers follow the Standard Resolution Procedure, below.
+ A resolution or ballot option is introduced if proposed by any
+ Developer and sponsored by at least K other Developers, or if
+ proposed by the Project Leader or the Technical Committee.</p>
+ </li>
+
+ <li>
+ <p>Delaying a decision by the Project Leader or their Delegate:</p>
+
+ <ol>
+ <li>If the Project Leader or their Delegate, or the Technical
+ Committee, has made a decision, then Developers can override them
+ by passing a resolution to do so; see §4.1(3).</li>
+
+ <li>If such a resolution is sponsored by at least 2K Developers,
+ or if it is proposed by the Technical Committee, the resolution
+ puts the decision immediately on hold (provided that resolution
+ itself says so).</li>
+
+ <li>If the original decision was to change a discussion period or
+ a voting period, or the resolution is to override the Technical
+ Committee, then only K Developers need to sponsor the resolution
+ to be able to put the decision immediately on hold.</li>
+
+ <li>If the decision is put on hold, an immediate vote is held to
+ determine whether the decision will stand until the full vote on
+ the decision is made or whether the implementation of the
+ original decision will be delayed until then. There is no
+ quorum for this immediate procedural vote.</li>
+
+ <li>If the Project Leader (or the Delegate) withdraws the
+ original decision, the vote becomes moot, and is no longer
+ conducted.</li>
+ </ol>
+ </li>
+
+ <li>
+ <p>
+ Votes are taken by the Project Secretary. Votes, tallies, and
+ results are not revealed during the voting period; after the
+ vote the Project Secretary lists all the votes cast. The voting
+ period is 2 weeks, but may be varied by up to 1 week by the
+ Project Leader.
+ </p>
+ </li>
+
+ <li>
+ <p>The Project Leader has a casting vote. There is a quorum of 3Q.
+ The default option is "None of the above."</p>
+ </li>
+
+ <li>
+ <p>Proposals, sponsors, ballot options, calls for votes and other
+ formal actions are made by announcement on a publicly-readable
+ electronic mailing list designated by the Project Leader's
+ Delegate(s); any Developer may post there.</p>
+ </li>
+
+ <li>
+ <p>Votes are cast by email in a manner suitable to the Secretary.
+ The Secretary determines for each poll whether voters can change
+ their votes.</p>
+ </li>
+
+ <li>
+ <p>Q is half of the square root of the number of current
+ Developers. K is Q or 5, whichever is the smaller. Q and K need not
+ be integers and are not rounded.</p>
+ </li>
+</ol>
+
+<toc-add-entry name="item-5">5. Project Leader</toc-add-entry>
+
+<h3>5.1. Powers</h3>
+
+<p>The <a href="leader">Project Leader</a> may:</p>
+
+<ol>
+ <li>
+ <p>Appoint Delegates or delegate decisions to the Technical
+ Committee.</p>
+
+ <p>The Leader may define an area of ongoing responsibility or a
+ specific decision and hand it over to another Developer or to the
+ Technical Committee.</p>
+
+ <p>Once a particular decision has been delegated and made the
+ Project Leader may not withdraw that delegation; however, they may
+ withdraw an ongoing delegation of particular area of
+ responsibility.</p>
+ </li>
+
+ <li>
+ <p>Lend authority to other Developers.</p>
+
+ <p>The Project Leader may make statements of support for points of
+ view or for other members of the project, when asked or otherwise;
+ these statements have force if and only if the Leader would be
+ empowered to make the decision in question.</p>
+ </li>
+
+ <li>
+ <p>Make any decision which requires urgent action.</p>
+
+ <p>This does not apply to decisions which have only become
+ gradually urgent through lack of relevant action, unless there is a
+ fixed deadline.</p>
+ </li>
+
+ <li>
+ <p>Make any decision for whom noone else has responsibility.</p>
+ </li>
+
+ <li>
+ <p>Propose General Resolutions and ballot options for General
+ Resolutions. When proposed by the Project Leader, sponsors for the
+ General Resolution or ballot option are not required; see
+ §4.2.1.</p>
+ </li>
+
+ <li>
+ <p>Together with the Technical Committee, appoint new members to
+ the Committee. (See §6.2.)</p>
+ </li>
+
+ <li>
+ <p>Use a casting vote when Developers vote.</p>
+
+ <p>The Project Leader also has a normal vote in such ballots.</p>
+ </li>
+
+ <li>
+ <p>Vary the discussion period for Developers' votes (as above).</p>
+ </li>
+
+ <li>
+ <p>Lead discussions amongst Developers.</p>
+
+ <p>The Project Leader should attempt to participate in discussions
+ amongst the Developers in a helpful way which seeks to bring the
+ discussion to bear on the key issues at hand. The Project Leader
+ should not use the Leadership position to promote their own
+ personal views.</p>
+ </li>
+
+ <li>
+ <p>In consultation with the developers, make decisions affecting
+ property held in trust for purposes related to Debian. (See
+ §9.). Such decisions are communicated to the members by the
+ Project Leader or their Delegate(s). Major expenditures
+ should be proposed and debated on the mailing list before
+ funds are disbursed.</p>
+ </li>
+ <li>
+ <p>Add or remove organizations from the list of trusted
+ organizations (see §9.3) that are authorized to accept and
+ hold assets for Debian. The evaluation and discussion leading
+ up to such a decision occurs on an electronic mailing list
+ designated by the Project Leader or their Delegate(s), on
+ which any developer may post. There is a minimum discussion
+ period of two weeks before an organization may be added to
+ the list of trusted organizations.</p>
+ </li>
+</ol>
+
+<h3>5.2. Appointment</h3>
+
+<ol>
+ <li>The Project Leader is elected by the Developers.</li>
+
+ <li>The election begins six weeks before the leadership post becomes
+ vacant, or (if it is too late already) immediately.</li>
+
+ <li>For the first week any Developer may nominate
+ themselves as a candidate Project Leader, and summarize their plans for their term.</li>
+
+ <li>For three weeks after that no more candidates may be nominated;
+ candidates should use this time for campaigning and discussion. If
+ there are no candidates at the end of the nomination period then the
+ nomination period is extended for an additional week, repeatedly if
+ necessary.</li>
+
+ <li>The next two weeks are the polling period during which
+ Developers may cast their votes. Votes in leadership elections are
+ kept secret, even after the election is finished.</li>
+
+ <li>The options on the ballot will be those candidates who have
+ nominated themselves and have not yet withdrawn, plus None Of The
+ Above. If None Of The Above wins the election then the election
+ procedure is repeated, many times if necessary.</li>
+
+ <li>
+ The decision will be made using the method specified in §A.5
+ of the Standard Resolution Procedure. The quorum is the same as
+ for a General Resolution (§4.2) and the default option is
+ <q>None Of The Above</q>.
+ </li>
+
+ <li>The Project Leader serves for one year from their election.</li>
+</ol>
+
+<h3>5.3. Procedure</h3>
+
+<p>The Project Leader should attempt to make decisions which are
+consistent with the consensus of the opinions of the Developers.</p>
+
+<p>Where practical the Project Leader should informally solicit the
+views of the Developers.</p>
+
+<p>The Project Leader should avoid overemphasizing their own point of
+view when making decisions in their capacity as Leader.</p>
+
+<toc-add-entry name="item-6">6. Technical committee</toc-add-entry>
+
+<h3>6.1. Powers</h3>
+
+<p>The <a href="tech-ctte">Technical Committee</a> may:</p>
+
+<ol>
+ <li>
+ <p>Decide on any matter of technical policy.</p>
+
+ <p>This includes the contents of the technical policy manuals,
+ developers' reference materials, example packages and the behaviour
+ of non-experimental package building tools. (In each case the usual
+ maintainer of the relevant software or documentation makes
+ decisions initially, however; see 6.3(5).)</p>
+ </li>
+
+ <li>
+ <p>Decide any technical matter where Developers' jurisdictions
+ overlap.</p>
+
+ <p>In cases where Developers need to implement compatible
+ technical policies or stances (for example, if they disagree about
+ the priorities of conflicting packages, or about ownership of a
+ command name, or about which package is responsible for a bug that
+ both maintainers agree is a bug, or about who should be the
+ maintainer for a package) the technical committee may decide the
+ matter.</p>
+ </li>
+
+ <li>
+ <p>Make a decision when asked to do so.</p>
+
+ <p>Any person or body may delegate a decision of their own to the
+ Technical Committee, or seek advice from it.</p>
+ </li>
+
+ <li>
+ <p>Overrule a Developer (requires a 3:1 majority).</p>
+
+ <p>The Technical Committee may ask a Developer to take a
+ particular technical course of action even if the Developer does
+ not wish to; this requires a 3:1 majority. For example, the
+ Committee may determine that a complaint made by the submitter of a
+ bug is justified and that the submitter's proposed solution should
+ be implemented.</p>
+ </li>
+
+ <li>
+ <p>Offer advice.</p>
+
+ <p>The Technical Committee may make formal announcements about its
+ views on any matter. <cite>Individual members may of course make
+ informal statements about their views and about the likely views of
+ the committee.</cite></p>
+ </li>
+
+ <li>
+ <p>Together with the Project Leader, appoint new members to itself
+ or remove existing members. (See §6.2.)</p>
+ </li>
+
+ <li>
+ <p>Appoint the Chair of the Technical Committee.</p>
+
+ <p>
+ The Chair is elected by the Committee from its members. All
+ members of the committee are automatically nominated; the
+ committee votes starting one week before the post will become
+ vacant (or immediately, if it is already too late). The members
+ may vote by public acclamation for any fellow committee member,
+ including themselves; there is no default option. The vote
+ finishes when all the members have voted, or when the voting
+ period has ended. The result is determined using the method
+ specified in §A.5 of the Standard Resolution Procedure.
+ There is no casting vote. If there are multiple options with no
+ defeats in the Schwartz set at the end of §A.5.8, the winner
+ will be randomly chosen from those options, via a mechanism chosen
+ by the Project Secretary.
+ </p>
+ </li>
+
+ <li>
+ <p>The Chair can stand in for the Leader, together with the
+ Secretary</p>
+
+ <p>As detailed in §7.1(2), the Chair of the Technical
+ Committee and the Project Secretary may together stand in for the
+ Leader if there is no Leader.</p>
+ </li>
+</ol>
+
+<h3>6.2. Composition</h3>
+
+<ol>
+ <li>
+ <p>The Technical Committee consists of up to 8 Developers, and
+ should usually have at least 4 members.</p>
+ </li>
+
+ <li>
+ <p>When there are fewer than 8 members the Technical Committee may
+ recommend new member(s) to the Project Leader, who may choose
+ (individually) to appoint them or not.</p>
+ </li>
+
+ <li>
+ <p>When there are 5 members or fewer the Technical Committee may
+ appoint new member(s) until the number of members reaches 6.</p>
+ </li>
+
+ <li>
+ <p>When there have been 5 members or fewer for at least one week
+ the Project Leader may appoint new member(s) until the number of
+ members reaches 6, at intervals of at least one week per
+ appointment.</p>
+ </li>
+
+ <li>
+ <p>A Developer is not eligible to be (re)appointed to the Technical
+ Committee if they have been a member within the previous 12
+ months.</p>
+ </li>
+
+ <li>
+ <p>If the Technical Committee and the Project Leader agree they
+ may remove or replace an existing member of the Technical
+ Committee.</p>
+ </li>
+
+ <li>
+ <p>Term limit:</p>
+ <ol>
+ <li>
+ <p>On January 1st of each year the term of any Committee member
+ who has served more than 42 months (3.5 years) and who is one
+ of the two most senior members is set to expire on December
+ 31st of that year.</p>
+ </li>
+ <li>
+ <p>A member of the Technical Committee is said to be more
+ senior than another if they were appointed earlier, or were
+ appointed at the same time and have been a member of the
+ Debian Project longer. In the event that a member has been
+ appointed more than once, only the most recent appointment is
+ relevant.</p>
+ </li>
+ </ol>
+ </li>
+</ol>
+
+<h3>6.3. Procedure</h3>
+
+<ol>
+ <li>
+ <p>Resolution process.</p>
+
+ <p>The Technical Committee uses the following process to prepare a
+ resolution for vote:</p>
+
+ <ol>
+ <li>Any member of the Technical Committee may propose a resolution.
+ This creates an initial two-option ballot, the other option being
+ the default option of "None of the above". The proposer of the
+ resolution becomes the proposer of the ballot option.</li>
+
+ <li>Any member of the Technical Committee may propose additional
+ ballot options or modify or withdraw a ballot option they
+ proposed.</li>
+
+ <li>If all ballot options except the default option are withdrawn,
+ the process is canceled.</li>
+
+ <li>Any member of the Technical Committee may call for a vote on the
+ ballot as it currently stands. This vote begins immediately, but if
+ any other member of the Technical Committee objects to calling for a
+ vote before the vote completes, the vote is canceled and has no
+ effect.</li>
+
+ <li>Two weeks after the original proposal the ballot is closed to
+ any changes and voting starts automatically. This vote cannot be
+ canceled.</li>
+
+ <li>If a vote is canceled under §6.3.1.4 later than 13 days
+ after the initial proposed resolution, the vote specified in
+ §6.3.1.5 instead starts 24 hours after the time of
+ cancellation. During that 24 hour period, no one may call for a
+ vote, but Technical Committee members may make ballot changes under
+ §6.3.1.2.</li>
+ </ol>
+ </li>
+
+ <li>
+ <p>Details regarding voting</p>
+
+ <p>Votes are decided by the vote counting mechanism described in
+ §A.5. The voting period lasts for one week or until the
+ outcome is no longer in doubt assuming no members change their votes,
+ whichever is shorter. Members may change their votes until the voting
+ period ends. There is a quorum of two. The Chair has a casting
+ vote. The default option is "None of the above".</p>
+
+ <p>When the Technical Committee votes whether to override a Developer
+ who also happens to be a member of the Committee, that member may not
+ vote (unless they are the Chair, in which case they may use only their
+ casting vote).</p>
+ </li>
+
+ <li>
+ <p>Public discussion and decision-making.</p>
+
+ <p>Discussion, draft resolutions and ballot options, and votes by
+ members of the committee, are made public on the Technical
+ Committee public discussion list. There is no separate secretary
+ for the Committee.</p>
+ </li>
+
+ <li>
+ <p>Confidentiality of appointments.</p>
+
+ <p>The Technical Committee may hold confidential discussions via
+ private email or a private mailing list or other means to discuss
+ appointments to the Committee. However, votes on appointments must
+ be public.</p>
+ </li>
+
+ <li>
+ <p>No detailed design work.</p>
+
+ <p>The Technical Committee does not engage in design of new
+ proposals and policies. Such design work should be carried out by
+ individuals privately or together and discussed in ordinary
+ technical policy and design forums.</p>
+
+ <p>The Technical Committee restricts itself to choosing from or
+ adopting compromises between solutions and decisions which have
+ been proposed and reasonably thoroughly discussed elsewhere.</p>
+
+ <p><cite>Individual members of the technical committee may of
+ course participate on their own behalf in any aspect of design and
+ policy work.</cite></p>
+ </li>
+
+ <li>
+ <p>Technical Committee makes decisions only as last resort.</p>
+
+ <p>The Technical Committee does not make a technical decision
+ until efforts to resolve it via consensus have been tried and
+ failed, unless it has been asked to make a decision by the person
+ or body who would normally be responsible for it.</p>
+ </li>
+ <li>
+ <p>Proposing a General Resolution.</p>
+
+ <p>When the Technical Committee proposes a general resolution or a
+ ballot option in a general resolution to the project under
+ §4.2.1, it may delegate (via resolution or other means agreed on
+ by the Technical Committee) the authority to withdraw, amend, or make
+ minor changes to the ballot option to one of its members. If it does
+ not do so, these decisions must be made by resolution of the Technical
+ Committee.</p>
+ </li>
+</ol>
+
+<toc-add-entry name="item-7">7. The Project Secretary</toc-add-entry>
+
+<h3>7.1. Powers</h3>
+
+<p>The <a href="secretary">Secretary</a>:</p>
+
+<ol>
+ <li>
+ <p>Takes votes amongst the Developers, and determines the number
+ and identity of Developers, whenever this is required by the
+ constitution.</p>
+ </li>
+
+ <li>
+ <p>Can stand in for the Leader, together with the Chair of the
+ Technical Committee.</p>
+
+ <p>If there is no Project Leader then the Chair of the
+ Technical Committee and the Project Secretary may by joint
+ agreement make decisions if they consider it imperative to do
+ so.</p>
+ </li>
+
+ <li>
+ <p>Adjudicates any disputes about interpretation of the
+ constitution.</p>
+ </li>
+
+ <li>
+ <p>May delegate part or all of their authority to someone else, or
+ withdraw such a delegation at any time.</p>
+ </li>
+</ol>
+
+<h3>7.2. Appointment</h3>
+
+<p>The Project Secretary is appointed by the Project Leader and the
+current Project Secretary.</p>
+
+<p>If the Project Leader and the current Project Secretary cannot agree
+on a new appointment, they must ask the Developers by way of
+General Resolution to appoint a Secretary.</p>
+
+<p>If there is no Project Secretary or the current Secretary is
+unavailable and has not delegated authority for a decision then the
+decision may be made or delegated by the Chair of the Technical
+Committee, as Acting Secretary.</p>
+
+<p>The Project Secretary's term of office is 1 year, at which point
+they or another Secretary must be (re)appointed.</p>
+
+<h3>7.3. Procedure</h3>
+
+<p>The Project Secretary should make decisions which are fair and
+reasonable, and preferably consistent with the consensus of the
+Developers.</p>
+
+<p>When acting together to stand in for an absent Project Leader the
+Chair of the Technical Committee and the Project Secretary should
+make decisions only when absolutely necessary and only when consistent
+with the consensus of the Developers.</p>
+
+<toc-add-entry name="item-8">8. The Project Leader's Delegates</toc-add-entry>
+
+<h3>8.1. Powers</h3>
+
+<p>The Project Leader's Delegates:</p>
+
+<ol>
+ <li>have powers delegated to them by the Project Leader;</li>
+
+ <li>may make certain decisions which the Leader may not make
+ directly, including approving or expelling Developers or designating
+ people as Developers who do not maintain packages. <cite>This is to
+ avoid concentration of power, particularly over membership as a
+ Developer, in the hands of the Project Leader.</cite></li>
+</ol>
+
+<h3>8.2. Appointment</h3>
+
+<p>The Delegates are appointed by the Project Leader and may be
+replaced by the Leader at the Leader's discretion. The Project Leader
+may not make the position as a Delegate conditional on particular
+decisions by the Delegate, nor may they override a decision made by a
+Delegate once made.</p>
+
+<h3>8.3. Procedure</h3>
+
+<p>Delegates may make decisions as they see fit, but should attempt to
+implement good technical decisions and/or follow consensus opinion.</p>
+
+<toc-add-entry name="item-9">9. Assets held in trust for Debian</toc-add-entry>
+
+<p>In most jurisdictions around the world, the Debian project is not
+in a position to directly hold funds or other property. Therefore,
+property has to be owned by any of a number of organisations as
+detailed in §9.2.</p>
+
+<p>Traditionally, SPI was the sole organisation authorized to hold
+property and monies for the Debian Project. SPI was created in
+the U.S. to hold money in trust there.</p>
+
+<p><a href="https://www.spi-inc.org/";>SPI</a> and Debian are separate
+organisations who share some goals.
+Debian is grateful for the legal support framework offered by SPI.</p>
+
+<h3>9.1. Relationship with Associated Organizations</h3>
+
+<ol>
+ <li>
+ <p>Debian Developers do not become agents or employees of
+ organisations holding assets in trust for Debian, or of
+ each other, or of persons in authority in the Debian Project,
+ solely by the virtue of being Debian Developers. A person
+ acting as a Developer does so as an individual, on their own
+ behalf. Such organisations may, of their own accord,
+ establish relationships with individuals who are also Debian
+ developers.</p>
+ </li>
+</ol>
+
+<h3>9.2. Authority</h3>
+
+<ol>
+ <li>
+ <p>An organisation holding assets for Debian has no authority
+ regarding Debian's technical or nontechnical decisions, except
+ that no decision by Debian with respect to any property held
+ by the organisation shall require it to act outside its legal
+ authority.</p>
+ </li>
+ <li>
+ <p>Debian claims no authority over an organisation that holds
+ assets for Debian other than that over the use of property
+ held in trust for Debian.</p>
+ </li>
+</ol>
+
+<h3>9.3. Trusted organisations</h3>
+
+<p>Any donations for the Debian Project must be made to any one of a
+set of organisations designated by the Project leader (or a
+delegate) to be authorized to handle assets to be used for the
+Debian Project.</p>
+
+<p>Organisations holding assets in trust for Debian should
+undertake reasonable obligations for the handling of such
+assets.</p>
+
+<p>Debian maintains a public List of Trusted Organisations that
+accept donations and hold assets in trust for Debian
+(including both tangible property and intellectual property)
+that includes the commitments those organisations have made as
+to how those assets will be handled.</p>
+
+<toc-add-entry name="item-A">A. Standard Resolution Procedure</toc-add-entry>
+
+<p>These rules apply to communal decision-making by committees and
+plebiscites, where stated above.</p>
+
+<h3>A.0. Proposal</h3>
+
+<ol>
+ <li>The formal procedure begins when a draft resolution is proposed and
+ sponsored, as specified in §4.2.1.</li>
+
+ <li>This draft resolution becomes a ballot option in an initial
+ two-option ballot, the other option being the default option, and the
+ proposer of the draft resolution becomes the proposer of that ballot
+ option.</li>
+</ol>
+
+<h3>A.1. Discussion and Amendment</h3>
+
+<ol>
+ <li>The discussion period starts when a draft resolution is proposed and
+ sponsored. The minimum discussion period is 2 weeks. The maximum
+ discussion period is 3 weeks.</li>
+
+ <li>A new ballot option may be proposed and sponsored according to the
+ requirements for a new resolution.</li>
+
+ <li>The proposer of a ballot option may amend that option provided that
+ none of the sponsors of that ballot option at the time the amendment is
+ proposed disagree with that change within 24 hours. If any of them do
+ disagree, the ballot option is left unchanged.</li>
+
+ <li>The addition of a ballot option or the change via an amendment of a
+ ballot option changes the end of the discussion period to be one week
+ from when that action was done, unless that would make the total
+ discussion period shorter than the minimum discussion period or longer
+ than the maximum discussion period. In the latter case, the length of
+ the discussion period is instead set to the maximum discussion
+ period.</li>
+
+ <li>The proposer of a ballot option may make minor changes to that
+ option (for example, typographical fixes, corrections of
+ inconsistencies, or other changes which do not alter the meaning),
+ providing no Developer objects within 24 hours. In this case the length
+ of the discussion period is not changed. If a Developer does object, the
+ change must instead be made via amendment under §A.1.3.</li>
+
+ <li>The Project Leader may, at any point in the process, increase or
+ decrease the minimum and maximum discussion period by up to 1 week from
+ their original values in §A.1.1, except that they may not do so in
+ a way that causes the discussion period to end within 48 hours of when
+ this change is made. The length of the discussion period is then
+ recalculated as if the new minimum and maximum lengths had been in place
+ during all previous ballot changes under §A.1.1 and §A.1.4.</li>
+
+ <li>The default option has no proposer or sponsors, and cannot be
+ amended or withdrawn.</li>
+</ol>
+
+<h3>A.2. Withdrawing ballot options</h3>
+
+<ol>
+ <li>The proposer of a ballot option may withdraw. If they do, new
+ proposers may come forward to keep the ballot option alive, in which
+ case the first person to do so becomes the new proposer and any others
+ become sponsors if they aren't sponsors already. Any new proposer or
+ sponsors must meet the requirements for proposing or sponsoring a new
+ resolution.</li>
+
+ <li>A sponsor of a ballot option may withdraw.</li>
+
+ <li>If the withdrawal of the proposer and/or sponsors means that a
+ ballot option has no proposer or not enough sponsors to meet the
+ requirements for a new resolution, and 24 hours pass without this being
+ remedied by another proposer and/or sponsors stepping forward, it is
+ removed from the draft ballot. This does not change the length of the
+ discussion period.</li>
+
+ <li>If all ballot options except the default option are withdrawn, the
+ resolution is canceled and will not be voted on.</li>
+</ol>
+
+<h3>A.3. Calling for a vote</h3>
+<ol>
+ <li>After the discussion period has ended, the Project Secretary will
+ publish the ballot and call for a vote. The Project Secretary may do
+ this immediately following the end of the discussion period and must do
+ so within seven days of the end of the discussion period.</li>
+
+ <li>The Project Secretary determines the order of ballot options and
+ their summaries used for the ballot. The Project Secretary may ask
+ ballot option proposers to draft those summaries, and may revise them
+ for clarity at their discretion.</li>
+
+ <li>Minor changes to ballot options under §A.1.5 may only be made
+ if at least 24 hours remain in the discussion period, or if the Project
+ Secretary agrees the change does not alter the meaning of the ballot
+ option and (if it would do so) warrants delaying the vote. The Project
+ Secretary will allow 24 hours for objections after any such change
+ before issuing the call for a vote.</li>
+
+ <li>No new ballot options may be proposed, no ballot options may be
+ amended, and no proposers or sponsors may withdraw if less than 24 hours
+ remain in the discussion period, unless this action successfully extends
+ the discussion period under §A.1.4 by at least 24 additional
+ hours.</li>
+
+ <li>Actions to preserve the existing ballot may be taken within the last
+ 24 hours of the discussion period, namely a sponsor objecting to an
+ amendment under §A.1.3, a Developer objecting to a minor change
+ under §A.1.5, stepping forward as the proposer for an existing
+ ballot option whose original proposer has withdrawn it under
+ §A.2.1, or sponsoring an existing ballot option that has fewer than
+ the required number of sponsors because of the withdrawal of a sponsor
+ under point §A.2.2.</li>
+
+ <li>The Project Secretary may make an exception to §A.3.4 and
+ accept changes to the ballot after they are no longer allowed, provided
+ that this is done at least 24 hours prior to the issuance of a call for
+ a vote. All other requirements for making a change to the ballot must
+ still be met. This is expected to be rare and should only be done if the
+ Project Secretary believes it would be harmful to the best interests of
+ the project for the change to not be made.</li>
+</ol>
+
+<h3>A.4. Voting procedure</h3>
+
+<ol>
+ <li>Options which do not have an explicit supermajority requirement have
+ a 1:1 majority requirement. The default option does not have any
+ supermajority requirements.</li>
+
+ <li>The votes are counted according to the rules in §A.5.</li>
+
+ <li>In cases of doubt the Project Secretary shall decide on matters
+ of procedure.</li>
+</ol>
+
+<h3>A.5. Vote Counting</h3>
+
+<ol>
+ <li> Each voter's ballot ranks the options being voted on. Not all
+ options need be ranked. Ranked options are considered
+ preferred to all unranked options. Voters may rank options
+ equally. Unranked options are considered to be ranked equally
+ with one another. Details of how ballots may be filled out
+ will be included in the Call For Votes.
+ </li>
+ <li> If the ballot has a quorum requirement R any options other
+ than the default option which do not receive at least R votes
+ ranking that option above the default option are dropped from
+ consideration.
+ </li>
+ <li> Any (non-default) option which does not defeat the default option
+ by its required majority ratio is dropped from consideration.
+ <ol>
+ <li>
+ Given two options A and B, V(A,B) is the number of voters
+ who prefer option A over option B.
+ </li>
+ <li>
+ An option A defeats the default option D by a majority
+ ratio N, if V(A,D) is greater or equal to N * V(D,A) and V(A,D) is strictly greater than V(D,A).
+ </li>
+ <li>
+ If a supermajority of S:1 is required for A, its majority ratio
+ is S; otherwise, its majority ratio is 1.
+ </li>
+ </ol>
+ </li>
+ <li> From the list of undropped options, we generate a list of
+ pairwise defeats.
+ <ol>
+ <li>
+ An option A defeats an option B, if V(A,B) is strictly greater
+ than V(B,A).
+ </li>
+ </ol>
+ </li>
+ <li> From the list of [undropped] pairwise defeats, we generate a
+ set of transitive defeats.
+ <ol>
+ <li>
+ An option A transitively defeats an option C if A defeats
+ C or if there is some other option B where A defeats B AND
+ B transitively defeats C.
+ </li>
+ </ol>
+ </li>
+ <li> We construct the Schwartz set from the set of transitive defeats.
+ <ol>
+ <li>
+ An option A is in the Schwartz set if for all options B,
+ either A transitively defeats B, or B does not transitively
+ defeat A.
+ </li>
+ </ol>
+ </li>
+ <li> If there are defeats between options in the Schwartz set,
+ we drop the weakest such defeats from the list of pairwise
+ defeats, and return to step 5.
+ <ol>
+ <li>
+ A defeat (A,X) is weaker than a defeat (B,Y) if V(A,X)
+ is less than V(B,Y). Also, (A,X) is weaker than (B,Y) if
+ V(A,X) is equal to V(B,Y) and V(X,A) is greater than V(Y,B).
+ </li>
+ <li>
+ A weakest defeat is a defeat that has no other defeat weaker
+ than it. There may be more than one such defeat.
+ </li>
+ </ol>
+ </li>
+ <li> If there are no defeats within the Schwartz set, then the winner
+ is chosen from the options in the Schwartz set. If there is
+ only one such option, it is the winner. If there are multiple
+ options, the elector with the casting vote chooses which of those
+ options wins.
+ </li>
+</ol>
+
+<p>
+ <strong>Note:</strong> Options which the voters rank above the default option
+ are options they find acceptable. Options ranked below the default
+ options are options they find unacceptable.
+</p>
+
+<p><cite>When the vote counting mechanism of the Standard Resolution
+Procedure is to be used, the text which refers to it must specify who has
+a casting vote, the quorum, the default option, and any supermajority
+requirement. The default option must not have any supermajority
+requirements.</cite></p>
+
+<toc-add-entry name="item-B">B. Use of language and typography</toc-add-entry>
+
+<p>The present indicative (<q>is</q>, for example) means that the statement
+is a rule in this constitution. <q>May</q> or <q>can</q> indicates that the
+person or body has discretion. <q>Should</q> means that it would be
+considered a good thing if the sentence were obeyed, but it is not
+binding. <cite>Text marked as a citation, such as this, is rationale
+and does not form part of the constitution. It may be used only to aid
+interpretation in cases of doubt.</cite></p>
diff -Nru doc-debian-6.5/doc/constitution.wml doc-debian-11.1/doc/constitution.wml
--- doc-debian-6.5/doc/constitution.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/constitution.wml 2023-05-04 06:42:01.000000000 +0200
@@ -1,17 +1,19 @@
-<h1>Constitution for the Debian Project (v1.7)</h1>
+<h1>Constitution for the Debian Project (v1.9)</h1>
-<p>Version 1.7</a> ratified on August 14th, 2016. Supersedes
+<p>Version 1.9 ratified on March 26th, 2022.</p>
+
+<p>Supersedes
+<a href="constitution.1.8">Version 1.8</a> ratified on January 28th, 2022,
+<a href="constitution.1.7">Version 1.7</a> ratified on August 14th, 2016,
<a href="constitution.1.6">Version 1.6</a> ratified on December 13th, 2015,
<a href="constitution.1.5">Version 1.5</a> ratified on January 9th, 2015,
<a href="constitution.1.4">Version 1.4</a> ratified on October 7th, 2007,
-<a href="constitution.1.3">Version 1.3</a> ratified on September 24th,
-2006,
-<a href="constitution.1.2">Version 1.2</a> ratified on October 29th,
-2003 and
-<a href="constitution.1.1">Version 1.1</a> ratified on June 21st,
-2003, which itself supersedes <a href="constitution.1.0">Version 1.0</a>
-ratified on December 2nd, 1998.</p>
+<a href="constitution.1.3">Version 1.3</a> ratified on September 24th, 2006,
+<a href="constitution.1.2">Version 1.2</a> ratified on October 29th, 2003,
+<a href="constitution.1.1">Version 1.1</a> ratified on June 21st, 2003,
+and <a href="constitution.1.0">Version 1.0</a> ratified on December 2nd,
+1998.</p>
<toc-display />
@@ -186,7 +188,7 @@
<ol>
<li>
<p>The Developers follow the Standard Resolution Procedure, below.
- A resolution or amendment is introduced if proposed by any
+ A resolution or ballot option is introduced if proposed by any
Developer and sponsored by at least K other Developers, or if
proposed by the Project Leader or the Technical Committee.</p>
</li>
@@ -224,21 +226,23 @@
<li>
<p>
Votes are taken by the Project Secretary. Votes, tallies, and
- results are not revealed during the voting period; after the
- vote the Project Secretary lists all the votes cast. The voting
- period is 2 weeks, but may be varied by up to 1 week by the
- Project Leader.
+ results are not revealed during the voting period; after the vote
+ the Project Secretary lists all the votes cast in sufficient detail
+ that anyone may verify the outcome of the election from the votes
+ cast. The identity of a Developer casting a particular vote is not
+ made public, but Developers will be given an option to confirm that
+ their vote is included in the votes cast. The voting period is 2
+ weeks, but may be varied by up to 1 week by the Project Leader.
</p>
</li>
<li>
- <p>The minimum discussion period is 2 weeks, but may be varied by
- up to 1 week by the Project Leader. The Project Leader has a
- casting vote. There is a quorum of 3Q.</p>
+ <p>The Project Leader has a casting vote. There is a quorum of 3Q.
+ The default option is "None of the above."</p>
</li>
<li>
- <p>Proposals, sponsors, amendments, calls for votes and other
+ <p>Proposals, sponsors, ballot options, calls for votes and other
formal actions are made by announcement on a publicly-readable
electronic mailing list designated by the Project Leader's
Delegate(s); any Developer may post there.</p>
@@ -300,7 +304,10 @@
</li>
<li>
- <p>Propose draft General Resolutions and amendments.</p>
+ <p>Propose General Resolutions and ballot options for General
+ Resolutions. When proposed by the Project Leader, sponsors for the
+ General Resolution or ballot option are not required; see
+ §4.2.1.</p>
</li>
<li>
@@ -366,8 +373,7 @@
necessary.</li>
<li>The next two weeks are the polling period during which
- Developers may cast their votes. Votes in leadership elections are
- kept secret, even after the election is finished.</li>
+ Developers may cast their votes.</li>
<li>The options on the ballot will be those candidates who have
nominated themselves and have not yet withdrawn, plus None Of The
@@ -375,10 +381,10 @@
procedure is repeated, many times if necessary.</li>
<li>
- The decision will be made using the method specified in section
- §A.6 of the Standard Resolution Procedure. The quorum is the
- same as for a General Resolution (§4.2) and the default
- option is <q>None Of The Above</q>.
+ The decision will be made using the method specified in §A.5
+ of the Standard Resolution Procedure. The quorum is the same as
+ for a General Resolution (§4.2) and the default option is
+ <q>None Of The Above</q>.
</li>
<li>The Project Leader serves for one year from their election.</li>
@@ -469,7 +475,11 @@
including themselves; there is no default option. The vote
finishes when all the members have voted, or when the voting
period has ended. The result is determined using the method
- specified in section A.6 of the Standard Resolution Procedure.
+ specified in §A.5 of the Standard Resolution Procedure.
+ There is no casting vote. If there are multiple options with no
+ defeats in the Schwartz set at the end of §A.5.8, the winner
+ will be randomly chosen from those options, via a mechanism chosen
+ by the Project Secretary.
</p>
</li>
@@ -546,30 +556,63 @@
<ol>
<li>
- <p>The Technical Committee uses the Standard Resolution
- Procedure.</p>
+ <p>Resolution process.</p>
+
+ <p>The Technical Committee uses the following process to prepare a
+ resolution for vote:</p>
- <p>A draft resolution or amendment may be proposed by any member
- of the Technical Committee. There is no minimum discussion period;
- the voting period lasts for up to one week, or until the outcome is
- no longer in doubt. Members may change their votes. There is a
- quorum of two.</p>
+ <ol>
+ <li>Any member of the Technical Committee may propose a resolution.
+ This creates an initial two-option ballot, the other option being
+ the default option of "None of the above". The proposer of the
+ resolution becomes the proposer of the ballot option.</li>
+
+ <li>Any member of the Technical Committee may propose additional
+ ballot options or modify or withdraw a ballot option they
+ proposed.</li>
+
+ <li>If all ballot options except the default option are withdrawn,
+ the process is canceled.</li>
+
+ <li>Any member of the Technical Committee may call for a vote on the
+ ballot as it currently stands. This vote begins immediately, but if
+ any other member of the Technical Committee objects to calling for a
+ vote before the vote completes, the vote is canceled and has no
+ effect.</li>
+
+ <li>Two weeks after the original proposal the ballot is closed to
+ any changes and voting starts automatically. This vote cannot be
+ canceled.</li>
+
+ <li>If a vote is canceled under §6.3.1.4 later than 13 days
+ after the initial proposed resolution, the vote specified in
+ §6.3.1.5 instead starts 24 hours after the time of
+ cancellation. During that 24 hour period, no one may call for a
+ vote, but Technical Committee members may make ballot changes under
+ §6.3.1.2.</li>
+ </ol>
</li>
<li>
<p>Details regarding voting</p>
- <p>The Chair has a casting vote. When the Technical Committee
- votes whether to override a Developer who also happens to be a
- member of the Committee, that member may not vote (unless they are
- the Chair, in which case they may use only their casting
- vote).</p>
+ <p>Votes are decided by the vote counting mechanism described in
+ §A.5. The voting period lasts for one week or until the
+ outcome is no longer in doubt assuming no members change their votes,
+ whichever is shorter. Members may change their votes until the voting
+ period ends. There is a quorum of two. The Chair has a casting
+ vote. The default option is "None of the above".</p>
+
+ <p>When the Technical Committee votes whether to override a Developer
+ who also happens to be a member of the Committee, that member may not
+ vote (unless they are the Chair, in which case they may use only their
+ casting vote).</p>
</li>
<li>
<p>Public discussion and decision-making.</p>
- <p>Discussion, draft resolutions and amendments, and votes by
+ <p>Discussion, draft resolutions and ballot options, and votes by
members of the committee, are made public on the Technical
Committee public discussion list. There is no separate secretary
for the Committee.</p>
@@ -609,6 +652,17 @@
failed, unless it has been asked to make a decision by the person
or body who would normally be responsible for it.</p>
</li>
+ <li>
+ <p>Proposing a General Resolution.</p>
+
+ <p>When the Technical Committee proposes a general resolution or a
+ ballot option in a general resolution to the project under
+ §4.2.1, it may delegate (via resolution or other means agreed on
+ by the Technical Committee) the authority to withdraw, amend, or make
+ minor changes to the ballot option to one of its members. If it does
+ not do so, these decisions must be made by resolution of the Technical
+ Committee.</p>
+ </li>
</ol>
<h2><toc-add-entry name="item-7">7. The Project Secretary</toc-add-entry></h2>
@@ -713,7 +767,7 @@
property and monies for the Debian Project. SPI was created in
the U.S. to hold money in trust there.</p>
-<p><a href="http://www.spi-inc.org/";>SPI</a> and Debian are separate
+<p><a href="https://www.spi-inc.org/";>SPI</a> and Debian are separate
organisations who share some goals.
Debian is grateful for the legal support framework offered by SPI.</p>
@@ -773,123 +827,138 @@
<h3>A.0. Proposal</h3>
-<p>The formal procedure begins when a draft resolution is proposed and
-sponsored, as required.</p>
-
-<h3>A.1. Discussion and Amendment</h3>
-
<ol>
- <li>Following the proposal, the resolution may be discussed.
- Amendments may be made formal by being proposed and sponsored
- according to the requirements for a new resolution, or directly by
- the proposer of the original resolution.</li>
-
- <li>A formal amendment may be accepted by the resolution's proposer,
- in which case the formal resolution draft is immediately changed to
- match.</li>
+ <li>The formal procedure begins when a draft resolution is proposed and
+ sponsored, as specified in §4.2.1.</li>
- <li>If a formal amendment is not accepted, or one of the sponsors of
- the resolution does not agree with the acceptance by the proposer of
- a formal amendment, the amendment remains as an amendment and will be
- voted on.</li>
+ <li>This draft resolution becomes a ballot option in an initial
+ two-option ballot, the other option being the default option, and the
+ proposer of the draft resolution becomes the proposer of that ballot
+ option.</li>
+</ol>
- <li>If an amendment accepted by the original proposer is not to the
- liking of others, they may propose another amendment to reverse the
- earlier change (again, they must meet the requirements for proposer
- and sponsor(s).)</li>
+<h3>A.1. Discussion and Amendment</h3>
- <li>The proposer of a resolution may suggest changes to the wordings
- of amendments; these take effect if the proposer of the amendment
- agrees and none of the sponsors object. In this case the changed
- amendments will be voted on instead of the originals.</li>
+<ol>
+ <li>The discussion period starts when a draft resolution is proposed and
+ sponsored. The minimum discussion period is 2 weeks. The maximum
+ discussion period is 3 weeks.</li>
+
+ <li>A new ballot option may be proposed and sponsored according to the
+ requirements for a new resolution.</li>
+
+ <li>The proposer of a ballot option may amend that option provided that
+ none of the sponsors of that ballot option at the time the amendment is
+ proposed disagree with that change within 24 hours. If any of them do
+ disagree, the ballot option is left unchanged.</li>
+
+ <li>The addition of a ballot option or the change via an amendment of a
+ ballot option changes the end of the discussion period to be one week
+ from when that action was done, unless that would make the total
+ discussion period shorter than the minimum discussion period or longer
+ than the maximum discussion period. In the latter case, the length of
+ the discussion period is instead set to the maximum discussion
+ period.</li>
+
+ <li>The proposer of a ballot option may make minor changes to that
+ option (for example, typographical fixes, corrections of
+ inconsistencies, or other changes which do not alter the meaning),
+ providing no Developer objects within 24 hours. In this case the length
+ of the discussion period is not changed. If a Developer does object, the
+ change must instead be made via amendment under §A.1.3.</li>
+
+ <li>The Project Leader may, at any point in the process, increase or
+ decrease the minimum and maximum discussion period by up to 1 week from
+ their original values in §A.1.1, except that they may not do so in
+ a way that causes the discussion period to end within 48 hours of when
+ this change is made. The length of the discussion period is then
+ recalculated as if the new minimum and maximum lengths had been in place
+ during all previous ballot changes under §A.1.1 and §A.1.4.</li>
- <li>The proposer of a resolution may make changes to correct minor
- errors (for example, typographical errors or inconsistencies) or
- changes which do not alter the meaning, providing noone objects
- within 24 hours. In this case the minimum discussion period is not
- restarted.</li>
+ <li>The default option has no proposer or sponsors, and cannot be
+ amended or withdrawn.</li>
</ol>
-<h3>A.2. Calling for a vote</h3>
+<h3>A.2. Withdrawing ballot options</h3>
<ol>
- <li>The proposer or a sponsor of a motion or an amendment may call
- for a vote, providing that the minimum discussion period (if any) has
- elapsed.</li>
+ <li>The proposer of a ballot option may withdraw. If they do, new
+ proposers may come forward to keep the ballot option alive, in which
+ case the first person to do so becomes the new proposer and any others
+ become sponsors if they aren't sponsors already. Any new proposer or
+ sponsors must meet the requirements for proposing or sponsoring a new
+ resolution.</li>
+
+ <li>A sponsor of a ballot option may withdraw.</li>
+
+ <li>If the withdrawal of the proposer and/or sponsors means that a
+ ballot option has no proposer or not enough sponsors to meet the
+ requirements for a new resolution, and 24 hours pass without this being
+ remedied by another proposer and/or sponsors stepping forward, it is
+ removed from the draft ballot. This does not change the length of the
+ discussion period.</li>
- <li>
- The proposer or any sponsor of a resolution may call for a vote on that
- resolution and all related amendments.
- </li>
-
- <li>The person who calls for a vote states what they believe the
- wordings of the resolution and any relevant amendments are, and
- consequently what form the ballot should take. However, the final
- decision on the form of ballot(s) is the Secretary's - see 7.1(1),
- 7.1(3) and A.3(4).</li>
+ <li>If all ballot options except the default option are withdrawn, the
+ resolution is canceled and will not be voted on.</li>
+</ol>
- <li>
- The minimum discussion period is counted from the time the last
- formal amendment was accepted, or since the whole resolution
- was proposed if no amendments have been proposed and accepted.
- </li>
+<h3>A.3. Calling for a vote</h3>
+<ol>
+ <li>After the discussion period has ended, the Project Secretary will
+ publish the ballot and call for a vote. The Project Secretary may do
+ this immediately following the end of the discussion period and must do
+ so within seven days of the end of the discussion period.</li>
+
+ <li>The Project Secretary determines the order of ballot options and
+ their summaries used for the ballot. The Project Secretary may ask
+ ballot option proposers to draft those summaries, and may revise them
+ for clarity at their discretion.</li>
+
+ <li>Minor changes to ballot options under §A.1.5 may only be made
+ if at least 24 hours remain in the discussion period, or if the Project
+ Secretary agrees the change does not alter the meaning of the ballot
+ option and (if it would do so) warrants delaying the vote. The Project
+ Secretary will allow 24 hours for objections after any such change
+ before issuing the call for a vote.</li>
+
+ <li>No new ballot options may be proposed, no ballot options may be
+ amended, and no proposers or sponsors may withdraw if less than 24 hours
+ remain in the discussion period, unless this action successfully extends
+ the discussion period under §A.1.4 by at least 24 additional
+ hours.</li>
+
+ <li>Actions to preserve the existing ballot may be taken within the last
+ 24 hours of the discussion period, namely a sponsor objecting to an
+ amendment under §A.1.3, a Developer objecting to a minor change
+ under §A.1.5, stepping forward as the proposer for an existing
+ ballot option whose original proposer has withdrawn it under
+ §A.2.1, or sponsoring an existing ballot option that has fewer than
+ the required number of sponsors because of the withdrawal of a sponsor
+ under point §A.2.2.</li>
+
+ <li>The Project Secretary may make an exception to §A.3.4 and
+ accept changes to the ballot after they are no longer allowed, provided
+ that this is done at least 24 hours prior to the issuance of a call for
+ a vote. All other requirements for making a change to the ballot must
+ still be met. This is expected to be rare and should only be done if the
+ Project Secretary believes it would be harmful to the best interests of
+ the project for the change to not be made.</li>
</ol>
-<h3>A.3. Voting procedure</h3>
+<h3>A.4. Voting procedure</h3>
<ol>
- <li>
- Each resolution and its related amendments is voted on in a
- single ballot that includes an option for the original
- resolution, each amendment, and the default option (where
- applicable).
- </li>
-
- <li>
- The default option must not have any supermajority requirements.
- Options which do not have an explicit supermajority requirement
- have a 1:1 majority requirement.
- </li>
+ <li>Options which do not have an explicit supermajority requirement have
+ a 1:1 majority requirement. The default option does not have any
+ supermajority requirements.</li>
- <li>
- The votes are counted according to the rules in A.6. The
- default option is <q>Further Discussion</q>, unless specified
- otherwise.
- </li>
+ <li>The votes are counted according to the rules in §A.5.</li>
<li>In cases of doubt the Project Secretary shall decide on matters
of procedure.</li>
</ol>
-<h3>A.4. Withdrawing resolutions or unaccepted amendments</h3>
-
-<p>The proposer of a resolution or unaccepted amendment may withdraw
-it. In this case new proposers may come forward keep it alive, in which
-case the first person to do so becomes the new proposer and any others
-become sponsors if they aren't sponsors already.</p>
-
-<p>A sponsor of a resolution or amendment (unless it has been
-accepted) may withdraw.</p>
-
-<p>If the withdrawal of the proposer and/or sponsors means that a
-resolution has no proposer or not enough sponsors it will not be voted
-on unless this is rectified before the resolution expires.</p>
-
-<h3>A.5. Expiry</h3>
-
-<p>
- If a proposed resolution has not been discussed, amended, voted on or
- otherwise dealt with for 4 weeks the secretary may issue a statement
- that the issue is being withdrawn. If none of the sponsors of any
- of the proposals object within a week, the issue is withdrawn.
-</p>
-
-<p>
- The secretary may also include suggestions on how to proceed,
- if appropriate.
-</p>
-
-<h3>A.6. Vote Counting</h3>
+<h3>A.5. Vote Counting</h3>
<ol>
<li> Each voter's ballot ranks the options being voted on. Not all
@@ -978,12 +1047,11 @@
options are options they find unacceptable.
</p>
-<p><cite>When the Standard Resolution Procedure is to be used, the text
-which refers to it must specify what is sufficient to have a draft
-resolution proposed and/or sponsored, what the minimum discussion
-period is, and what the voting period is. It must also specify any
-supermajority and/or the quorum (and default option) to be
-used.</cite></p>
+<p><cite>When the vote counting mechanism of the Standard Resolution
+Procedure is to be used, the text which refers to it must specify who has
+a casting vote, the quorum, the default option, and any supermajority
+requirement. The default option must not have any supermajority
+requirements.</cite></p>
<h2><toc-add-entry name="item-B">B. Use of language and typography</toc-add-entry></h2>
diff -Nru doc-debian-6.5/doc/mailing-lists.txt doc-debian-11.1/doc/mailing-lists.txt
--- doc-debian-6.5/doc/mailing-lists.txt 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/mailing-lists.txt 2021-11-22 10:04:19.000000000 +0100
@@ -75,33 +75,27 @@
debian-chinese-big5@lists.debian.org
- Description : Debian Chinese Project: Chinese localization (l10n),
- documentation and web site translation, user support
- etc.
+ Description : debian-user in Chinese [Traditional Chinese]
- Posts may be in English or Big5-encoded Chinese.
- All posts are automatically converted to GB encoding
- and cross-posted to the debian-chinese-gb mailing list.
+ Debian Chinese Project; Chinese localization (l10n) issues, documentation
+ and website translation, user support, Chinese-specific development, etc.
- If you would rather read and post in GB-encoded
- Chinese, please subscribe to debian-chinese-gb instead.
- Language : Chinese
+ Posts may be in English or Chinese. The traditional variant of Chinese
+ (Traditional Chinese, like zh_TW or zh_HK) is preferred.
+ Language : Chinese, English
Moderated : subscribers
Subscription: open
debian-chinese-gb@lists.debian.org
- Description : Debian Chinese Project: Chinese localization (l10n)
- issues, documentation and web site translation, user
- support etc.
-
- Posts may be in English or GB-encoded Chinese.
- All posts are automatically converted to Big5 encoding
- and cross-posted to the debian-chinese-big5 mailing list.
+ Description : debian-user in Chinese [Simplified Chinese]
- If you would rather read and post in Big5-encoded
- Chinese, please subscribe to debian-chinese-big5 instead.
- Language : Chinese
+ Debian Chinese Project; Chinese localization (l10n) issues, documentation
+ and website translation, user support, Chinese-specific development, etc.
+
+ Posts may be in English or Chinese. The simplified variant of Chinese
+ (Simplified Chinese, like zh_CN or zh_SG) is preferred.
+ Language : Chinese, English
Moderated : subscribers
Subscription: open
@@ -170,7 +164,7 @@
For native Japanese speakers, Debian JP Project provides
several mailing lists discussing the Debian system in
- Japanese, see http://www.debian.or.jp/community/ml/.
+ Japanese, see https://www.debian.or.jp/community/ml/.
General public lists are: -users, -devel, -www and -doc.
Their purposes are the same as the namesakes on lists.debian.org.
Language : English/Japanese
@@ -277,10 +271,11 @@
debian-russian@lists.debian.org
- Description : Support for Debian users that speak Russian,
- and Russian localization issues: translating
- "po" files, coordinating patches for Debian
- packages to work with the Russian language.
+ Description : Support for Debian users that speak Russian.
+
+ For Russian localization work, see debian-l10n-russian.
+
+ https://lists.debian.org/debian-l10n-russian/
Language : Russian
Moderated : no
Subscription: open
@@ -528,7 +523,7 @@
well.
You can get more information at
- https://blends.alioth.debian.org/blends/
+ https://blends.debian.org/blends/
Moderated : no
Subscription: open
@@ -696,20 +691,19 @@
debian-dpkg-bugs@lists.debian.org
- Description : Email sent by the bug tracking system regarding
- the dpkg packages.
+ Description : Email sent by the bug tracking system regarding the dpkg suite of packages.
Moderated : no
Subscription: open
debian-dpkg-cvs@lists.debian.org
- Description : The CVS commit messages from the dpkg CVS tree.
+ Description : The VCS commit messages from the GIT dpkg suite trees.
Moderated : yes
Subscription: open
debian-dpkg@lists.debian.org
- Description : Discussions and maintenance of dpkg, the basis of
+ Description : Discussions and maintenance of the dpkg suite, the basis of
the Debian packaging system.
Moderated : no
Subscription: open
@@ -830,6 +824,13 @@
Moderated : no
Subscription: open
+ debian-hpc@lists.debian.org
+
+ Description : If you are using Debian or a Debian derivative in HPC systems, you are welcome
+ on this list.
+ Moderated : no
+ Subscription: open
+
debian-ipv6@lists.debian.org
Description : Discussions on the use of Debian in an IPv6 network
@@ -926,11 +927,21 @@
debian-mentors@lists.debian.org
- Description : Newbie Debian developers can seek help with
- packaging and other developer-related issues here.
+ Description : Helping newbie developers
+
+ Newbie Debian contributors can seek help with packaging and infrastructure
+ projects as well as other developer-related issues here.
+
+ This list is not meant for users' questions, but for new contributors'!
+ Moderated : no
+ Subscription: open
+
+ debian-metadata@lists.debian.org
- This list is not meant for users' questions,
- but for new maintainers'!
+ Description : The Debian Data team produces the frameworks and runs
+ the services that make data about Debian available in a number of
+ formats to make the data as accessable as possible and to encourage its
+ use both within Debian and in external projects.
Moderated : no
Subscription: open
@@ -954,7 +965,7 @@
debian-ocaml-maint@lists.debian.org
Description : Packaging of Objective Caml programs and libraries.
- (http://pauillac.inria.fr/caml/)
+ (http://caml.inria.fr/)
Moderated : no
Subscription: open
@@ -1002,6 +1013,12 @@
This list is archived internally on a Debian Project
machine, only developers have access to the archive.
+
+ The #debian-private IRC channel on the OFTC network
+ is the IRC equivalent to the list and can be accessed
+ using a password that can be obtained using this command:
+
+ ssh master.debian.org cat /home/debian/misc/irc-password
Moderated : no
Subscription: developers only
@@ -1202,6 +1219,12 @@
Moderated : no
Subscription: open
+ debian-l10n-albanian@lists.debian.org
+
+ Description : Discussing Albanian localization issues, mainly translating Debian docs and programs to Albanian.
+ Moderated : no
+ Subscription: open
+
debian-l10n-arabic@lists.debian.org
Description : Discussing Arabic localization issues, mainly
@@ -1406,6 +1429,10 @@
Description : Discussing Russian localization issues, mainly
translating Debian docs and programs to Russian.
+
+ For support for Russian-speaking Debian users, see debian-russian.
+
+ https://lists.debian.org/debian-russian/
Language : Russian
Moderated : no
Subscription: open
@@ -1491,7 +1518,7 @@
debian-arm@lists.debian.org
- Description : Discussion on the ARM port for Debian GNU/Linux.
+ Description : Discussion on the ARM ports for Debian GNU/Linux.
Moderated : no
Subscription: open
@@ -1515,7 +1542,7 @@
debian-ia64@lists.debian.org
- Description : Discussions on the intel IA64 (aka Itanium, Merced)
+ Description : Discussions on the Intel IA-64 (aka Itanium, Merced)
port of Debian GNU/Linux.
Moderated : no
Subscription: open
@@ -1529,25 +1556,33 @@
debian-mips@lists.debian.org
- Description : Discussions on the MIPS port of Debian GNU/Linux.
+ Description : Discussions on the MIPS ports of Debian GNU/Linux.
Moderated : no
Subscription: open
debian-powerpc@lists.debian.org
- Description : Discussion on the PowerPC port of Debian GNU/Linux.
+ Description : Discussion on the PowerPC and POWER ports of Debian GNU/Linux.
+ Moderated : no
+ Subscription: open
+
+ debian-riscv@lists.debian.org
+
+ Description : Discussions on the RISC-V port(s) of Debian.
+
+ For more information see: https://wiki.debian.org/RISC-V
Moderated : no
Subscription: open
debian-s390@lists.debian.org
- Description : Discussions on the IBM S/390 port of Debian GNU/Linux.
+ Description : Discussions on the IBM S/390 and IBM z Systems ports of Debian GNU/Linux.
Moderated : no
Subscription: open
debian-sparc@lists.debian.org
- Description : Discussions on the SPARC port of Debian GNU/Linux.
+ Description : Discussions on the SPARC ports of Debian GNU/Linux.
Moderated : no
Subscription: open
@@ -1656,7 +1691,7 @@
speak as a company representative, at least for the topics of
interest of the mailing list
Moderated : no
- Subscription: closed
+ Subscription: open
debian-consultants@lists.debian.org
@@ -1704,6 +1739,15 @@
Moderated : no
Subscription: open
+ debian-dug-co@lists.debian.org
+
+ Description : Discussion list for the Debian community in Colombia.
+
+ Esta es la lista de discusión general de la comunidad de usuarios y
+ desarrolladores de Debian en Colombia
+ Moderated : no
+ Subscription: open
+
debian-dug-ie@lists.debian.org
Description : Discussion list for the Debian community in Ireland without being tied to a
@@ -1722,6 +1766,13 @@
Moderated : no
Subscription: open
+ debian-dug-kosovo@lists.debian.org
+
+ Description : Discussing user queries, events and other local topics for Debian in Kosovo
+ Language : English, Shqip
+ Moderated : no
+ Subscription: open
+
debian-dug-mx@lists.debian.org
Description : Discussion list for the Debian community in Mexico without being tied to a
@@ -1756,6 +1807,21 @@
Moderated : no
Subscription: open
+ debian-dug-washington-dc@lists.debian.org
+
+ Description : Discussion list for the Debian Community in Washington, DC, US and
+ surrounding area.
+ Moderated : no
+ Subscription: open
+
+ debian-events-apac@lists.debian.org
+
+ Description : Announcements, discussions and organizational stuff about events
+ organized by Debian or a Debian presence at events in the Asia/Pacific
+ region.
+ Moderated : no
+ Subscription: open
+
debian-events-eu@lists.debian.org
Description : Discussions and organizational stuff about booths for
@@ -1856,6 +1922,18 @@
Moderated : no
Subscription: open
+ debian-outreach@lists.debian.org
+
+ Description : Discussion of Debian's participation in internship-like programs, such as
+ Outreachy, Google Summer of Code, ...
+
+ Program administrators and members of the Outreach Team will send
+ announcements regarding Debian's participation to this
+ mailing-list. Debian interns will send periodic reports of their
+ work to this mailing-list.
+ Moderated : no
+ Subscription: open
+
debian-project@lists.debian.org
Description : Discussion about non-technical topics related
@@ -1873,6 +1951,16 @@
Moderated : no
Subscription: open
+ debian-rtc@lists.debian.org
+
+ Description : Debian operates a number of RTC services (https://rtc.debian.org)
+ for Debian Developers and the wider Debian community. This list is provided
+ for discussion of the services, discussing documentation (https://wiki.debian.org/UnifiedCommunications/DebianDevelopers)
+ for the services, operational issues, discussion of possible enhancements and
+ questions from users.
+ Moderated : no
+ Subscription: open
+
debian-services-admin@lists.debian.org
Description : Point of contact for issues with services, such as web services, mail
@@ -1946,6 +2034,12 @@
Moderated : no
Subscription: open
+ other-nbd@lists.debian.org
+
+ Description : nbd mailing list
+ Moderated : no
+ Subscription: open
+
other-sart@lists.debian.org
Description : Discussions and announcements about SART,
diff -Nru doc-debian-6.5/doc/Makefile doc-debian-11.1/doc/Makefile
--- doc-debian-6.5/doc/Makefile 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/Makefile 2023-05-04 06:37:36.000000000 +0200
@@ -12,8 +12,10 @@
bug-log-mailserver.wml bug-reporting.wml \
bug-mailserver-refcard.wml constitution.wml social-contract.wml \
bug-maint-info.wml constitution.1.1.wml social-contract.1.0.wml \
+social-contract.1.1.wml \
constitution.1.2.wml constitution.1.3.wml \
-constitution.1.4.wml constitution.1.5.wml constitution.1.6.wml
+constitution.1.4.wml constitution.1.5.wml constitution.1.6.wml \
+constitution.1.7.wml constitution.1.8.wml
# These are the automatic files we can generate:
TXTFILES = $(subst .wml,.txt,$(WMLFILES))
@@ -64,6 +66,10 @@
cat $< |grep -v ^# >$@
constitution.wml: $(WEBWML)/devel/constitution.wml
cat $< | perl -pe 's/<toc-add-entry /<h2><toc-add-entry /; s/toc-add-entry>/toc-add-entry><\/h2>/' | grep -v ^# >$@
+constitution.1.8.wml: $(WEBWML)/devel/constitution.1.8.wml
+ cat $< |grep -v ^# >$@
+constitution.1.7.wml: $(WEBWML)/devel/constitution.1.7.wml
+ cat $< |grep -v ^# >$@
constitution.1.6.wml: $(WEBWML)/devel/constitution.1.6.wml
cat $< |grep -v ^# >$@
constitution.1.5.wml: $(WEBWML)/devel/constitution.1.5.wml
@@ -82,6 +88,8 @@
cat $< |grep -v ^# >$@
social-contract.wml: $(WEBWML)/social_contract.wml
cat $< |grep -v ^# >$@
+social-contract.1.1.wml: $(WEBWML)/social_contract.1.1.wml
+ cat $< |grep -v ^# >$@
social-contract.1.0.wml: $(WEBWML)/social_contract.1.0.wml
cat $< |grep -v ^# >$@
@@ -93,7 +101,7 @@
cd $(WEBWML)/MailingLists && $(MAKE) mailing-lists.txt
else
%.wml:
- @echo "ERROR: Cannot find $(WEBWML) to regenerate the sources. Please read the TODO."
+ @echo "ERROR: Cannot find $(WEBWML) to regenerate the sources. Please read debian/README.source."
endif
# Not in Debian's website, therefore kept in our own SVN:
diff -Nru doc-debian-6.5/doc/social-contract.1.0.wml doc-debian-11.1/doc/social-contract.1.0.wml
--- doc-debian-6.5/doc/social-contract.1.0.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/social-contract.1.0.wml 2023-05-04 06:52:19.000000000 +0200
@@ -1,16 +1,18 @@
-<p>
- Version 1.0 ratified on July 5, 1997. Superseded by
- <a href="social_contract">Version 1.1</a>, ratified on April 26, 2004.
-</p>
+<p>Version 1.0 ratified on July 5, 1997.</p>
+
+<p>Superseded by
+<a href="social_contract.1.1">Version 1.1</a> ratified on April 26, 2004,
+and the <a href="social_contract">current version 1.2</a> ratified on
+October 1st, 2022.</p>
<p>Debian, the producers of the Debian GNU/Linux system, have created the
<strong>Debian Social Contract</strong>. The <a href="#guidelines">Debian Free Software
Guidelines (DFSG)</a> part of the contract, initially designed
as a set of commitments that we agree to abide by, has been adopted by
the free software community as the basis of the
-<a href="http://opensource.org/docs/osd";>Open Source Definition</a>.
+<a href="https://opensource.org/docs/osd";>Open Source Definition</a>.
<HR>
<h2>"Social Contract" with the Free Software Community</h2>
@@ -118,9 +120,9 @@
other programs distributed on the same medium must be free
software.</p>
<li><p><strong>Example Licenses</strong>
- <p>The "<strong><a href="http://www.gnu.org/copyleft/gpl.html";>GPL</a></strong>",
- "<strong><a href="misc/bsd.license">BSD</a></strong>", and
- "<strong><a href="http://perldoc.perl.org/perlartistic.html";>Artistic</a></strong>"
+ <p>The "<strong><a href="https://www.gnu.org/copyleft/gpl.html";>GPL</a></strong>",
+ "<strong><a href="https://opensource.org/licenses/BSD-3-Clause";>BSD</a></strong>", and
+ "<strong><a href="https://perldoc.perl.org/perlartistic.html";>Artistic</a></strong>"
licenses are examples of licenses that we consider "<em>free</em>".
</ol>
@@ -133,7 +135,7 @@
<p><em>Bruce Perens later removed the Debian-specific references from the
Debian Free Software Guidelines to create
-<a href="http://opensource.org/docs/definition.php";>“The Open
+<a href="https://opensource.org/docs/definition.php";>“The Open
Source Definition”</a>.</em></p>
<p><em>Other organizations may derive from and build on this document.
diff -Nru doc-debian-6.5/doc/social-contract.1.1.wml doc-debian-11.1/doc/social-contract.1.1.wml
--- doc-debian-6.5/doc/social-contract.1.1.wml 1970-01-01 01:00:00.000000000 +0100
+++ doc-debian-11.1/doc/social-contract.1.1.wml 2023-05-04 06:31:59.000000000 +0200
@@ -0,0 +1,162 @@
+
+
+<p>Version 1.1 ratified on April 26th, 2004.</p>
+
+<p>Superseded by
+the <a href="social_contract">current version 1.2</a> ratified on
+October 1st, 2022.</p>
+
+<p>Supersedes <a href="social_contract.1.0">Version 1.0</a> ratified on
+July 5th, 1997.</p>
+
+<p>Debian, the producers of the Debian system, have created the
+<strong>Debian Social Contract</strong>. The <a href="#guidelines">Debian Free Software
+Guidelines (DFSG)</a> part of the contract, initially designed
+as a set of commitments that we agree to abide by, has been adopted by
+the free software community as the basis of the
+<a href="https://opensource.org/docs/osd";>Open Source Definition</a>.</p>
+
+<hr />
+ <h2><q>Social Contract</q> with the Free Software Community</h2>
+
+ <ol>
+ <li>
+ <strong>Debian will remain 100% free</strong>
+ <p>
+ We provide the guidelines that we use to determine if a work
+ is <q><em>free</em></q> in the document entitled <q><cite>The Debian Free
+ Software Guidelines</cite></q>. We promise that the Debian system and
+ all its components will be free according to these
+ guidelines. We will support people who create or use both
+ free and non-free works on Debian. We will never make the
+ system require the use of a non-free component.
+ </p>
+ </li>
+ <li><strong>We will give back to the free software community</strong>
+ <p>
+ When we write new components of the Debian system, we will
+ license them in a manner consistent with the Debian Free
+ Software Guidelines. We will make the best system we can,
+ so that free works will be widely distributed and used. We
+ will communicate things such as bug fixes, improvements and
+ user requests to the <q><em>upstream</em></q> authors of works
+ included in our system.
+ </p>
+ </li>
+ <li><strong>We will not hide problems</strong>
+ <p>
+ We will keep our entire bug report database open for public
+ view at all times. Reports that people file online will
+ promptly become visible to others.
+ </p>
+ </li>
+ <li><strong>Our priorities are our users and free software</strong>
+ <p>
+ We will be guided by the needs of our users and the free
+ software community. We will place their interests first in
+ our priorities. We will support the needs of our users for
+ operation in many different kinds of computing
+ environments. We will not object to non-free works that are
+ intended to be used on Debian systems, or attempt to charge
+ a fee to people who create or use such works. We will allow
+ others to create distributions containing both the Debian
+ system and other works, without any fee from us. In
+ furtherance of these goals, we will provide an integrated
+ system of high-quality materials with no legal restrictions
+ that would prevent such uses of the system.
+ </p>
+ </li>
+ <li><strong>Works that do not meet our free software standards</strong>
+ <p>
+ We acknowledge that some of our users require the use of
+ works that do not conform to the Debian Free Software
+ Guidelines. We have created <q><code>contrib</code></q> and
+ <q><code>non-free</code></q> areas in our archive for these
+ works. The packages in these areas are not part of the
+ Debian system, although they have been configured for use
+ with Debian. We encourage CD manufacturers to read the
+ licenses of the packages in these areas and determine if
+ they can distribute the packages on their CDs. Thus,
+ although non-free works are not a part of Debian, we support
+ their use and provide infrastructure for non-free packages
+ (such as our bug tracking system and mailing lists).
+ </p>
+ </li>
+ </ol>
+<hr />
+<h2 id="guidelines">The Debian Free Software Guidelines (DFSG)</h2>
+<ol>
+ <li><p><strong>Free Redistribution</strong></p>
+ <p>The license of a Debian component may not restrict any
+ party from selling or giving away the software as a
+ component of an aggregate software distribution containing
+ programs from several different sources. The license may not
+ require a royalty or other fee for such sale.</p></li>
+ <li><p><strong>Source Code</strong></p>
+ <p>The program must include source code, and must allow
+ distribution in source code as well as compiled
+ form.</p></li>
+ <li><p><strong>Derived Works</strong></p>
+ <p>The license must allow modifications and derived works, and
+ must allow them to be distributed under the same terms as
+ the license of the original software.</p></li>
+ <li><p><strong>Integrity of The Author's Source Code</strong></p>
+ <p>The license may restrict source-code from being distributed
+ in modified form <strong>only</strong> if the license allows
+ the distribution of <q><tt>patch files</tt></q> with the source
+ code for the purpose of modifying the program at build
+ time. The license must explicitly permit distribution of
+ software built from modified source code. The license may
+ require derived works to carry a different name or version
+ number from the original software. (<em>This is a
+ compromise. The Debian group encourages all authors not to
+ restrict any files, source or binary, from being
+ modified.</em>)</p></li>
+ <li><p><strong>No Discrimination Against Persons or Groups</strong></p>
+ <p>The license must not discriminate against any person or
+ group of persons.</p></li>
+ <li><p><strong>No Discrimination Against Fields of Endeavor</strong></p>
+ <p>The license must not restrict anyone from making use of the
+ program in a specific field of endeavor. For example, it may
+ not restrict the program from being used in a business, or
+ from being used for genetic research.</p></li>
+ <li><p><strong>Distribution of License</strong></p>
+ <p>The rights attached to the program must apply to all to
+ whom the program is redistributed without the need for
+ execution of an additional license by those
+ parties.</p></li>
+ <li><p><strong>License Must Not Be Specific to Debian</strong></p>
+ <p>The rights attached to the program must not depend on the
+ program's being part of a Debian system. If the program is
+ extracted from Debian and used or distributed without Debian
+ but otherwise within the terms of the program's license, all
+ parties to whom the program is redistributed should have the
+ same rights as those that are granted in conjunction with
+ the Debian system.</p></li>
+ <li><p><strong>License Must Not Contaminate Other Software</strong></p>
+ <p>The license must not place restrictions on other software
+ that is distributed along with the licensed
+ software. For example, the license must not insist that all
+ other programs distributed on the same medium must be free
+ software.</p></li>
+ <li><p><strong>Example Licenses</strong></p>
+ <p>The <q><strong><a href="https://www.gnu.org/copyleft/gpl.html";>GPL</a></strong></q>,
+ <q><strong><a href="https://opensource.org/licenses/BSD-3-Clause";>BSD</a></strong></q>, and
+ <q><strong><a href="https://perldoc.perl.org/perlartistic.html";>Artistic</a></strong></q>
+ licenses are examples of licenses that we consider <q><em>free</em></q>.</p></li>
+</ol>
+
+<p><em>The concept of stating our <q>social contract with the free
+software community</q> was suggested by Ean Schuessler. This document
+was drafted by Bruce Perens, refined by the other Debian developers
+during a month-long e-mail conference in June 1997, and then
+<a href="https://lists.debian.org/debian-announce/debian-announce-1997/msg00017.html";>\
+accepted</a> as the publicly stated policy of the Debian Project.</em></p>
+
+<p><em>Bruce Perens later removed the Debian-specific references from the
+Debian Free Software Guidelines to create
+<a href="https://opensource.org/docs/definition.php";><q>The Open
+Source Definition</q></a>.</em></p>
+
+<p><em>Other organizations may derive from and build on this document.
+Please give credit to the Debian project if you do.</em></p>
diff -Nru doc-debian-6.5/doc/social-contract.wml doc-debian-11.1/doc/social-contract.wml
--- doc-debian-6.5/doc/social-contract.wml 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/social-contract.wml 2023-05-04 06:40:20.000000000 +0200
@@ -5,9 +5,11 @@
:#meta#}
-<p>
- Version 1.1 ratified on April 26, 2004. Supersedes
- <a href="social_contract.1.0">Version 1.0</a> ratified on July 5, 1997.
+<p>Version 1.2 ratified on October 1st, 2022.</p>
+
+<p>Supersedes
+<a href="social_contract.1.1">Version 1.1</a> ratified on April 26th, 2004,
+and <a href="social_contract.1.0">Version 1.0</a> ratified on July 5, 1997.
</p>
<p>Debian, the producers of the Debian system, have created the
@@ -15,7 +17,7 @@
Guidelines (DFSG)</a> part of the contract, initially designed
as a set of commitments that we agree to abide by, has been adopted by
the free software community as the basis of the
-<a href="http://opensource.org/docs/osd";>Open Source Definition</a>.</p>
+<a href="https://opensource.org/docs/osd";>Open Source Definition</a>.</p>
<hr />
<h2><q>Social Contract</q> with the Free Software Community</h2>
@@ -80,7 +82,10 @@
they can distribute the packages on their CDs. Thus,
although non-free works are not a part of Debian, we support
their use and provide infrastructure for non-free packages
- (such as our bug tracking system and mailing lists).
+ (such as our bug tracking system and mailing lists). The Debian
+ official media may include firmware that is otherwise not part
+ of the Debian system to enable use of Debian with hardware that
+ requires such firmware.
</p>
</li>
</ol>
@@ -141,9 +146,9 @@
other programs distributed on the same medium must be free
software.</p></li>
<li><p><strong>Example Licenses</strong></p>
- <p>The <q><strong><a href="http://www.gnu.org/copyleft/gpl.html";>GPL</a></strong></q>,
- <q><strong><a href="misc/bsd.license">BSD</a></strong></q>, and
- <q><strong><a href="http://perldoc.perl.org/perlartistic.html";>Artistic</a></strong></q>
+ <p>The <q><strong><a href="https://www.gnu.org/copyleft/gpl.html";>GPL</a></strong></q>,
+ <q><strong><a href="https://opensource.org/licenses/BSD-3-Clause";>BSD</a></strong></q>, and
+ <q><strong><a href="https://perldoc.perl.org/perlartistic.html";>Artistic</a></strong></q>
licenses are examples of licenses that we consider <q><em>free</em></q>.</p></li>
</ol>
@@ -156,7 +161,7 @@
<p><em>Bruce Perens later removed the Debian-specific references from the
Debian Free Software Guidelines to create
-<a href="http://opensource.org/docs/definition.php";><q>The Open
+<a href="https://opensource.org/docs/definition.php";><q>The Open
Source Definition</q></a>.</em></p>
<p><em>Other organizations may derive from and build on this document.
diff -Nru doc-debian-6.5/debian/changelog doc-debian-11.1/debian/changelog
--- doc-debian-6.5/debian/changelog 2021-01-01 14:27:12.000000000 +0100
+++ doc-debian-11.1/debian/changelog 2023-05-08 07:21:32.000000000 +0200
@@ -1,3 +1,54 @@
+doc-debian (11.1) unstable; urgency=high
+
+ * Properly close relevant bugreports in previous changelog entries.
+
+ -- Joost van Baal-Ilić <joostvb@debian.org> Mon, 08 May 2023 07:21:32 +0200
+
+doc-debian (11.0) unstable; urgency=high
+
+ * urgency set to high in order to get this shipped with upcoming
+ Debian 12 bookworm release.
+
+ [ Changes by Joost van Baal-Ilić ]
+ * debian/doc-debian.doc-base.debian-social-contract: Fix typo:
+ s/DFGS/DFSG/. Thanks Legimet. (Closes: #843449)
+ * debian/control: get rid of useless "Suggests: postscript-viewer,
+ www-browser". Thanks Jakub Wilk. (Closes: #798013)
+ * doc/*wml, doc/*inc: updated with latest content as found in webwml git
+ sources at https://salsa.debian.org/webmaster-team/webwml.git:
+ - doc/constitution.1.{0..6}.wml, doc/constitution.wml,
+ doc/social-contract.{1.0,}wml: update URLs: minor fixes in wml
+ syntax / layout, change http to https; in introduction, refer to
+ constitution versions 1.5 (jan 2015), 1.6 (dec 2015) and
+ 1.7 (aug 2016)
+ - bug-log-{access,mailserver}.wml, bug-maint-{info,mailcontrol}.wml,
+ bug-{mailserver-refcard,reporting}.wml, bug-pkgreport-opts.inc:
+ various updates. Thanks Jakub Wilk. (Closes: #1031294)
+ * Add Debian Social Contract version 1.2:
+ - doc/Makefile: add support for social-contract.1.1.wml (apr 2004).
+ - doc/social-contract.*: renamed: social-contract.wml ->
+ social-contract.1.1.wml
+ - doc/social-contract.1.1.wml: updated header
+ - doc/social-contract.wml: we now ship Debian Social Contract, Version
+ 1.2 ratified on October 1st, 2022.
+ * Add Debian Constitution 1.9 (mar 2022) and 1.8 (jan 2022). Thanks Raúl
+ Benencia. (Closes: #1020509)
+ - doc/constitution.*: renamed: constitution.wml ->
+ constitution.1.7.wml
+ - doc/constitution.1.8.wml: we now ship Debian Constitution 1.8 (jan
+ 2022)
+ - doc/constitution.wml: we now ship Debian Constitution 1.9 (mar 2022)
+ * doc/mailing-lists.txt: Update with nov 2021 content from web pages.
+ * doc/Makefile: fix/update error message for missing $(WEBWML).
+ * debian/README.source: website content (since long) moved from cvs to
+ git; update our instructions. Add hint on how one might want to
+ perform a 'git clone'.
+ * debian/{compat,control}: update debhelper compatibility version from
+ deprecated 9 to 10.
+ * tnx _jwilk for prodding me to finally upload.
+
+ -- Joost van Baal-Ilić <joostvb@debian.org> Thu, 04 May 2023 04:09:36 +0200
+
doc-debian (6.5) unstable; urgency=medium
[ Changes by Joost van Baal-Ilić ]
@@ -60,7 +111,7 @@
* Update the contents to the latest available at the website:
- the whole content is now in UTF-8 as the website (Closes: #737120)
* Restore list of tags and severities (Closes: #711248)
- * Update Vcs-* fields
+ * Update Vcs-* fields
* Drop useless GNU/Linux from description
* Use dh 9 short rules instead of CDBS
* Use format 3.0 (quilt)
@@ -70,9 +121,9 @@
doc-debian (6.1) unstable; urgency=low
- * Update the contents to the latest available at the website
- * Simplify debian/rules using CDBS
- - Use standard build process. This build now ensures that we provide
+ * Update the contents to the latest available at the website
+ * Simplify debian/rules using CDBS
+ - Use standard build process. This build now ensures that we provide
a md5sums file (Closes: #672319)
- Text files are now compressed
- Some Lintian bugs now go away
@@ -85,7 +136,7 @@
doc-debian (6.0) unstable; urgency=low
- * Update the contents to the latest available at the website
+ * Update the contents to the latest available at the website
* Remove Pierre Machard as Uploader (Closes: 576557)
* doc/source-unpack.txt: Apply patch provided by Colin Watson to improve
the document. This patch documents all formats currently in use in the
@@ -106,11 +157,11 @@
- Updated bug-maint-mailcontrol.txt which now describes
the 'unarchive' option (Closes: 489517)
- Update the constitution version to 1.4 (Closes: #520684, #367787)
- - Update bug-maint-mailcontrol.txt which now describes
+ - Update bug-maint-mailcontrol.txt which now describes
the possibility of forwarding to URLs (Closes: #457715)
* Fix doc/Makefile so that the social contract file is not overwritten
with version 1.0 (Closes: #512251)
- * Modify doc/Makefile so that the constitution.wml file is changed
+ * Modify doc/Makefile so that the constitution.wml file is changed
by introducing a heading style before the table of content, this way
the formatting of headings is improved (Closes: #520960)
@@ -164,7 +215,7 @@
as the latest releas e]
* Updated the contents under doc/ with the latest version from the website
* Synchronise the FAQ contents with CVS:
- - Update the numbers
+ - Update the numbers
- Add 'lenny' into the list of codenames
- Update and expand the contents of the standard task (no longer includes
developer tools)
diff -Nru doc-debian-6.5/debian/compat doc-debian-11.1/debian/compat
--- doc-debian-6.5/debian/compat 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/debian/compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-9
diff -Nru doc-debian-6.5/debian/control doc-debian-11.1/debian/control
--- doc-debian-6.5/debian/control 2021-01-01 10:33:00.000000000 +0100
+++ doc-debian-11.1/debian/control 2023-05-04 07:03:35.000000000 +0200
@@ -4,6 +4,7 @@
Maintainer: Javier Fernández-Sanguino Peña <jfs@debian.org>
Uploaders: Josip Rodin <joy-packages@debian.org>, Joost van Baal-Ilić <joostvb@debian.org>
Standards-Version: 3.9.8
+Build-Depends: debhelper-compat (= 10)
Build-Depends-Indep: debhelper (>= 9), lynx, wml
Vcs-Browser: https://salsa.debian.org/ddp-team/doc-debian
Vcs-Git: https://salsa.debian.org/ddp-team/doc-debian.git
@@ -11,7 +12,6 @@
Package: doc-debian
Architecture: all
Depends: ${misc:Depends}
-Suggests: postscript-viewer, www-browser
Recommends: debian-faq
Description: Debian Project documentation and other documents
The Debian Project is an association of individuals who have made
diff -Nru doc-debian-6.5/debian/doc-debian.doc-base.debian-social-contract doc-debian-11.1/debian/doc-debian.doc-base.debian-social-contract
--- doc-debian-6.5/debian/doc-debian.doc-base.debian-social-contract 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/debian/doc-debian.doc-base.debian-social-contract 2021-11-22 10:04:19.000000000 +0100
@@ -2,7 +2,7 @@
Title: The Debian Social Contract, and the Debian Free Software Guidelines
Author: The Debian Project
Abstract: This is the "social contract" (v1.1) we offer to the free software
- community. The Debian Free Software Guidelines (DFGS) are the set of
+ community. The Debian Free Software Guidelines (DFSG) are the set of
license conditions to be met for packages to be part of the Debian system.
The version 1.1 ratified on April 26, 2004. This version supersedes version
1.0, ratified on April 5, 1997.
diff -Nru doc-debian-6.5/debian/README.source doc-debian-11.1/debian/README.source
--- doc-debian-6.5/debian/README.source 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/debian/README.source 2023-05-04 07:22:53.000000000 +0200
@@ -1,8 +1,7 @@
- The documents under doc/ can be auto-updated if you have a local
- website CVS copy from e.g.
- :pserver:anonymous@anonscm.debian.org:/cvs/webwml . (See
- https://www.debian.org/devel/website/using_cvs .)
+ website VCS copy from e.g. https://salsa.debian.org/webmaster-team/webwml
+ (See https://www.debian.org/devel/website .)
Once you've set up some symlinks, and you've updated doc/Makefile,
you should be able to run e.g.
@@ -11,12 +10,12 @@
to get a copy of constitution.1.6.wml. Once that's there, run
- % svn add constitution.1.6.wml
- % svn commit -m 'imported constitution.1.6.wml'
+ % git add constitution.1.6.wml
+ % git commit -m 'imported constitution.1.6.wml'
. Or use the "update" make target.
---Joost van Baal-Ilić, august 2016
+--Joost van Baal-Ilić, august 2016, may 2023
@@ -34,9 +33,32 @@
Build instructions:
+ joostvb@dazbog:~/git/debian% git clone git@salsa.debian.org:webmaster-team/webwml.git
+
+(or, e.g. if you're low on disk space / network bandwidth:
+
+ git clone --depth 1 --no-single-branch git@salsa.debian.org:webmaster-team/webwml.git
+
+)
+
root@nagy:~# aptitude update && aptitude -V install wml
- joostvb@nagy:~/debian% ln -s ../cvs/cvs.debian.org/webwml www
+ joostvb@dazbog:~/debian/www% ln -s ../../git/debian/webwml
+
+ joostvb@dazbog:~/git/doc-debian/doc-debian% debuild
+
+ (test, install, ...)
+
+ joostvb@dazbog:~/git/doc-debian/doc-debian% debclean
+
+ joostvb@dazbog:~/git/doc-debian/doc-debian% debuild -kB8FAC2E250475B8CE940A91957930DAB0B86B067 -S
+
+ joostvb@dazbog:~/git/doc-debian/doc-debian% dupload --to debian-ftp ../doc-debian_11.0_source.changes
+
+--Joost van Baal-Ilić, may 2023
+
+
+Obsolete svn era build instructions (fixme: we should git tag our builds)
joostvb@nagy:~/sv...ackages/trunk/doc-debian% cat ~/bin/svn-prebuild
#!/bin/sh
diff -Nru doc-debian-6.5/doc/bug-log-access.wml doc-debian-11.1/doc/bug-log-access.wml
diff -Nru doc-debian-6.5/doc/bug-log-mailserver.wml doc-debian-11.1/doc/bug-log-mailserver.wml
diff -Nru doc-debian-6.5/doc/bug-mailserver-refcard.wml doc-debian-11.1/doc/bug-mailserver-refcard.wml
diff -Nru doc-debian-6.5/doc/bug-maint-info.wml doc-debian-11.1/doc/bug-maint-info.wml
diff -Nru doc-debian-6.5/doc/bug-maint-mailcontrol.wml doc-debian-11.1/doc/bug-maint-mailcontrol.wml
diff -Nru doc-debian-6.5/doc/bug-pkgreport-opts.inc doc-debian-11.1/doc/bug-pkgreport-opts.inc
diff -Nru doc-debian-6.5/doc/bug-reporting.wml doc-debian-11.1/doc/bug-reporting.wml
diff -Nru doc-debian-6.5/doc/constitution.1.0.wml doc-debian-11.1/doc/constitution.1.0.wml
diff -Nru doc-debian-6.5/doc/constitution.1.1.wml doc-debian-11.1/doc/constitution.1.1.wml
diff -Nru doc-debian-6.5/doc/constitution.1.2.wml doc-debian-11.1/doc/constitution.1.2.wml
diff -Nru doc-debian-6.5/doc/constitution.1.3.wml doc-debian-11.1/doc/constitution.1.3.wml
diff -Nru doc-debian-6.5/doc/constitution.1.4.wml doc-debian-11.1/doc/constitution.1.4.wml
diff -Nru doc-debian-6.5/doc/constitution.1.5.wml doc-debian-11.1/doc/constitution.1.5.wml
diff -Nru doc-debian-6.5/doc/constitution.1.6.wml doc-debian-11.1/doc/constitution.1.6.wml
diff -Nru doc-debian-6.5/doc/constitution.1.7.wml doc-debian-11.1/doc/constitution.1.7.wml
diff -Nru doc-debian-6.5/doc/constitution.1.8.wml doc-debian-11.1/doc/constitution.1.8.wml
diff -Nru doc-debian-6.5/doc/constitution.wml doc-debian-11.1/doc/constitution.wml
diff -Nru doc-debian-6.5/doc/mailing-lists.txt doc-debian-11.1/doc/mailing-lists.txt
diff -Nru doc-debian-6.5/doc/Makefile doc-debian-11.1/doc/Makefile
--- doc-debian-6.5/doc/Makefile 2020-12-31 08:50:36.000000000 +0100
+++ doc-debian-11.1/doc/Makefile 2023-05-04 06:37:36.000000000 +0200
@@ -12,8 +12,10 @@
bug-log-mailserver.wml bug-reporting.wml \
bug-mailserver-refcard.wml constitution.wml social-contract.wml \
bug-maint-info.wml constitution.1.1.wml social-contract.1.0.wml \
+social-contract.1.1.wml \
constitution.1.2.wml constitution.1.3.wml \
-constitution.1.4.wml constitution.1.5.wml constitution.1.6.wml
+constitution.1.4.wml constitution.1.5.wml constitution.1.6.wml \
+constitution.1.7.wml constitution.1.8.wml
# These are the automatic files we can generate:
TXTFILES = $(subst .wml,.txt,$(WMLFILES))
@@ -64,6 +66,10 @@
cat $< |grep -v ^# >$@
constitution.wml: $(WEBWML)/devel/constitution.wml
cat $< | perl -pe 's/<toc-add-entry /<h2><toc-add-entry /; s/toc-add-entry>/toc-add-entry><\/h2>/' | grep -v ^# >$@
+constitution.1.8.wml: $(WEBWML)/devel/constitution.1.8.wml
+ cat $< |grep -v ^# >$@
+constitution.1.7.wml: $(WEBWML)/devel/constitution.1.7.wml
+ cat $< |grep -v ^# >$@
constitution.1.6.wml: $(WEBWML)/devel/constitution.1.6.wml
cat $< |grep -v ^# >$@
constitution.1.5.wml: $(WEBWML)/devel/constitution.1.5.wml
@@ -82,6 +88,8 @@
cat $< |grep -v ^# >$@
social-contract.wml: $(WEBWML)/social_contract.wml
cat $< |grep -v ^# >$@
+social-contract.1.1.wml: $(WEBWML)/social_contract.1.1.wml
+ cat $< |grep -v ^# >$@
social-contract.1.0.wml: $(WEBWML)/social_contract.1.0.wml
cat $< |grep -v ^# >$@
@@ -93,7 +101,7 @@
cd $(WEBWML)/MailingLists && $(MAKE) mailing-lists.txt
else
%.wml:
- @echo "ERROR: Cannot find $(WEBWML) to regenerate the sources. Please read the TODO."
+ @echo "ERROR: Cannot find $(WEBWML) to regenerate the sources. Please read debian/README.source."
endif
# Not in Debian's website, therefore kept in our own SVN:
diff -Nru doc-debian-6.5/doc/social-contract.1.0.wml doc-debian-11.1/doc/social-contract.1.0.wml
diff -Nru doc-debian-6.5/doc/social-contract.1.1.wml doc-debian-11.1/doc/social-contract.1.1.wml
diff -Nru doc-debian-6.5/doc/social-contract.wml doc-debian-11.1/doc/social-contract.wml
Reply to: