diff -Nru doc-debian-6.4+nmu1/debian/changelog doc-debian-6.5/debian/changelog
--- doc-debian-6.4+nmu1/debian/changelog 2020-12-18 18:17:14.000000000 +0000
+++ doc-debian-6.5/debian/changelog 2021-01-01 13:27:12.000000000 +0000
@@ -1,9 +1,25 @@
-doc-debian (6.4+nmu1) unstable; urgency=medium
+doc-debian (6.5) unstable; urgency=medium
- * Non maintainer upload by the Reproducible Builds team.
- * No source change upload to rebuild on buildd with .buildinfo files.
+ [ Changes by Joost van Baal-Ilić ]
+ - doc/Makefile: apply patch contributed by intrigeri in
+ <85mvmyu0ee.fsf@boum.org>: "Once applied, doc-debian can be built
+ reproducibly in our current experimental framework." This fixes an
+ issue reported earlier by Daniel Kahn Gillmor: "currently, lynx
+ produces text output on the basis of the locale. this means that as
+ the locale differs, the generated .txt files change." (Closes: #791673,
+ #826544)
+ - debian/control: move from Vcs-Svn on anonscm.debian.org aka Alioth
+ (which was long gone) to Vcs-Git at
+ https://salsa.debian.org/ddp-team/doc-debian.git. (Closes: #922929)
+ - doc/constitution.wml, doc/constitution.1.6.wml: add missing end of
+ sentence "er than V(D,A)." in Item A.6.3.2, cf
+ https://www.debian.org/vote/2015/vote_003. Thanks Kurt Roeckx and Paul
+ Gevers. See also www.debian.org Bug #896067.
+ - debian/control: add myself to uploaders after OK from Javier
+ Fernández-Sanguino Peña in private communication (Message-ID:
+ ).
- -- Holger Levsen Fri, 18 Dec 2020 19:17:14 +0100
+ -- Joost van Baal-Ilić Fri, 01 Jan 2021 14:27:12 +0100
doc-debian (6.4) unstable; urgency=medium
diff -Nru doc-debian-6.4+nmu1/debian/control doc-debian-6.5/debian/control
--- doc-debian-6.4+nmu1/debian/control 2016-08-28 10:35:04.000000000 +0000
+++ doc-debian-6.5/debian/control 2021-01-01 09:33:00.000000000 +0000
@@ -2,11 +2,11 @@
Section: doc
Priority: standard
Maintainer: Javier Fernández-Sanguino Peña
-Uploaders: Josip Rodin
+Uploaders: Josip Rodin , Joost van Baal-Ilić
Standards-Version: 3.9.8
Build-Depends-Indep: debhelper (>= 9), lynx, wml
-Vcs-Browser: http://anonscm.debian.org/viewvc/ddp/packages/trunk/doc-debian/
-Vcs-Svn: svn://anonscm.debian.org/ddp/packages/trunk/doc-debian/
+Vcs-Browser: https://salsa.debian.org/ddp-team/doc-debian
+Vcs-Git: https://salsa.debian.org/ddp-team/doc-debian.git
Package: doc-debian
Architecture: all
@@ -27,5 +27,5 @@
* Debian Bug Tracking System documentation, and
* Introduction to the Debian mailing lists.
.
- All of these files are available at ftp://ftp.debian.org/debian/doc/ and
+ All of these files are available at http://ftp.debian.org/debian/doc/ and
mirrors thereof.
diff -Nru doc-debian-6.4+nmu1/doc/constitution.1.0.wml doc-debian-6.5/doc/constitution.1.0.wml
--- doc-debian-6.4+nmu1/doc/constitution.1.0.wml 2016-08-28 15:37:02.000000000 +0000
+++ doc-debian-6.5/doc/constitution.1.0.wml 2020-12-31 07:50:36.000000000 +0000
@@ -6,16 +6,10 @@
2003, which is itself superseded by version 1.2,
ratified on October 29th, 2003. Version 1.2 was again superseded by
version 1.3 ratified on September 24th, 2006.
-Version 1.3 was again superseded by version 1.4
+That was superseded by the current version
ratified on October 7th, 2007.
-That was superseded by the version 1.5
-ratified on January 9th, 2015, and again superseeded by the
-version 1.6, ratified on December 13th, 2015.
-That was superseeded by the current version 1.7,
-ratified on August 14th, 2016.
-
1. Introduction
The Debian Project is an association of individuals who have
diff -Nru doc-debian-6.4+nmu1/doc/constitution.1.1.wml doc-debian-6.5/doc/constitution.1.1.wml
--- doc-debian-6.4+nmu1/doc/constitution.1.1.wml 2016-08-28 15:37:04.000000000 +0000
+++ doc-debian-6.5/doc/constitution.1.1.wml 2020-12-31 07:50:36.000000000 +0000
@@ -6,16 +6,10 @@
1998. Superseded by version 1.2, ratified on October
29th, 2003, which was again superseded by version 1.3
ratified on September 24th, 2006.
-Version 1.3 was again superseded by version 1.4
+That was superseded by the current version, 1.4
ratified on October 7th, 2007.
-That was superseded by the version 1.5
-ratified on January 9th, 2015, and again superseeded by the
-version 1.6, ratified on December 13th, 2015.
-That was superseeded by the current version 1.7,
-ratified on August 14th, 2016.
-
1. Introduction
The Debian Project is an association of individuals who have
diff -Nru doc-debian-6.4+nmu1/doc/constitution.1.2.wml doc-debian-6.5/doc/constitution.1.2.wml
--- doc-debian-6.4+nmu1/doc/constitution.1.2.wml 2016-08-28 15:37:04.000000000 +0000
+++ doc-debian-6.5/doc/constitution.1.2.wml 2020-12-31 07:50:36.000000000 +0000
@@ -7,13 +7,8 @@
ratified on December 2nd, 1998.
Superseded by version 1.3, ratified on September
24th, 2006.
-Version 1.3 was again superseded by version 1.4
+That was superseded by the current version, 1.4
ratified on October 7th, 2007.
-That was superseded by the version 1.5
-ratified on January 9th, 2015, and again superseeded by the
-version 1.6, ratified on December 13th, 2015.
-That was superseeded by the current version 1.7,
-ratified on August 14th, 2016.
1. Introduction
diff -Nru doc-debian-6.4+nmu1/doc/constitution.1.3.wml doc-debian-6.5/doc/constitution.1.3.wml
--- doc-debian-6.4+nmu1/doc/constitution.1.3.wml 2016-08-28 15:37:04.000000000 +0000
+++ doc-debian-6.5/doc/constitution.1.3.wml 2020-12-31 07:50:36.000000000 +0000
@@ -7,13 +7,8 @@
Version 1.1 ratified on June 21st,
2003, which itself supersedes Version 1.0
ratified on December 2nd, 1998.
-Version 1.3 was again superseded by version 1.4
+That was superseded by the current version, 1.4
ratified on October 7th, 2007.
-That was superseded by the version 1.5
-ratified on January 9th, 2015, and again superseeded by the
-version 1.6, ratified on December 13th, 2015.
-That was superseeded by the current version 1.7,
-ratified on August 14th, 2016.
diff -Nru doc-debian-6.4+nmu1/doc/constitution.1.4.wml doc-debian-6.5/doc/constitution.1.4.wml
--- doc-debian-6.4+nmu1/doc/constitution.1.4.wml 2016-08-28 15:37:05.000000000 +0000
+++ doc-debian-6.5/doc/constitution.1.4.wml 2020-12-31 07:50:36.000000000 +0000
@@ -1,5 +1,6 @@
-Historical version of the Constitution for the Debian Project (v1.4)
+Constitution for the Debian Project (v1.4)
+
Version 1.4 ratified on October 7th, 2007. Supersedes
Version 1.3 ratified on September 24th,
@@ -8,17 +9,11 @@
2003 and
Version 1.1 ratified on June 21st,
2003, which itself supersedes Version 1.0
-ratified on December 2nd, 1998.
-That was superseded by the version 1.5
-ratified on January 9th, 2015, and again superseeded by the
-version 1.6, ratified on December 13th, 2015.
-That was superseeded by the current version 1.7,
-ratified on August 14th, 2016.
-
+ratified on December 2nd, 1998.
-1. Introduction
+1. Introduction
The Debian Project is an association of individuals who have
made common cause to create a free operating system.
@@ -28,7 +23,7 @@
Project or how it achieves them, or contain any policies except those
directly related to the decision-making process.
-2. Decision-making bodies and individuals
+2. Decision-making bodies and individuals
Each decision in the Project is made by one or more of the
following:
@@ -81,7 +76,7 @@
-3. Individual Developers
+3. Individual Developers
3.1. Powers
@@ -122,7 +117,7 @@
Developers may make these decisions as they see fit.
-4. The Developers by way of General Resolution or election
+4. The Developers by way of General Resolution or election
4.1. Powers
@@ -260,7 +255,7 @@
-5. Project Leader
+5. Project Leader
5.1. Powers
@@ -398,7 +393,7 @@
The Project Leader should avoid overemphasizing their own point of
view when making decisions in their capacity as Leader.
-6. Technical committee
+6. Technical committee
6.1. Powers
@@ -588,7 +583,7 @@
-7. The Project Secretary
+7. The Project Secretary
7.1. Powers
@@ -650,7 +645,7 @@
make decisions only when absolutely necessary and only when consistent
with the consensus of the Developers.
-8. The Project Leader's Delegates
+8. The Project Leader's Delegates
8.1. Powers
@@ -679,7 +674,7 @@
Delegates may make decisions as they see fit, but should attempt to
implement good technical decisions and/or follow consensus opinion.
-9. Assets held in trust for Debian
+9. Assets held in trust for Debian
In most jurisdictions around the world, the Debian project is not
in a position to directly hold funds or other property. Therefore,
@@ -743,7 +738,7 @@
that includes the commitments those organisations have made as
to how those assets will be handled.
-A. Standard Resolution Procedure
+A. Standard Resolution Procedure
These rules apply to communal decision-making by committees and
plebiscites, where stated above.
@@ -962,7 +957,7 @@
supermajority and/or the quorum (and default option) to be
used.
-B. Use of language and typography
+B. Use of language and typography
The present indicative (is
, for example) means that the statement
is a rule in this constitution. May
or can
indicates that the
diff -Nru doc-debian-6.4+nmu1/doc/constitution.1.6.wml doc-debian-6.5/doc/constitution.1.6.wml
--- doc-debian-6.4+nmu1/doc/constitution.1.6.wml 2016-08-28 10:35:04.000000000 +0000
+++ doc-debian-6.5/doc/constitution.1.6.wml 2020-12-31 07:50:36.000000000 +0000
@@ -915,7 +915,7 @@
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 great
+ 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).
If a supermajority of S:1 is required for A, its majority ratio
diff -Nru doc-debian-6.4+nmu1/doc/constitution.wml doc-debian-6.5/doc/constitution.wml
--- doc-debian-6.4+nmu1/doc/constitution.wml 2016-08-28 15:37:03.000000000 +0000
+++ doc-debian-6.5/doc/constitution.wml 2020-12-31 07:50:36.000000000 +0000
@@ -1,7 +1,7 @@
Constitution for the Debian Project (v1.7)
-Version 1.7 ratified on August 14th, 2016. Supersedes
+
Version 1.7 ratified on August 14th, 2016. Supersedes
Version 1.6 ratified on December 13th, 2015,
Version 1.5 ratified on January 9th, 2015,
Version 1.4 ratified on October 7th, 2007,
@@ -913,7 +913,7 @@
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 great
+ 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).
If a supermajority of S:1 is required for A, its majority ratio
diff -Nru doc-debian-6.4+nmu1/doc/Makefile doc-debian-6.5/doc/Makefile
--- doc-debian-6.4+nmu1/doc/Makefile 2016-08-28 10:35:04.000000000 +0000
+++ doc-debian-6.5/doc/Makefile 2020-12-31 07:50:36.000000000 +0000
@@ -4,7 +4,7 @@
LANGUAGE = english
# Adjust this (or create a symlink) to the location of your webml copy (if you have one)
# If this directory does not exist the 'update' call will not be able to run, read
-# the README-build file to know how to set it up
+# the debian/README.source file to know how to set it up
WEBWML = ~/debian/www/webwml/$(LANGUAGE)
WMLFILES= \
@@ -40,7 +40,7 @@
wml -i bug-pkgreport-opts.inc -q $< >$@
%.txt: %.html
- lynx -dump -nolist $< >$@
+ lynx -dump -nolist -display_charset=UTF-8 -assume_charset=UTF-8 $< >$@
# These rules are conditioned to the existence of $(WEBWML)
# so that the package can be built regardless of its existence