--- Begin Message ---
Package: lists.debian.org
These mails used to get through to the list. I guess you use stricter
rules now. Please let mails such as this through to the list again.
TIA,
Frank
----- Forwarded message from Frank Lichtenheld <[EMAIL PROTECTED]> -----
X-Envelope-From:[EMAIL PROTECTED] Sun Oct 28 21:16:54 2007
From: Frank Lichtenheld <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: [SCM] APT Archive Web-Frontend (Alioth repository) branch, master,
updated. switch-to-templates-289-g7d06e82
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 707eed0c621acfb07a7f3af045e99c886a213a42
X-Git-Newrev: 7d06e82e8b559dae35d06ce09e9e5dde80fce439
X-SA-Exim-Connect-IP: <locally generated>
X-SA-Exim-Mail-From: [EMAIL PROTECTED]
X-SA-Exim-Scanned: No (on alioth.debian.org); SAEximRunCond expanded to false
X-Debian-Message: from Git
Mail-Followup-To: [EMAIL PROTECTED]
X-Rc-Virus: 2007-09-13_01
X-Rc-Spam: 2007-10-04_01
X-Diagnostic: Unapproved submission to debian-www-cvs
X-Lenk-Relay-ID: 5d78e3a35b0d2d1c273baf8de68be7e7
X-CRM114-Version: 20060704a-BlameRobert ( TRE 0.7.3 (LGPL) ) MF-DAE15AAC [pR:
53.9054]
X-CRM114-Status: Good ( pR: 53.9054 )
The branch, master has been updated
via 7d06e82e8b559dae35d06ce09e9e5dde80fce439 (commit)
via 2c644c36736052f4bd1abff4101375848203fb66 (commit)
via 17913bc92f23cb3cd03978f24825f4f8823dfb8f (commit)
via d02b6c592e4938cf4dc3113ca5fd92e4f79af6d8 (commit)
via 0d1d77d4be3fa918b2fef94e922adc1c9ca5e83a (commit)
from 707eed0c621acfb07a7f3af045e99c886a213a42 (commit)
- Shortlog ------------------------------------------------------------
7d06e82 050checkinst: Duplicate mail to log
2c644c3 050checkinst: Use dpkg-checkbuilddeps to test for missing packages
17913bc Support translated short descriptions in index pages
d02b6c5 Packages::DoNewPkg: Support new backend format
0d1d77d html/download.tmpl: Add missing '/' in security URL
Summary of changes:
bin/create_index_pages | 20 ++++++++++++++++++--
cron.d/050checkinst | 23 +++--------------------
debian/control | 9 +++++++++
lib/Packages/DoNewPkg.pm | 2 +-
templates/html/download.tmpl | 2 +-
templates/html/index.tmpl | 9 +++++++--
6 files changed, 39 insertions(+), 26 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 7d06e82e8b559dae35d06ce09e9e5dde80fce439
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sun Oct 28 22:13:23 2007 +0100
050checkinst: Duplicate mail to log
Record problems in the log, too, not just in the mail
diff --git a/cron.d/050checkinst b/cron.d/050checkinst
index 3dd1c75..559de6a 100755
--- a/cron.d/050checkinst
+++ b/cron.d/050checkinst
@@ -65,6 +65,5 @@ then
echo
cat $cache
fi
- ) | /usr/sbin/sendmail -t
+ ) | tee /dev/stderr | /usr/sbin/sendmail -t
fi
-
commit 2c644c36736052f4bd1abff4101375848203fb66
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sun Oct 28 22:11:51 2007 +0100
050checkinst: Use dpkg-checkbuilddeps to test for missing packages
This allows the use of more complex dependencies like
locales | locales-all.
diff --git a/cron.d/050checkinst b/cron.d/050checkinst
index 9dc6689..3dd1c75 100755
--- a/cron.d/050checkinst
+++ b/cron.d/050checkinst
@@ -5,16 +5,6 @@
# Test whether all required packages are installed and generate a mail
# if they aren't, so that the admin is informed.
-required="git-core gettext locales rsync dpkg-dev procmail"
-required="$required libcompress-zlib-perl"
-required="$required libhtml-parser-perl libio-stringy-perl"
-required="$required liblocale-gettext-perl libmldbm-perl"
-required="$required libtext-iconv-perl libhtml-template-perl"
-required="$required libclass-accessor-perl"
-required="$required liburi-perl libxml-rss-perl"
-required="$required libtemplate-perl libi18n-acceptlanguage-perl"
-required="$required liblingua-stem-perl"
-
locales="de_DE.UTF-8 en_US.UTF-8 nl_NL fr_FR.UTF-8 uk_UA.UTF-8"
packages=`tempfile`
@@ -22,14 +12,8 @@ locs=`tempfile`
cache=`tempfile`
trap "rm -f $packages $locs" INT EXIT
-for p in $required
-do
- if [ -z "$(dpkg -l $p|grep ^ii)" ]
- then
- echo "Package $p missing." >> $packages
- echo >> $packages
- fi
-done
+cd $topdir
+dpkg-checkbuilddeps >> $packages 2>&1
for l in $locales
do
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..4a4d48a
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,9 @@
+Source: packages
+Build-Depends: git-core, rsync, dpkg-dev, procmail,
+ gettext, liblocale-gettext-perl, locales | locales-all,
libi18n-acceptlanguage-perl,
+ libcompress-zlib-perl, libhtml-parser-perl, libio-stringy-perl,
+ libmldbm-perl, libtext-iconv-perl, libhtml-template-perl,
+ libclass-accessor-perl, liburi-perl, libxml-rss-perl, libtemplate-perl,
+ liblingua-stem-perl
+
+Package: packages
commit 17913bc92f23cb3cd03978f24825f4f8823dfb8f
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sun Oct 28 21:36:08 2007 +0100
Support translated short descriptions in index pages
diff --git a/bin/create_index_pages b/bin/create_index_pages
index d76beba..eb797d3 100755
--- a/bin/create_index_pages
+++ b/bin/create_index_pages
@@ -43,6 +43,9 @@ tie my %src_packages, 'DB_File', "$DBDIR/sources_small.db",
tie my %src2bin, 'DB_File', "$DBDIR/sources_packages.db",
O_RDONLY, 0666, $DB_BTREE
or die "couldn't open $DBDIR/sources_packages.db: $!";
+tie my %desctrans, 'DB_File', "$DBDIR/descriptions_translated.db",
+ O_RDONLY, 0666, $DB_BTREE
+ or die "couldn't tie DB $DBDIR/descriptions_translated.db: $!";
my $sections = retrieve "$DBDIR/sections.info";
my $subsections = retrieve "$DBDIR/subsections.info";
@@ -106,7 +109,7 @@ while (my ($pkg, $data) = each %packages) {
my ($virt, $p_data) = split /\000/o, $data, 2;
%virt = split /\01/o, $virt;
foreach (split /\000/o, $p_data||'') {
- my @data = split ( /\s/o, $_, 8 );
+ my @data = split ( /\s/o, $_, 9 );
$pkg{$data[1]} ||= new Packages::Page( $pkg );
$pkg{$data[1]}->merge_package( { package => $pkg,
archive => $data[0],
@@ -116,7 +119,8 @@ while (my ($pkg, $data) = each %packages) {
subsection => $data[4],
priority => $data[5],
version => $data[6],
- description => $data[7] } );
+ 'description-md5' => $data[7],
+ description => $data[8] } );
}
foreach (keys %virt) {
next if $_ eq '-';
@@ -138,6 +142,18 @@ while (my ($pkg, $data) = each %packages) {
$p{section} = $entry->get_newest( 'section' );
$p{archive} = $entry->get_newest( 'archive' );
$p{desc} = $entry->get_newest( 'description' );
+ my $desc_md5 = $entry->get_newest( 'description-md5' );
+ my $trans_desc = $desctrans{$desc_md5};
+ if ($trans_desc) {
+ my %sdescs;
+ my %trans_desc = split /\000|\001/, $trans_desc;
+ while (my ($l, $d) = each %trans_desc) {
+ $d =~ s/\n.*//os;
+
+ $sdescs{$l} = $d;
+ }
+ $p{trans_desc} = \%sdescs;
+ }
$p{priority} = $entry->get_newest( 'priority' );
}
push @{$allpkgs{$key}}, \%p;
diff --git a/templates/html/index.tmpl b/templates/html/index.tmpl
index a5139b5..63d5f49 100644
--- a/templates/html/index.tmpl
+++ b/templates/html/index.tmpl
@@ -33,6 +33,11 @@
[% PROCESS marker text=section IF section != main_section %]
[% PROCESS marker text=archive IF archive != main_archive %]
[% END %]
+ [%- IF trans_desc.$lang;
+ sdesc = trans_desc.$lang;
+ ELSE;
+ sdesc = desc;
+ END -%]
[% IF providers.size %]
<dt><a href="[% name %]" id="[% name %]">[% name %]</a></dt>
<dd>[% g('virtual package provided by') %]
@@ -40,11 +45,11 @@
[%- ', ' UNLESS loop.last %][% END %]</dd>
[% IF versions.length %]
<dt><a href="[% name %]">[% name %]</a> ([% versions %])[% PROCESS
markers %]</dt>
- <dd>[% desc | html %]</dd>
+ <dd>[% sdesc | html %]</dd>
[% END %]
[% ELSE %]
<dt><a href="[% name %]" id="[% name %]">[% name %]</a> ([% versions %])[%
PROCESS markers %]</dt>
- <dd>[% desc | html %]</dd>
+ <dd>[% sdesc | html %]</dd>
[% END %]
[% '</dl>' IF loop.last %]
commit d02b6c592e4938cf4dc3113ca5fd92e4f79af6d8
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sun Oct 28 21:35:13 2007 +0100
Packages::DoNewPkg: Support new backend format
We don't actually use the translation support for
short descriptions here since the chances are slim
that we will have any for such new packages. Can be added
later or by someone else ;)
diff --git a/lib/Packages/DoNewPkg.pm b/lib/Packages/DoNewPkg.pm
index e5b9e88..9be98d5 100644
--- a/lib/Packages/DoNewPkg.pm
+++ b/lib/Packages/DoNewPkg.pm
@@ -45,7 +45,7 @@ sub do_newpkg {
};
while (<NEWPKG>) {
chomp;
- my @data = split /\s/, $_, 10;
+ my @data = split /\s/, $_, 11;
next unless $data[2]; #removed packages
next unless $data[3] eq $suite;
commit 0d1d77d4be3fa918b2fef94e922adc1c9ca5e83a
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sun Oct 28 21:29:01 2007 +0100
html/download.tmpl: Add missing '/' in security URL
diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index 66b9212..f88d28f 100644
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -73,7 +73,7 @@ deb [% 'http://' _ security_mirror_url %] [% suite _
security_suite_suffix %] ma
</div>
[% ELSE %]
<p>[% g('You can download the requested file from the <tt>%s</tt> subdirectory
at:', filename.directory) %]</p>
-<ul><li><a href="[% 'http://' _ security_mirror_url _ filename.full %]">[%
security_mirror_url %]</a></li></ul>
+<ul><li><a href="http://[% security_mirror_url %]/[% filename.full %]">[%
security_mirror_url %]</a></li></ul>
<p>[% g('%s security updates are officially distributed only via <tt>%s</tt>.',
organisation, security_mirror) %]</p>
[% END %]
--
APT Archive Web-Frontend (Alioth repository)
----- End forwarded message -----
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
--- End Message ---
