diff -pruN 11.0/debian/README.source 11.3+nmu1/debian/README.source --- 11.0/debian/README.source 2023-05-04 02:09:36.000000000 +0000 +++ 11.3+nmu1/debian/README.source 2023-05-23 22:38:09.000000000 +0000 @@ -1,7 +1,8 @@ - The documents under doc/ can be auto-updated if you have a local - website VCS copy from e.g. https://salsa.debian.org/webmaster-team/webwml - (See https://www.debian.org/devel/website .) + website CVS copy from e.g. + :pserver:anonymous@anonscm.debian.org:/cvs/webwml . (See + https://www.debian.org/devel/website/using_cvs .) Once you've set up some symlinks, and you've updated doc/Makefile, you should be able to run e.g. @@ -10,12 +11,12 @@ to get a copy of constitution.1.6.wml. Once that's there, run - % git add constitution.1.6.wml - % git commit -m 'imported constitution.1.6.wml' + % svn add constitution.1.6.wml + % svn commit -m 'imported constitution.1.6.wml' . Or use the "update" make target. ---Joost van Baal-Ilić, august 2016, may 2023 +--Joost van Baal-Ilić, august 2016 @@ -33,17 +34,9 @@ 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@dazbog:~/debian/www% ln -s ../../git/debian/webwml + joostvb@nagy:~/debian% ln -s ../cvs/cvs.debian.org/webwml www joostvb@nagy:~/sv...ackages/trunk/doc-debian% cat ~/bin/svn-prebuild #!/bin/sh diff -pruN 11.0/debian/TODO 11.3+nmu1/debian/TODO --- 11.0/debian/TODO 1970-01-01 00:00:00.000000000 +0000 +++ 11.3+nmu1/debian/TODO 2023-05-23 22:38:09.000000000 +0000 @@ -0,0 +1,10 @@ + + * FIXME update + debian/doc-debian.doc-base.debian-constitution-text + debian/doc-debian.doc-base.debian-mailing-lists + debian/doc-debian.doc-base.debian-manifesto + debian/doc-debian.doc-base.debian-reporting-bugs + debian/doc-debian.doc-base.debian-social-contract + : new versions of documents TODO + * FIXME update d/copyright: typos, "Debian GNU/Linux" + diff -pruN 11.0/debian/changelog 11.3+nmu1/debian/changelog --- 11.0/debian/changelog 2023-05-04 02:09:36.000000000 +0000 +++ 11.3+nmu1/debian/changelog 2023-05-23 22:39:14.000000000 +0000 @@ -1,3 +1,65 @@ +doc-debian (11.3+nmu1) unstable; urgency=medium + + * Non-maintainer upload. + * Upload to unstable. + + -- Luca Boccassi Tue, 23 May 2023 23:39:14 +0100 + +doc-debian (11.3) experimental; urgency=high + + * Improvements in previous d/changelog entry. + * debian/compat: restored. + + -- Joost van Baal-Ilić Sat, 13 May 2023 20:13:48 +0200 + +doc-debian (11.2) experimental; urgency=high + + * This release is targeted for Debian 12 bookworm: changes with what is + in testing now are minimal and suitable for an upload late in the + release cycle. + * debian/TODO: added + * Since we are being build with debhelper >= 13.4 from Aug 2021, we no + longer install /usr/share/doc-base/debian-*, but instead install + /usr/share/doc-base/doc-debian.debian-* , see #980903 and + debhelper/-/commit/8eac421c260e62bcecd571af225438e107b33157 . + (Closes: #1035913). Thanks Johannes Schauer Marin Rodrigues: "changed + /usr/share/doc-base/ paths". + * Revert all changes introduced in 11.0 and 11.1, _except_ for: + + 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 may 2023 content from web pages. + + doc/Makefile: fix/update error message for missing $(WEBWML). + + -- Joost van Baal-Ilić Thu, 11 May 2023 09:08:22 +0200 + +doc-debian (11.1) unstable; urgency=high + + * Properly close relevant bugreports in previous changelog entries. + + -- Joost van Baal-Ilić 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 @@ -17,7 +79,7 @@ doc-debian (11.0) unstable; urgency=high 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. + 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 -> @@ -25,7 +87,8 @@ doc-debian (11.0) unstable; urgency=high - 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): + * 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 diff -pruN 11.0/debian/compat 11.3+nmu1/debian/compat --- 11.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ 11.3+nmu1/debian/compat 2023-05-23 22:38:09.000000000 +0000 @@ -0,0 +1 @@ +9 diff -pruN 11.0/debian/control 11.3+nmu1/debian/control --- 11.0/debian/control 2023-05-04 02:09:36.000000000 +0000 +++ 11.3+nmu1/debian/control 2023-05-23 22:38:09.000000000 +0000 @@ -4,7 +4,6 @@ Priority: standard Maintainer: Javier Fernández-Sanguino Peña Uploaders: Josip Rodin , Joost van Baal-Ilić 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 @@ -12,6 +11,7 @@ Vcs-Git: https://salsa.debian.org/ddp-te 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 -pruN 11.0/debian/doc-debian.doc-base.debian-social-contract 11.3+nmu1/debian/doc-debian.doc-base.debian-social-contract --- 11.0/debian/doc-debian.doc-base.debian-social-contract 2021-11-22 09:04:19.000000000 +0000 +++ 11.3+nmu1/debian/doc-debian.doc-base.debian-social-contract 2023-05-23 22:38:42.000000000 +0000 @@ -2,7 +2,7 @@ Document: debian-social-contract 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 (DFSG) are the set of + community. The Debian Free Software Guidelines (DFGS) 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 -pruN 11.0/doc/bug-reporting.wml 11.3+nmu1/doc/bug-reporting.wml --- 11.0/doc/bug-reporting.wml 2023-05-04 02:09:36.000000000 +0000 +++ 11.3+nmu1/doc/bug-reporting.wml 2023-05-23 22:38:09.000000000 +0000 @@ -211,9 +211,8 @@ When the recipients reply they will prob message filed as a new bug report. This leads to many duplicated reports.

-

The right way to do this is to use the -X-Debbugs-CC header. Add a line like this to your -message's mail header:

+

The right way to do this is to use the X-Debbugs-CC +pseudo-header. Add a line like this to your message's pseudo-headers: 

  X-Debbugs-CC: other-list@cosmic.edu
diff -pruN 11.0/doc/constitution.1.6.wml 11.3+nmu1/doc/constitution.1.6.wml --- 11.0/doc/constitution.1.6.wml 2023-05-04 02:09:36.000000000 +0000 +++ 11.3+nmu1/doc/constitution.1.6.wml 2023-05-23 22:38:09.000000000 +0000 @@ -1,19 +1,22 @@

Historical version of the Constitution for the Debian Project (v1.6)

-

Version 1.6 ratified on December 13th, 2015. Supersedes +

Version 1.6 ratified on December 13th, 2015.

+ +

Superseded by +Version 1.7 ratified on August 14th, 2016, +Version 1.8 ratified on January 28th, 2022, +and the current version 1.9 ratified on March 26th, +2022.

+ +

Supersedes Version 1.5 ratified on January 9th, 2015, Version 1.4 ratified on October 7th, 2007, -Version 1.3 ratified on September 24th, -2006, -Version 1.2 ratified on October 29th, -2003 and -Version 1.1 ratified on June 21st, -2003, which itself supersedes Version 1.0 -ratified on December 2nd, 1998. -Superseded by the current version 1.7, -ratified on August 14th, 2016. -

+Version 1.3 ratified on September 24th, 2006, +Version 1.2 ratified on October 29th, 2003, +Version 1.1 ratified on June 21st, 2003, +and Version 1.0 ratified on December 2nd, +1998.