[debian-edu-commits] debian-edu/ 01/03: Add new script documentation/bin/get_manual_version for build without network.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-doc.

commit 0a078434e47fd1a8f6b7824a0247e209c90fe2f1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 4 17:35:29 2014 +0000

    Add new script documentation/bin/get_manual_version for build without network.
    
    Add new script documentation/bin/get_manual_version and call this from the
    get-orig-source target to write documation/debian-edu-$suite/version, which
    then gets used by documation/debian-edu-$suite/Makefile. This removes the need
    for network access during build of all targets, which is a serious bug. Now
    network is only needed for get-orig-source which is obviously needs it.
    
    Add generated files documentation/debian-edu-$suite/version to git too.
---
 debian/changelog                         |  6 ++++++
 documentation/common/Makefile.common     |  1 +
 documentation/debian-edu-jessie/Makefile |  2 +-
 documentation/debian-edu-jessie/version  |  1 +
 documentation/debian-edu-wheezy/Makefile |  2 +-
 documentation/debian-edu-wheezy/version  |  1 +
 documentation/scripts/get_manual_version | 23 +++++++++++++++++++++++
 7 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b2d964..8e342c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,12 @@ debian-edu-doc (1.5~XXX) UNRELEASED; urgency=medium
     changes.
   * Add jessie images uploaded to the wiki by Wolfgang
   * Fix a rather important s#squeeze#jessie# in debian/rules
+  * Add new script documentation/bin/get_manual_version and call this from the
+    get-orig-source target to write documation/debian-edu-$suite/version,
+    which then gets used by documation/debian-edu-$suite/Makefile. This
+    removes the need for network access during build of all targets, which is
+    a serious bug. Now network is only needed for get-orig-source which is
+    obviously needs it.
 
   [ Petter Reinholdtsen ]
   * Added Dutch (nl) audacity manual by Frans Spiesschaert (Closes:
diff --git a/documentation/common/Makefile.common b/documentation/common/Makefile.common
index 8c44e03..f592f24 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -14,6 +14,7 @@ directory = `echo $(name) | sed 's/-manual//'`
 all: build
 
 update:
+	../scripts/get_manual_version
 	../scripts/get_manual
 	po4a --no-translations --msgmerge-opt --no-location po4a.cfg
 	msgcat --no-location -o $(name).pot $(name).pot
diff --git a/documentation/debian-edu-jessie/Makefile b/documentation/debian-edu-jessie/Makefile
index b39d02e..a83e5cc 100644
--- a/documentation/debian-edu-jessie/Makefile
+++ b/documentation/debian-edu-jessie/Makefile
@@ -3,7 +3,7 @@
 #
 url=https://wiki.debian.org/DebianEdu/Documentation/Jessie/
 name=debian-edu-jessie-manual
-VERSION:=$(shell PERL_LWP_SSL_VERIFY_HOSTNAME=0 GET -H User-Agent: $(url)?action=raw |sed -n '1p'|sed -r 's/^([^0-9])*|([^0-9])*$$//g')
+VERSION:=$(shell cat version)
 DEBIAN_EDU_DOC_TITLE=Debian\ Edu\ /\ Skolelinux\ Jessie\ $(VERSION)\ Manual
 path1=DebianEdu/Documentation/Jessie
 path2='\/DebianEdu\/Documentation\/'
diff --git a/documentation/debian-edu-jessie/version b/documentation/debian-edu-jessie/version
new file mode 100644
index 0000000..48084b5
--- /dev/null
+++ b/documentation/debian-edu-jessie/version
@@ -0,0 +1 @@
+8.0~alpha+edu0
diff --git a/documentation/debian-edu-wheezy/Makefile b/documentation/debian-edu-wheezy/Makefile
index 827c07b..fa5a57a 100644
--- a/documentation/debian-edu-wheezy/Makefile
+++ b/documentation/debian-edu-wheezy/Makefile
@@ -3,7 +3,7 @@
 #
 url=https://wiki.debian.org/DebianEdu/Documentation/Wheezy/
 name=debian-edu-wheezy-manual
-VERSION:=$(shell PERL_LWP_SSL_VERIFY_HOSTNAME=0 GET -H User-Agent: $(url)?action=raw |sed -n '1p'|sed -r 's/^([^0-9])*|([^0-9])*$$//g')
+VERSION:=$(shell cat version)
 DEBIAN_EDU_DOC_TITLE=Debian\ Edu\ /\ Skolelinux\ Wheezy\ $(VERSION)\ Manual
 path1=DebianEdu/Documentation/Wheezy
 path2='\/DebianEdu\/Documentation\/'
diff --git a/documentation/debian-edu-wheezy/version b/documentation/debian-edu-wheezy/version
new file mode 100644
index 0000000..34f776c
--- /dev/null
+++ b/documentation/debian-edu-wheezy/version
@@ -0,0 +1 @@
+7.1+edu0
diff --git a/documentation/scripts/get_manual_version b/documentation/scripts/get_manual_version
new file mode 100755
index 0000000..a2f16a2
--- /dev/null
+++ b/documentation/scripts/get_manual_version
@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# Author/Copyright:	Holger Levsen
+# Licence:		GPL2+
+# first edited:		2014-04-14
+# 
+# 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 Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# don't do this for the manuals, just for THE manual :)
+if [[ $url == https://wiki.debian.org/DebianEdu/Documentation/Manuals/* ]] ; then
+	exit 0
+fi
+VERSION=$(PERL_LWP_SSL_VERIFY_HOSTNAME=0 GET -H User-Agent: $url?action=raw |sed -n '1p'|sed -r 's/^([^0-9])*|([^0-9])*$$//g')
+echo $VERSION > version
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git