------------------------------------------------------------
revno: 3723
committer: Matthew East <[EMAIL PROTECTED]>
branch nick: ubuntu-hardy
timestamp: Sun 2008-03-09 18:42:02 +0000
message:
* Adding html version of contributors file for serverguide
* New changelog entry with bug fixes
modified:
common/C/legalnotice.xml
debian/changelog
debian/rules
ubuntu/Makefile
=== modified file 'common/C/legalnotice.xml'
--- a/common/C/legalnotice.xml 2006-12-16 17:12:30 +0000
+++ b/common/C/legalnotice.xml 2008-03-09 18:42:02 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
- <legalnotice>
+ <legalnotice id="legal">
<title>Credits and License</title>
<para>This document is maintained by the Ubuntu documentation team
(https://wiki.ubuntu.com/DocumentationTeam). For a list of contributors, see
the <ulink url="../../../common/C/contributors.xml">contributors
page</ulink></para>
<para>This document is made available under the Creative Commons
ShareAlike 2.5 License (CC-BY-SA).</para>
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-02-20 07:57:34 +0000
+++ b/debian/changelog 2008-03-09 18:42:02 +0000
@@ -1,3 +1,12 @@
+ubuntu-docs (8.03.1) hardy; urgency=low
+
+ * New bzr checkout (LP: #49435, LP: #197557, LP: #172650, LP: #192202,
+ LP: #144788, LP: #162446, LP: #183339, LP: #195882)
+ * Include html version of contributors in ubuntu-serverguide (LP: #88814)
+ * Refresh pot templates
+
+ -- Matthew East <[EMAIL PROTECTED]> Sun, 09 Mar 2008 18:37:08 +0000
+
ubuntu-docs (8.02.2) hardy; urgency=low
* Adding translations for all documents
=== modified file 'debian/rules'
--- a/debian/rules 2008-02-16 18:34:17 +0000
+++ b/debian/rules 2008-03-09 18:42:02 +0000
@@ -95,6 +95,7 @@
cp -R generic/serverguide/sample/
debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/html/
cp ubuntu/libs/ubuntu-book.css
debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/common/
cp -R build/ubuntu/serverguide/*
debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/html/
+ cp build/common/C/contributors.html
debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/common/C/
binary-fixup/ubuntu-docs::
(cd debian/ubuntu-docs; ../../symlink-dupes)
=== modified file 'ubuntu/Makefile'
--- a/ubuntu/Makefile 2008-02-16 14:39:59 +0000
+++ b/ubuntu/Makefile 2008-03-09 18:42:02 +0000
@@ -62,7 +62,7 @@
gdeb:
-all: clean style server index serverguide switching status
+all: clean style server index serverguide switching status contributors
for doc in `cat libs/shipped-docs`; do xsltproc --xinclude -o
$(BASE)$$doc/C/index.html $(UBUNTUCHUNKXSL) $$doc/C/$$doc.xml; done
@@ -110,8 +110,14 @@
serverguide: style
xsltproc --xinclude -o $(BASE)serverguide/C/index.html
$(UBUNTUCHUNKXSL) ../generic/serverguide/C/serverguide.xml
+ sed -i ../build/ubuntu/serverguide/C/ln-legal.html -e
"s#common/C/contributors\.xml#common/C/contributors\.html#g"
+
status: style
xsltproc --xinclude -o $(BASE)status/sg-report.xml $(wOS)
../generic/serverguide/C/serverguide.xml
xsltproc --xinclude -o $(BASE)status/sg-report.html $(NWDBXSL)
$(BASE)status/sg-report.xml
+
+contributors: style
+
+ xsltproc --stringparam root.filename "contributors" -o
../build/common/C/ $(UBUNTUCHUNKXSL) ../common/C/contributors.xml
--
https://code.launchpad.net/~ubuntu-core-doc/ubuntu-doc/ubuntu-hardy
You are receiving this branch notification because you are subscribed to it.
--
ubuntu-doc-commits mailing list
ubuntu-doc-commits@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits
