[Debian-l10n-commits] [SCM] Debian i18n - l10n development - dl10n robots branch, master, updated. b56e82943f9a78d15598e630d7881e7a19ae95fd

[Nicolas François]

The following commit has been merged in the master branch:
commit e73420f633f26684fe2f2f8cf179fe20f01983d3
Author: Nicolas François <nicolas.francois at centraliens.net>
Date:   Sat Jun 16 19:59:06 2012 +0200

    Update to the i18n.d.o layout.
    
    * cron/gen-material: Avoid hard-coded path to the etc directory.
    * etc/gen-material.cfg: Update to the i18n.d.o layout.
    * cron/gen-material: Remove cleanup of file permissions.

diff --git a/Changelog b/Changelog
index 28c57de..acc8c06 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,11 @@
 2012-06-16  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* cron/gen-material: Avoid hard-coded path to the etc directory.
+	* etc/gen-material.cfg: Update to the i18n.d.o layout.
+	* cron/gen-material: Remove cleanup of file permissions.
+
+2012-06-16  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* debian/changelog, debian/control: Added dependency to po-denconf
 	and libsoap-lite-perl.
 
diff --git a/cron/gen-material b/cron/gen-material
index 9181560..d03c078 100755
--- a/cron/gen-material
+++ b/cron/gen-material
@@ -2,7 +2,8 @@
 
 #set -x
 
-test -x /srv/dl10n-stuff/bin/gen-material.cfg && . /srv/dl10n-stuff/bin/gen-material.cfg
+D=$(dirname $(readlink -f $0))
+test -x $D/../etc/gen-material.cfg && . $D/../etc/gen-material.cfg
 
 d=$1
 shift
@@ -16,8 +17,6 @@ fi
 PERLLIB=$dl10ndir/lib
 export PERLLIB
 
-umask 0002
-
 test -d $destdir/data || mkdir -p $destdir/data
 
 #   wordtrans: tarball has a link debian/control -> control-kde
@@ -69,4 +68,3 @@ mv -f po-debconf-$d.tar.new.gz po-debconf-$d.tar.gz
 tar cf po-$d.tar.new po/$d
 mv -f po-$d.tar.new po-$d.tar
 
-chgrp -R debian-i18n-robots $destdir/*
diff --git a/etc/gen-material.cfg b/etc/gen-material.cfg
index 5ac60fe..9a93f48 100755
--- a/etc/gen-material.cfg
+++ b/etc/gen-material.cfg
@@ -1,12 +1,12 @@
 # Location of the mirror
-mirrordir=/mnt/mirror/mirror-sources-debian/
+mirrordir=/srv/mirrors/debian/
 
 # Location of the dl10n checkout
-dl10ndir=/srv/dl10n-stuff/svn/dl10n/
+dl10ndir=/srv/i18n.debian.org/dl10n/git
 
 # Location where the l10n material will be extracted
 # $destdir should be publicly available.
-destdir=/srv/i18n.debian.net/www/debian-l10n-material/
+destdir=/srv/i18n.debian.org/htdocs/material
 
 # Temporary directory where the packages are extracted
-tmpdir=/srv/i18n.debian.net/tmp/gen-material/
+tmpdir=/srv/i18n.debian.org/tmp/gen-material/

-- 
Debian i18n - l10n development - dl10n robots