r9182 - in /packages/trunk/doc-debian: debian/changelog debian/control doc/Makefile
Author: jfs
Date: Sat Apr 14 10:03:30 2012
New Revision: 9182
URL: http://svn.debian.org/wsvn/?sc=1&rev=9182
Log:
Push the changes introduced in 4.0.2 which were made out of the SVN repository
Modified:
packages/trunk/doc-debian/debian/changelog
packages/trunk/doc-debian/debian/control
packages/trunk/doc-debian/doc/Makefile
Modified: packages/trunk/doc-debian/debian/changelog
URL: http://svn.debian.org/wsvn/packages/trunk/doc-debian/debian/changelog?rev=9182&op=diff
==============================================================================
--- packages/trunk/doc-debian/debian/changelog (original)
+++ packages/trunk/doc-debian/debian/changelog Sat Apr 14 10:03:30 2012
@@ -1,8 +1,23 @@
-doc-debian (4.0.2) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- Joost van Baal <joostvb@debian.org> Mon, 21 Apr 2008 08:10:20 +0200
+doc-debian (4.0.2) unstable; urgency=low
+
+ * Fix FTBFS by removing all Build-Depends-Indep dependencies, including
+ tetex-bin and tetex-extra dependencies as they are not really needed
+ (Closes: #562306)
+ * Update the contents of the doc/ subdir with the latest content of
+ the website.
+ - Include the version 1.3 of the constitution
+ - Updated bug-reporting.txt which nows describes
+ X-Debbugs-CC (Closes: #298991)
+ - Updated bug-maint-mailcontrol.txt which now describes
+ the 'unarchive' option (Closes: 489517)
+ - Update the constitution version to 1.4 (Closes: #520684, #367787)
+ * 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
+ by introducing a heading style before the table of content, this way
+ the formatting of headings is improved (Closes: #520960)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org> Mon, 11 Jan 2010 21:57:50 +0100
doc-debian (4.0.1) unstable; urgency=low
@@ -21,7 +36,7 @@
* doc/{source-unpack.txt,debian-manifesto}: now kept in our own SVN (these
are not published on the Debian website).
- -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org> Mon, 21 Apr 2008 08:00:33 +0200
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org> Tue, 29 Apr 2008 03:07:23 +0200
doc-debian (4.0) unstable; urgency=low
Modified: packages/trunk/doc-debian/debian/control
URL: http://svn.debian.org/wsvn/packages/trunk/doc-debian/debian/control?rev=9182&op=diff
==============================================================================
--- packages/trunk/doc-debian/debian/control (original)
+++ packages/trunk/doc-debian/debian/control Sat Apr 14 10:03:30 2012
@@ -3,7 +3,6 @@
Priority: standard
Maintainer: Javier Fernandez-Sanguino Pen~a <jfs@computer.org>
Uploaders: Pierre Machard <pmachard@debian.org>, Josip Rodin <joy-packages@debian.org>
-Build-Depends-Indep: debiandoc-sgml, tetex-bin, tetex-extra
Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/wsvn/ddp/packages/trunk/doc-debian/
Vcs-Svn: svn://svn.debian.org/ddp/packages/trunk/doc-debian/
Modified: packages/trunk/doc-debian/doc/Makefile
URL: http://svn.debian.org/wsvn/packages/trunk/doc-debian/doc/Makefile?rev=9182&op=diff
==============================================================================
--- packages/trunk/doc-debian/doc/Makefile (original)
+++ packages/trunk/doc-debian/doc/Makefile Sat Apr 14 10:03:30 2012
@@ -9,7 +9,7 @@
bug-log-mailserver.txt bug-reporting.txt mailing-lists.txt \
bug-mailserver-refcard.txt constitution.txt social-contract.txt \
bug-maint-info.txt constitution.1.1.txt social-contract.1.0.txt \
-constitution.1.2.txt social-contract.1.1.txt
+constitution.1.2.txt social-contract.txt constitution.1.3.txt
all: $(FILES)
@@ -43,6 +43,8 @@
bug-reporting.wml: $(WEBWML)/Bugs/Reporting.wml
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.3.wml: $(WEBWML)/devel/constitution.1.3.wml
cat $< |grep -v ^# >$@
constitution.1.2.wml: $(WEBWML)/devel/constitution.1.2.wml
cat $< |grep -v ^# >$@
@@ -52,11 +54,9 @@
cat $< |grep -v ^# >$@
mailing-lists.wml: $(WEBWML)/MailingLists/subscribe.wml
cat $< |grep -v ^# >$@
-social-contract.wml: $(WEBWML)/social_contract.1.1.wml
+social-contract.wml: $(WEBWML)/social_contract.wml
cat $< |grep -v ^# >$@
social-contract.1.0.wml: $(WEBWML)/social_contract.1.0.wml
- cat $< |grep -v ^# >$@
-social-contract.1.1.wml: $(WEBWML)/social_contract.1.0.wml
cat $< |grep -v ^# >$@
mailing-lists.txt: $(WEBWML)/MailingLists/mailing-lists.txt
Reply to: