[debian-edu-commits] debian-edu/debian-edu-doc.git (#1553) - master (branch) updated: 1.5_20130727_7.1-2-g348048c

[David Prévot]

The branch, master has been updated
       via  348048cde6df8fefc6f09f7164146024ebb14eb6 (commit)
      from  734b9b34a2dec6d1fe55841a5c2599e7018e3aac (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 -----------------------------------------------------------------
commit 348048cde6df8fefc6f09f7164146024ebb14eb6
Author: David Prévot <taffit at debian.org>
Date:   Wed Aug 7 14:57:35 2013 +0200

    wiki.d.o is now behind HTTPS only

-----------------------------------------------------------------------

Summary of changes:
 documentation/audacity/Makefile           |    2 +-
 documentation/debian-edu-squeeze/Makefile |    2 +-
 documentation/debian-edu-wheezy/Makefile  |    2 +-
 documentation/rosegarden/Makefile         |    2 +-
 documentation/scripts/get_copyright       |    2 +-
 documentation/scripts/get_images          |    2 +-
 documentation/scripts/get_manual          |    8 ++++----
 7 files changed, 10 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/documentation/audacity/Makefile b/documentation/audacity/Makefile
index 6a876d9..ec583c3 100644
--- a/documentation/audacity/Makefile
+++ b/documentation/audacity/Makefile
@@ -1,7 +1,7 @@
 #
 # configuration here:
 #
-url=http://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/
+url=https://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/
 name=audacity-manual
 DEBIAN_EDU_DOC_TITLE=Debian\ Edu\ /\ Skolelinux\ Audacity\ manual
 path1=DebianEdu/Documentation/Manuals/Audacity
diff --git a/documentation/debian-edu-squeeze/Makefile b/documentation/debian-edu-squeeze/Makefile
index adac7cc..9876f3c 100644
--- a/documentation/debian-edu-squeeze/Makefile
+++ b/documentation/debian-edu-squeeze/Makefile
@@ -1,7 +1,7 @@
 #
 # configuration here:
 #
-url=http://wiki.debian.org/DebianEdu/Documentation/Squeeze/
+url=https://wiki.debian.org/DebianEdu/Documentation/Squeeze/
 name=debian-edu-squeeze-manual
 VERSION:=$(shell GET -H User-Agent: $(url)?action=raw |sed -n '1p'|sed -r 's/^([^0-9])*|([^0-9])*$$//g')
 DEBIAN_EDU_DOC_TITLE=Debian\ Edu\ /\ Skolelinux\ Squeeze\ $(VERSION)\ Manual
diff --git a/documentation/debian-edu-wheezy/Makefile b/documentation/debian-edu-wheezy/Makefile
index 88e4c37..9009c23 100644
--- a/documentation/debian-edu-wheezy/Makefile
+++ b/documentation/debian-edu-wheezy/Makefile
@@ -1,7 +1,7 @@
 #
 # configuration here:
 #
-url=http://wiki.debian.org/DebianEdu/Documentation/Wheezy/
+url=https://wiki.debian.org/DebianEdu/Documentation/Wheezy/
 name=debian-edu-wheezy-manual
 VERSION:=$(shell GET -H User-Agent: $(url)?action=raw |sed -n '1p'|sed -r 's/^([^0-9])*|([^0-9])*$$//g')
 DEBIAN_EDU_DOC_TITLE=Debian\ Edu\ /\ Skolelinux\ Wheezy\ $(VERSION)\ Manual
diff --git a/documentation/rosegarden/Makefile b/documentation/rosegarden/Makefile
index 0347c86..bfafc4b 100644
--- a/documentation/rosegarden/Makefile
+++ b/documentation/rosegarden/Makefile
@@ -1,7 +1,7 @@
 #
 # configuration here:
 #
-url=http://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/
+url=https://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/
 name=rosegarden-manual
 DEBIAN_EDU_DOC_TITLE=Debian\ Edu\ /\ Skolelinux\ Rosegarden\ manual
 path1=DebianEdu/Documentation/Manuals/Rosegarden
diff --git a/documentation/scripts/get_copyright b/documentation/scripts/get_copyright
index 926cd1d..d12b3ab 100755
--- a/documentation/scripts/get_copyright
+++ b/documentation/scripts/get_copyright
@@ -12,7 +12,7 @@ use strict;
 use warnings;
 use IO::Dir;
 
-my $base = 'http://wiki.debian.org';
+my $base = 'https://wiki.debian.org';
 my $path = $ARGV[0];
 my $cdir = $ARGV[1];
 my $type = '';
diff --git a/documentation/scripts/get_images b/documentation/scripts/get_images
index c93d68b..739c106 100755
--- a/documentation/scripts/get_images
+++ b/documentation/scripts/get_images
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 use IO::Dir;
 
-our $base = "http://wiki.debian.org";
+our $base = "https://wiki.debian.org";
 our $imagedir = "./images";
 our $file = $ARGV[0];
 our $path = $ARGV[1];
diff --git a/documentation/scripts/get_manual b/documentation/scripts/get_manual
index 7569312..deea7c7 100755
--- a/documentation/scripts/get_manual
+++ b/documentation/scripts/get_manual
@@ -99,12 +99,12 @@ for i in `cat id` ; do
 	# Comment useless remarks from XML: they just show an ugly drawing in XML
 	perl -pe "s%<remark>.*?</remark>%<!-- $& -->%g" |
 	# Broken URL: workaround to #656945
-	sed "s%<ulink url='http://wiki.debian.org/${path1}${i}/%<ulink url='http://wiki.debian.org/%g" |
+	sed "s%<ulink url='https://wiki.debian.org/${path1}${i}/%<ulink url='https://wiki.debian.org/%g" |
 	# Make wiki self links actually local
 	sed "s%<link linkend='%<link linkend='${ASCIINAME}--%g" |
-	perl -pe "s%<ulink url='http://wiki.debian.org/${path1}/(HowTo/)?(\w+)#'>(.*?)</ulink>%<link linkend='\2'>\3</link>%g" |
-	perl -pe "s%<ulink url='http://wiki.debian.org/${path1}/(HowTo/)?(\w+)#(.*?)'>(.*?)</ulink>%<link linkend='\2--\3'>\4</link>%g" |
-	sed "s%<para><ulink url='http://wiki.debian.org/CategoryPermalink#'>CategoryPermalink</ulink> </para>%%" |
+	perl -pe "s%<ulink url='https://wiki.debian.org/${path1}/(HowTo/)?(\w+)#'>(.*?)</ulink>%<link linkend='\2'>\3</link>%g" |
+	perl -pe "s%<ulink url='https://wiki.debian.org/${path1}/(HowTo/)?(\w+)#(.*?)'>(.*?)</ulink>%<link linkend='\2--\3'>\4</link>%g" |
+	sed "s%<para><ulink url='https://wiki.debian.org/CategoryPermalink#'>CategoryPermalink</ulink> </para>%%" |
 	unique_section_ids |
 	# introduce line breaks:
 	sed "s%<title>%\n<title>%g" |


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).