[SCM] live-manual branch, debian, updated. debian/2.0_a1-1-16-gd1c1745

Daniel Baumann daniel at debian.org
Fri Jun 18 17:46:31 UTC 2010 

The following commit has been merged in the debian branch:
commit d1c17452345797379efdec8ee1cbc35553bdb23c
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jun 18 19:46:16 2010 +0200

    Also using an entity for the current year in the copyright year.

diff --git a/manual/bin/update-version.sh b/manual/bin/update-version.sh
index 3fc92e3..4f65f76 100755
--- a/manual/bin/update-version.sh
+++ b/manual/bin/update-version.sh
@@ -4,9 +4,11 @@ set -e
 
 DATE="$(LC_ALL=C date +%Y-%m-%d)"
 VERSION="$(cat ../VERSION)"
+YEAR="$(LC_ALL=C date +%Y)"
 
 echo "Updating version information..."
 
 sed -i  -e "s|<!ENTITY pubdate.*$|<!ENTITY pubdate \"${DATE}\">|" \
-	-e "s|<!ENTITY version.*$|<!ENTITY version \"${VERSION}\">|" \
+	-e "s|<!ENTITY releaseinfo.*$|<!ENTITY releaseinfo \"${VERSION}\">|" \
+	-e "s|<!ENTITY year.*$|<!ENTITY year \"${YEAR}\">|" \
 en/index.xml
diff --git a/manual/de/index.xml b/manual/de/index.xml
index b79afed..7d2a713 100644
--- a/manual/de/index.xml
+++ b/manual/de/index.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <!ENTITY pubdate "2010-06-18">
-<!ENTITY version "2.0~a1">
+<!ENTITY releaseinfo "2.0~a1">
+<!ENTITY year "2010">
 ]>
 <book lang="en">
   <title>Debian Live Manual</title>
   <bookinfo>
     <author> <othername>Debian Live Project</othername>
 <email>debian-live at lists.debian.org</email> </author>
-    <releaseinfo>&version;</releaseinfo>
-    <pubdate>&pubdate;</pubdate> <copyright> <year>2006-2010</year>
+    <releaseinfo>&releaseinfo;</releaseinfo>
+    <pubdate>&pubdate;</pubdate> <copyright> <year>2006-&year;</year>
 <holder>Debian Live Project</holder> </copyright>
     <legalnotice>
       <para>This program is free software: you can redistribute it and/or modify it
diff --git a/manual/en/index.xml b/manual/en/index.xml
index 3cd65ef..de980b6 100644
--- a/manual/en/index.xml
+++ b/manual/en/index.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <!ENTITY pubdate "2010-06-18">
-<!ENTITY version "2.0~a1">
+<!ENTITY releaseinfo "2.0~a1">
+<!ENTITY year "2010">
 ]>
 <book lang="en">
   <title>Debian Live Manual</title>
@@ -10,10 +11,10 @@
       <othername>Debian Live Project</othername>
       <email>debian-live at lists.debian.org</email>
     </author>
-    <releaseinfo>&version;</releaseinfo>
+    <releaseinfo>&releaseinfo;</releaseinfo>
     <pubdate>&pubdate;</pubdate>
     <copyright>
-      <year>2006-2010</year>
+      <year>2006-&year;</year>
       <holder>Debian Live Project</holder>
     </copyright>
     <legalnotice>
diff --git a/manual/po/de/index.xml.po b/manual/po/de/index.xml.po
index 3099b77..69d5666 100644
--- a/manual/po/de/index.xml.po
+++ b/manual/po/de/index.xml.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a1\n"
-"POT-Creation-Date: 2010-06-18 17:51+0300\n"
+"POT-Creation-Date: 2010-06-18 19:44+0300\n"
 "PO-Revision-Date: 2010-06-18 17:51+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,44 +20,49 @@ msgstr ""
 msgid "2010-06-18"
 msgstr ""
 
-#. type: Content of the version entity
+#. type: Content of the releaseinfo entity
 #: en/index.xml:4
 msgid "2.0~a1"
 msgstr ""
 
+#. type: Content of the year entity
+#: en/index.xml:5
+msgid "2010"
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
-#: en/index.xml:6
+#: en/index.xml:7
 msgid "en"
 msgstr ""
 
 #. type: Content of: <book><title>
-#: en/index.xml:7
+#: en/index.xml:8
 #, fuzzy
 #| msgid "Live Manual"
 msgid "Debian Live Manual"
 msgstr "Live Handbuch"
 
 #. type: Content of: <book><bookinfo>
-#: en/index.xml:9
+#: en/index.xml:10
 msgid ""
 "<author> <othername>Debian Live Project</othername> <email>debian-live at lists."
 "debian.org</email> </author>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><releaseinfo>
-#: en/index.xml:13
-msgid "&version;"
+#: en/index.xml:14
+msgid "&releaseinfo;"
 msgstr ""
 
 #. type: Content of: <book><bookinfo>
-#: en/index.xml:14
+#: en/index.xml:15
 msgid ""
-"<pubdate>&pubdate;</pubdate> <copyright> <year>2006-2010</year> "
+"<pubdate>&pubdate;</pubdate> <copyright> <year>2006-&year;</year> "
 "<holder>Debian Live Project</holder> </copyright>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:20
+#: en/index.xml:21
 msgid ""
 "This program is free software: you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -66,7 +71,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:21
+#: en/index.xml:22
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -75,7 +80,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:22
+#: en/index.xml:23
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see <ulink url=\"http://www.gnu.org/licenses/\">http://"
@@ -83,7 +88,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:23
+#: en/index.xml:24
 msgid ""
 "On Debian systems, the complete text of the GNU General Public License can "
 "be found in <ulink url=\"file:///usr/share/common-licenses/GPL-3\">/usr/"
diff --git a/manual/pot/index.xml.pot b/manual/pot/index.xml.pot
index 30147d4..a38789b 100644
--- a/manual/pot/index.xml.pot
+++ b/manual/pot/index.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-18 17:51+0300\n"
+"POT-Creation-Date: 2010-06-18 19:44+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,42 +20,47 @@ msgstr ""
 msgid "2010-06-18"
 msgstr ""
 
-#. type: Content of the version entity
+#. type: Content of the releaseinfo entity
 #: en/index.xml:4
 msgid "2.0~a1"
 msgstr ""
 
+#. type: Content of the year entity
+#: en/index.xml:5
+msgid "2010"
+msgstr ""
+
 #. type: Attribute 'lang' of: <book>
-#: en/index.xml:6
+#: en/index.xml:7
 msgid "en"
 msgstr ""
 
 #. type: Content of: <book><title>
-#: en/index.xml:7
+#: en/index.xml:8
 msgid "Debian Live Manual"
 msgstr ""
 
 #. type: Content of: <book><bookinfo>
-#: en/index.xml:9
+#: en/index.xml:10
 msgid ""
 "<author> <othername>Debian Live Project</othername> <email>debian-live at lists."
 "debian.org</email> </author>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><releaseinfo>
-#: en/index.xml:13
-msgid "&version;"
+#: en/index.xml:14
+msgid "&releaseinfo;"
 msgstr ""
 
 #. type: Content of: <book><bookinfo>
-#: en/index.xml:14
+#: en/index.xml:15
 msgid ""
-"<pubdate>&pubdate;</pubdate> <copyright> <year>2006-2010</year> "
+"<pubdate>&pubdate;</pubdate> <copyright> <year>2006-&year;</year> "
 "<holder>Debian Live Project</holder> </copyright>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:20
+#: en/index.xml:21
 msgid ""
 "This program is free software: you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -64,7 +69,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:21
+#: en/index.xml:22
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -73,7 +78,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:22
+#: en/index.xml:23
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see <ulink url=\"http://www.gnu.org/licenses/\">http://"
@@ -81,7 +86,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:23
+#: en/index.xml:24
 msgid ""
 "On Debian systems, the complete text of the GNU General Public License can "
 "be found in <ulink url=\"file:///usr/share/common-licenses/GPL-3\">/usr/"
diff --git a/manual/pot/project.xml.pot b/manual/pot/project.xml.pot
index 39b4e46..87e9713 100644
--- a/manual/pot/project.xml.pot
+++ b/manual/pot/project.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-18 19:32+0300\n"
+"POT-Creation-Date: 2010-06-18 19:44+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"

-- 
live-manual

More information about the debian-live-changes mailing list