[debian-edu-commits] debian-edu/debian-edu-doc.git (#184) - wheezy (branch) updated: 0.6.20070721-58-g86c2c04

David Prévot taffit at alioth.debian.org
Sat Oct 5 12:13:52 UTC 2013


The branch, wheezy has been updated
       via  86c2c04f9eaad2caee357bce5b92c28264a32e6d (commit)
      from  317720b4f1470f6e1618934aa6aa102055ce15cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                  |   13 +++++++------
 documentation/release-manual/get_images           |    4 ++--
 documentation/release-manual/images/worldmap.jpeg |  Bin 385455 -> 0 bytes
 documentation/release-manual/images/worldmap.png  |  Bin 0 -> 387163 bytes
 documentation/release-manual/release-manual.de.po |   14 +++++---------
 documentation/release-manual/release-manual.es.po |   12 ++++--------
 documentation/release-manual/release-manual.nb.po |    4 ++--
 documentation/release-manual/release-manual.xml   |    6 +++---
 8 files changed, 23 insertions(+), 30 deletions(-)
 delete mode 100644 documentation/release-manual/images/worldmap.jpeg
 create mode 100644 documentation/release-manual/images/worldmap.png

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 71d9e58..4950f25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
-debian-edu-doc (0.6.20070722) unstable; urgency=low
+debian-edu-doc (0.6.20071023) unstable; urgency=low
 
   * UNRELEASED.
   [ Petter Reinholdtsen ]
   * Modify release manual build rules for HTML documents, to avoid
     building the english version twice.
-  * Updated release manual source from the wiki.
   * Link to the english release manual for the languages without
     sufficient translations to get their own version.
 
@@ -13,16 +12,18 @@ debian-edu-doc (0.6.20070722) unstable; urgency=low
     release-manual.xml in order to use the images for both the
     html and pdf version
 
+  [ Luk Claes ]
+  * Remove myself from uploaders.
+
   [ Holger Levsen ]
   * small cleanups to get_images.pl and it's usage
   * renamed get_images.pl to get_images
   * debian/rules: make get-orig-source target idempotent (which means: you can
     run it more than once)
+  * Updated release manual source from the wiki.
+  * modified get_images.pl because the worldmap is now a png like the rest
 
-  [ Luk Claes ]
-  * Remove myself from uploaders.
-
- -- Luk Claes <luk at debian.org>  Sat,  1 Sep 2007 16:21:02 +0000
+ -- Holger Levsen <holger at debian.org>  Tue, 23 Oct 2007 13:50:19 +0200
 
 debian-edu-doc (0.6.20070721) unstable; urgency=low
 
diff --git a/documentation/release-manual/get_images b/documentation/release-manual/get_images
index 58b599a..ba29701 100755
--- a/documentation/release-manual/get_images
+++ b/documentation/release-manual/get_images
@@ -20,9 +20,9 @@ sub create ($) {
 	# use regex to replace the long url with shorter one
 	$name =~ s#/DebianEdu/Documentation/Etch/\w+\?action=AttachFile&do=get&target=([\w\d]+)#$1#g;
 	# special case the worldmap image
-	if ($name =~ m#http://www\.skolelinux\.no/slschools/worldmap\.php\?lang=en&foo=bar\.jpeg#) {
+	if ($name =~ m#http://www\.skolelinux\.no/slschools/worldmap\.php\?lang=en&image=worldmap\.png#) {
 		$url = $name;
-		$name = "worldmap.jpeg";
+		$name = "worldmap.png";
 	} else {
 		$url = $base . $link;
 	}
diff --git a/documentation/release-manual/images/worldmap.jpeg b/documentation/release-manual/images/worldmap.jpeg
deleted file mode 100644
index aef4652..0000000
Binary files a/documentation/release-manual/images/worldmap.jpeg and /dev/null differ
diff --git a/documentation/release-manual/images/worldmap.png b/documentation/release-manual/images/worldmap.png
new file mode 100644
index 0000000..bd43579
Binary files /dev/null and b/documentation/release-manual/images/worldmap.png differ
diff --git a/documentation/release-manual/release-manual.de.po b/documentation/release-manual/release-manual.de.po
index 112f52b..240a804 100644
--- a/documentation/release-manual/release-manual.de.po
+++ b/documentation/release-manual/release-manual.de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-21  2:12+0200\n"
+"POT-Creation-Date: 2007-10-23 13:28+0200\n"
 "PO-Revision-Date: 2007-10-19 17:22+0200\n"
 "Last-Translator: Roland F.Teichert <rfteichert at imail.de>\n"
 "Language-Team: Deutsch <de at li.org>\n"
@@ -2818,10 +2818,11 @@ msgstr ""
 msgid "Let us know you exist"
 msgstr ""
 
-# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+# type: Content of: <article><para><section><para><inlinemediaobject><textobject>
 #: release-manual.xml:961
-msgid "<phrase>worldmapphp?lang=en&foo=bar </phrase>"
-msgstr ""
+#, fuzzy
+msgid "<phrase>worldmapphp?lang=en&image=worldmap </phrase>"
+msgstr "<phrase>:)  </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
 #: release-manual.xml:965
@@ -3815,11 +3816,6 @@ msgstr ""
 #~ "<inlinemediaobject>"
 #~ msgstr "Paketes, das auf einem Webserver installiert werden kann."
 
-# type: Content of: <article><para><section><para><inlinemediaobject><textobject>
-#, fuzzy
-#~ msgid "<phrase>skolelinux-world </phrase>"
-#~ msgstr "<phrase>:)  </phrase>"
-
 # type: Content of: <article><para><section><para>
 #~ msgid ""
 #~ "<emphasis role='strong'>FIXME </emphasis>: Put full text of GPL into "
diff --git a/documentation/release-manual/release-manual.es.po b/documentation/release-manual/release-manual.es.po
index 6a6fd0c..60bdef8 100644
--- a/documentation/release-manual/release-manual.es.po
+++ b/documentation/release-manual/release-manual.es.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-10-21  2:12+0200\n"
+"POT-Creation-Date: 2007-10-23 13:28+0200\n"
 "PO-Revision-Date: 2007-07-22 10:19+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <es at li.org>\n"
@@ -3220,8 +3220,9 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
 #: release-manual.xml:961
-msgid "<phrase>worldmapphp?lang=en&foo=bar </phrase>"
-msgstr ""
+#, fuzzy
+msgid "<phrase>worldmapphp?lang=en&image=worldmap </phrase>"
+msgstr "<phrase>:-)  </phrase>"
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
 #: release-manual.xml:965
@@ -4900,11 +4901,6 @@ msgstr ""
 #~ msgid "document how to use aptitude upgrade / kde-update-notifier"
 #~ msgstr "documentar como usar aptitude upgrade /kde-update-notifier"
 
-# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#, fuzzy
-#~ msgid "<phrase>skolelinux-world </phrase>"
-#~ msgstr "<phrase>:-)  </phrase>"
-
 # type: Content of: <article><para><section><section><para>
 #~ msgid "FIXME: add info how developers and testers can contribute."
 #~ msgstr ""
diff --git a/documentation/release-manual/release-manual.nb.po b/documentation/release-manual/release-manual.nb.po
index 154ad30..fccb5de 100644
--- a/documentation/release-manual/release-manual.nb.po
+++ b/documentation/release-manual/release-manual.nb.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2007-10-21  2:12+0200\n"
+"POT-Creation-Date: 2007-10-23 13:29+0200\n"
 "PO-Revision-Date: 2007-07-14 11:34MET\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -2656,7 +2656,7 @@ msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
 #: release-manual.xml:961
-msgid "<phrase>worldmapphp?lang=en&foo=bar </phrase>"
+msgid "<phrase>worldmapphp?lang=en&image=worldmap </phrase>"
 msgstr ""
 
 # type: Content of: <article><para><section><section><para><inlinemediaobject>
diff --git a/documentation/release-manual/release-manual.xml b/documentation/release-manual/release-manual.xml
index b1d7017..ec4591f 100644
--- a/documentation/release-manual/release-manual.xml
+++ b/documentation/release-manual/release-manual.xml
@@ -4,7 +4,7 @@
 </title><para>This is the (<emphasis>still incomplete
 </emphasis>) release manual for the Debian Edu etch 3.0 release.  
 </para><para>This document was put into the <code>debian-edu-doc
-</code> package on <code>2007-10-21 00:12 UTC</code>.  
+</code> package on <code>2007-10-23 11:44 UTC</code>.  
 </para><para>The version at <ulink url='http://wiki.skolelinux.no/DebianEdu/Documentation/Etch'>http://wiki.skolelinux.no/DebianEdu/Documentation/Etch
 </ulink> is a wiki and updated frequently.  
 </para><para><ulink url='/DebianEdu/Documentation/Etch/Translations'>Translations
@@ -957,8 +957,8 @@ THEME="/usr/share/apps/kdm/themes/debian-moreblue"
 </section>
 </section> <para/><section><title>Contribute
 </title><para/><section><title>Let us know you exist
-</title><para><inlinemediaobject><imageobject><imagedata fileref='./images/worldmap.jpeg'/>
-</imageobject><textobject><phrase>worldmapphp?lang=en&foo=bar
+</title><para><inlinemediaobject><imageobject><imagedata fileref='./images/worldmap.png'/>
+</imageobject><textobject><phrase>worldmapphp?lang=en&image=worldmap
 </phrase>
 </textobject>
 </inlinemediaobject> 


hooks/post-receive
-- 
debian-edu-doc.git (Debian package debian-edu-doc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).




More information about the debian-edu-commits mailing list