[Debian-l10n-commits] dl10n branch master updated. 7e37e74737c46105df7b53771824d3b7851ac5c3
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Mon Jun 18 09:30:19 UTC 2012
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 "dl10n".
The branch, master has been updated
via 7e37e74737c46105df7b53771824d3b7851ac5c3 (commit)
via 7bfd561ba087a7d9c8836bd7275e266f0f0c07f0 (commit)
via bd634da47ceade232ddc9628a7584607af8fb6a2 (commit)
via 7fb5ac90132be08c6be3583715ae03b0ed46f23d (commit)
via a68b534ba5432843f85796268216d786ecf17713 (commit)
via 186ed129e3496356853f16b6680db5837f2fa949 (commit)
via f7e74184c2babe27c22d56075d54cfadcabf9563 (commit)
via 0003bd16deacc9f3b8693c43f891cd9a26adccd8 (commit)
from 194f56f859674fbf6521c647a8419a33917a866c (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 -----------------------------------------------------------------
http://anonscm.debian.org/gitweb/?p=debian-l10n/dl10n.git;a=commitdiff;h=7e37e74737c46105df7b53771824d3b7851ac5c3
commit 7e37e74737c46105df7b53771824d3b7851ac5c3
Author: Nicolas François <nicolas.francois at centraliens.net>
Date: Mon Jun 18 11:28:47 2012 +0200
Install nmu.css
http://anonscm.debian.org/gitweb/?p=debian-l10n/dl10n.git;a=commitdiff;h=7bfd561ba087a7d9c8836bd7275e266f0f0c07f0
commit 7bfd561ba087a7d9c8836bd7275e266f0f0c07f0
Author: Nicolas François <nicolas.francois at centraliens.net>
Date: Mon Jun 18 11:28:28 2012 +0200
Fix typo
http://anonscm.debian.org/gitweb/?p=debian-l10n/dl10n.git;a=commitdiff;h=bd634da47ceade232ddc9628a7584607af8fb6a2
commit bd634da47ceade232ddc9628a7584607af8fb6a2
Author: Nicolas François <nicolas.francois at centraliens.net>
Date: Mon Jun 18 11:27:51 2012 +0200
Fix download of popcon by_inst (kept in OUTDIR)
http://anonscm.debian.org/gitweb/?p=debian-l10n/dl10n.git;a=commitdiff;h=7fb5ac90132be08c6be3583715ae03b0ed46f23d
commit 7fb5ac90132be08c6be3583715ae03b0ed46f23d
Author: Nicolas François <nicolas.francois at centraliens.net>
Date: Mon Jun 18 11:26:26 2012 +0200
Fix reading of dl10n.conf.
The cronjobs are symlinked to different places where the dl10n.conf file
is not available. Follow the path of the symlink.
http://anonscm.debian.org/gitweb/?p=debian-l10n/dl10n.git;a=commitdiff;h=a68b534ba5432843f85796268216d786ecf17713
commit a68b534ba5432843f85796268216d786ecf17713
Author: Nicolas François <nicolas.francois at centraliens.net>
Date: Mon Jun 18 11:25:12 2012 +0200
Add link to the source code to nmu_maintainer.html
http://anonscm.debian.org/gitweb/?p=debian-l10n/dl10n.git;a=commitdiff;h=186ed129e3496356853f16b6680db5837f2fa949
commit 186ed129e3496356853f16b6680db5837f2fa949
Author: Nicolas François <nicolas.francois at centraliens.net>
Date: Mon Jun 18 11:24:27 2012 +0200
Fix typo
Avoid \n to be displayed on the generated pages.
http://anonscm.debian.org/gitweb/?p=debian-l10n/dl10n.git;a=commitdiff;h=f7e74184c2babe27c22d56075d54cfadcabf9563
commit f7e74184c2babe27c22d56075d54cfadcabf9563
Author: Nicolas François <nicolas.francois at centraliens.net>
Date: Mon Jun 18 11:21:51 2012 +0200
Fix default path to the unstable status database.
http://anonscm.debian.org/gitweb/?p=debian-l10n/dl10n.git;a=commitdiff;h=0003bd16deacc9f3b8693c43f891cd9a26adccd8
commit 0003bd16deacc9f3b8693c43f891cd9a26adccd8
Author: Nicolas François <nicolas.francois at centraliens.net>
Date: Mon Jun 18 11:19:59 2012 +0200
Fix location of the archive status databases.
The databases are generated in dl10n/data/gen-material.
This location is independent from the htdocs links.
-----------------------------------------------------------------------
Summary of changes:
cron/nmu-update | 11 ++++++-----
dl10n-nmu | 5 +++--
etc/dl10n.conf | 4 ++--
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/cron/nmu-update b/cron/nmu-update
index 1b26c17..95ecf6a 100755
--- a/cron/nmu-update
+++ b/cron/nmu-update
@@ -5,13 +5,13 @@ set -e
PROGNAME=$(basename $0)
# Get global config and checks
-source $(dirname $0)/../etc/dl10n.conf
+. $(dirname $(readlink -f $0))/../etc/dl10n.conf
-POPCON_FILE=$TMPDIR/
+POPCON_FILE="$OUTDIR/by_inst"
-cd $DL10NDIR
+cd "$OUTDIR"
-wget -N $POPCON_FILE -o /dev/null http://popcon.debian.org/source/by_inst || {
+wget -N -o /dev/null http://popcon.debian.org/source/by_inst || {
echo "Failed to download http://popcon.debian.org/source/by_inst"
exit 1
}
@@ -23,4 +23,5 @@ $DL10NDIR/dl10n-nmu \
> $LOGPREFIX.log 2> $LOGPREFIX.err
cat $LOGPREFIX.err
-cp -l $DL10NDIR/htdocs-static/scrore.png $OUTDIR
+cp -l $DL10NDIR/htdocs-static/score.png "$OUTDIR/html"
+cp -l $DL10NDIR/htdocs-static/nmu.css "$OUTDIR/html"
diff --git a/dl10n-nmu b/dl10n-nmu
index 8eee3d7..6fd546d 100755
--- a/dl10n-nmu
+++ b/dl10n-nmu
@@ -20,7 +20,7 @@ my $generation_date = strftime('%a, %d %b %Y %H:%M:%S %z', gmtime);
my $progname= $0; $progname= $& if $progname =~ m,[^/]+$,;
-my $DB_FILE="/srv/i18n.debian.net/www/debian-l10n-material/data/unstable.gz";
+my $DB_FILE="/srv/i18n.debian.org/dl10n/data/gen-material/data/unstable.gz";
my $POPCON="./data/by_inst";
my $GENDIR ;
@@ -249,7 +249,7 @@ print FILE " </table>\n";
print FILE " <hr />\n";
print FILE " <p><small>Generated on $generation_date</small></p>\n";
print FILE " <p><small>Comments: <a href='mailto:debian-l10n-devel\@lists.alioth.debian.org'>Debian L10N Development Team</a></small></p>\n";
-print FILE ' <p><small><a href="http://anonscm.debian.org/gitweb/?p=debian-l10n/dl10n.git;a=summary">Checkout dl10n source code</a></small></p>\n';
+print FILE ' <p><small><a href="http://anonscm.debian.org/gitweb/?p=debian-l10n/dl10n.git;a=summary">Checkout dl10n source code</a></small></p>';
print FILE "</body>\n";
print FILE "</html>\n";
close (FILE);
@@ -301,6 +301,7 @@ print FILE " </table>\n";
print FILE " <hr />\n";
print FILE " <p><small>Generated on $generation_date</small></p>\n";
print FILE " <p><small>Comments: <a href='mailto:debian-l10n-devel\@lists.alioth.debian.org'>Debian L10N Development Team</a></small></p>\n";
+print FILE ' <p><small><a href="http://anonscm.debian.org/gitweb/?p=debian-l10n/dl10n.git;a=summary">Checkout dl10n source code</a></small></p>';
print FILE "</body>\n";
print FILE "</html>\n";
close (FILE);
diff --git a/etc/dl10n.conf b/etc/dl10n.conf
index b9e8520..e7928a8 100644
--- a/etc/dl10n.conf
+++ b/etc/dl10n.conf
@@ -6,8 +6,8 @@ MIRRORDIR=/srv/mirrors/debian/
# Location of the dl10n checkout
DL10NDIR=$I18NROOT/dl10n/git
-STAT_DATABASE_SID=$I18NROOT/htdocs/material/data/unstable.gz
-STAT_DATABASE_TESTING=$I18NROOT/htdocs/material/data/testing.gz
+STAT_DATABASE_SID=$I18NROOT/dl10n/data/gen-material/data/unstable.gz
+STAT_DATABASE_TESTING=$I18NROOT/dl10n/data/gen-material/data/testing.gz
# Default to sid, can be overwirtten with _TESTING
STAT_DATABASE=$STAT_DATABASE_SID
-----------------------------------------------------------------------
hooks/post-receive
--
dl10n
More information about the Debian-l10n-commits
mailing list