Bug#820119: tidy reports valid NCR as invalid

[Frank Lichtenheld]

2016-04-06 18:52 GMT+02:00 victory <victory@gmail.com>:
> On Tue, 5 Apr 2016 20:16:53 +0200
> Frank Lichtenheld wrote:
>
>> I assume you wanted to report this against tidy, not www.debian.org?
>
> if so, I always report to the upstream, not the debian's one
>
> see https://www-master.debian.org/build-logs/tidy/
> files w/ 142bytes are caused by the issue
> (other langs do not have the page [international/l10n/po/pl])

Okay, that paragraph would have been helpful in the original mail to
understand the contexts of your statement.

Regards,
  Frank

-- 
Frank Lichtenheld <dj...@debian.org>

Bug#820119: tidy reports valid NCR as invalid

[Frank Lichtenheld]

2016-04-05 18:12 GMT+02:00 victory <victory@gmail.com>:
>
> Package: www.debian.org

I assume you wanted to report this against tidy, not www.debian.org?

> Severity: wishlist
>
> https://www.w3.org/International/questions/qa-controls#support
> HTML, XHTML and XML 1.0 do not support the C0 range,
> except for HT (Horizontal Tabulation) U+0009, LF (Line Feed) U+000A,
> and CR (Carriage Return) U+000D.
> The C1 range is supported, i.e. you can encode the controls directly
> or represent them as NCRs (Numeric Character References).
>
> *
> https://www.w3.org/International/questions/qa-controls#background
> The control codes in the range U+0080-U+009F are known as the "C1" range.
>
> unfortunately no option seems to eliminate this :(
> latest source use the same code (line 1165-)
> https://github.com/htacg/tidy-html5/blob/master/src/lexer.c
>
>
> --
> victory
> no need to CC me :-)
>


-- 
Frank Lichtenheld <dj...@debian.org>

Bug#762255: "collect DLAs on www.d.o"

[Frank Lichtenheld]

Package: www.debian.org
Followup-For: Bug #762255

Attached is a partial patch to implement DLAs.

As mentioned, I found the recent_list.wml code incomprehensible. So
I decided to refactor it completely. The result of this refactoring are
the attached files recent_list_security.wml and recent_list_common.wml.
As the filenames indicate, this is not a complete replacement, yet. So
far this only covers security, not News or events. But I think it already
demonstrates the value of the excercise.

Also attached is a dla parser script.

Feedback welcome.

Regards,
 Frank


-- System Information:
Debian Release: 8.4
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)
? 762255.patch
? crossreferences.en.html
? cve-compatibility.en.html
? dsa-long.en.rdf
? dsa.en.rdf
? faq.en.html
? index.en.html
? pam-auth.en.html
? parse-dla.pl
? ref-table.inc
Index: Makefile
===
RCS file: /cvs/webwml/webwml/english/security/Makefile,v
retrieving revision 1.70
diff -u -r1.70 Makefile
--- Makefile	10 Nov 2012 15:44:04 -	1.70
+++ Makefile	4 Apr 2016 20:45:25 -
@@ -12,10 +12,13 @@
 
 
 index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/dsa-*.wml) \
+  $(wildcard $(CUR_YEAR)/dla-*.wml) \
   $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dsa-*.wml) \
   $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dsa-*.data) \
+  $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dla-*.wml) \
+  $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/dla-*.data) \
   $(TEMPLDIR)/release_info.wml \
-  $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP)
+  $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP)
 
 pam-auth.$(LANGUAGE).html: pam-auth.wml \
   $(ENGLISHSRCDIR)/security/pam-auth.wml
@@ -52,7 +55,10 @@
   $(wildcard $(CUR_YEAR)/dsa-*.wml) \
   $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.wml) \
   $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dsa-*.data) \
-  $(TEMPLDIR)/recent_list.wml $(GETTEXTDEP)
+  $(wildcard $(CUR_YEAR)/dla-*.wml) \
+  $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dla-*.wml) \
+  $(wildcard $(ENGLISHDIR)/security/$(CUR_YEAR)/dla-*.data) \
+  $(TEMPLDIR)/recent_list_security.wml $(GETTEXTDEP)
 ifeq "$(LANGUAGE)" "zh"
 	@echo -n "Processing $(
   
 
-<:= get_recent_list ( '1m', '6', '$(ENGLISHDIR)/security', 'rdfseq bydate', 'dsa-\d+' ); :>
+<:= get_recent_security_list_rdf('rdfseq', '1m', '6', '.', '$(ENGLISHDIR)/security' ); :>
 
   
 
 
-<:= get_recent_list ( '1m', '6', '$(ENGLISHDIR)/security', 'rdflong bydate', 'dsa-\d+' ); :>
+<:= get_recent_security_list_rdf('rdf-long', '1m', '6', '.', '$(ENGLISHDIR)/security' ); :>
 
 
Index: dsa.rdf.in
===
RCS file: /cvs/webwml/webwml/english/security/dsa.rdf.in,v
retrieving revision 1.10
diff -u -r1.10 dsa.rdf.in
--- dsa.rdf.in	30 Apr 2014 09:22:52 -	1.10
+++ dsa.rdf.in	4 Apr 2016 20:45:25 -
@@ -1,4 +1,4 @@
-#use wml::debian::recent_list
+#use wml::debian::recent_list_security
 
 
 
@@ -21,11 +21,11 @@
   <:= rdf_ctime(); :>
   
 
-<:= get_recent_list ( '1m', '6', '$(ENGLISHDIR)/security', 'rdfseq bydate', 'dsa-\d+' ); :>
+<:= get_recent_security_list_rdf( 'rdfseq', '1m', '6', '.', '$(ENGLISHDIR)/security' ); :>
 
   
 
 
-<:= get_recent_list ( '1m', '6', '$(ENGLISHDIR)/security', 'rdf bydate', 'dsa-\d+' ); :>
+<:= get_recent_security_list_rdf( 'rdf', '1m', '6', '.', '$(ENGLISHDIR)/security' ); :>
 
 
Index: index.wml
===
RCS file: /cvs/webwml/webwml/english/security/index.wml,v

Bug#720745: [www.debian.org] Support - On-line Real Time Help Using IRC: Please mention OFTC WebChat

[Frank Lichtenheld]

Package: www.debian.org
Followup-For: Bug #720745

Please find a proposed patch attached.

Feedback welcome.

Regards,
  Frank

-- System Information:
Debian Release: 8.3
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)
Index: support.wml
===
RCS file: /cvs/webwml/webwml/english/support.wml,v
retrieving revision 1.72
diff -u -r1.72 support.wml
--- support.wml	30 Apr 2014 07:41:18 -	1.72
+++ support.wml	2 Apr 2016 19:45:21 -
@@ -191,7 +191,7 @@
 http://www.irchelp.org/;>IRC (Internet Relay Chat) is a way
 to chat with people from all over the world in real time.
 IRC channels dedicated to Debian can be found on
-http://www.oftc.net/;>OFTC.
+https://www.oftc.net/;>OFTC.
 
 To connect, you need an IRC client. Some of the most popular clients are
 https://packages.debian.org/stable/net/xchat;>XChat,
@@ -200,7 +200,11 @@
 https://packages.debian.org/stable/net/epic5;>epic5 and
 https://packages.debian.org/stable/net/kvirc;>KVIrc,
 all of which have been packaged for
-Debian. Once you have the client installed, you need to tell it to connect
+Debian. OFTC also offers a https://www.oftc.net/WebChat/;>WebChat
+web interface which allows you to connect to IRC with a browser without
+the need to install any local client.
+
+Once you have the client installed, you need to tell it to connect
 to the server. In most clients, you can do that by typing:
 
 

Bug#762255: Some thoughts

[Frank Lichtenheld]

Hi.

I actually started looking into this today to see how much work it would be.

Some findings:

Writing a parser for DLAs is pretty simple, you can reuse a lot of the
stuff in parse-advisory.pl. If someone is interested, I can provide
the code.

The fun starts when you generate index.wml files. My thought was that
DSAs and DLAs should be mixed together since creating a completely
separate listing for them sounds silly. But it turns out that DSAs are
sorted by number and not by date (why, oh why?) and to change that you
actually need to touch get_recent_list
(english/templates/debian/recent_list.wml). This function is used
everywhere and has a lot of different calling conventions and a lot of
weird special handling and is just a horror to touch.

Maybe I will find some more motivation to look into it on the weekend.

Regards,
  Frank

Bug#756397: Add or replace

[Frank Lichtenheld]

I was wondering how to proceed with this bug.

Does it make sense to replace the PTS link with the tracker link or
should both be present?

Regards,
-- 
Frank Lichtenheld <dj...@debian.org>

Bug#594868: Still applies

[Frank Lichtenheld]

On Wed, 30 Mar 2016 01:52:40 +0200 Frank Lichtenheld <dj...@debian.org> wrote:
> This bug still applies.
> A more recent example would be
> https://packages.debian.org/jessie-backports/libapache2-mod-security2
>
> It depends on apache2-api-20120211 which is provided in jessie, but
> the page in jessie-backports doesn't reflect that.

I looked a bit further into this. It basically boils down to the
horrible function Packages::Search::read_entry_simple() which is much
too terse and too cryptic in its return value. It should be completely
reimplemented. Which is not that bad since it is only used in two
places in the code anyway.

Regards,
  Frank

-- 
Frank Lichtenheld <dj...@debian.org>

Bug#594868: Still applies

[Frank Lichtenheld]

This bug still applies.
A more recent example would be
https://packages.debian.org/jessie-backports/libapache2-mod-security2

It depends on apache2-api-20120211 which is provided in jessie, but
the page in jessie-backports doesn't reflect that.

-- 
Frank Lichtenheld <dj...@debian.org>

Bug#616654: p.d.o: untranslatable top menu

[Frank Lichtenheld]

On Wed, 08 Apr 2015 01:28:12 +0200 Laura Arjona Reina
<larj...@larjona.net> wrote:
> Dear all
> I'm not sure about the status of this bug...
>
> https://packages.debian.org/en/wheezy/ for example, shows that the page
> is available in several other languages, but when I click on them (for
> example https://packages.debian.org/fr/wheezy/ ), I still see the page
> in English.
>
> I've reviewed
> https://anonscm.debian.org/cgit/webwml/packages.git/tree/templates/html/head.tmpl
> and I cannot see the lines corresponding to the titles, nor translatable
> nor untranslatable.
>
> OTOH, I'm Spanish translator and the Spanish language is not shown in
> the list of available languages. I would like to provide translations to
> fix that, but I'm not sure how to proceed, where are the current
> templates, in which branch should I commit...

FTR, the correct solution was to merge all the translation relevant
changes to master which I did now.

debian-master was really only intended for debian deployment related
changes that are not relevant for people hosting their own instance.

Will apply the patch to master.

Regards,
-- 
Frank Lichtenheld <dj...@debian.org>

Re: Cleaning up archive/ on packages.debian.org

[Frank Lichtenheld]

2016-03-29 11:28 GMT+02:00 Frank Lichtenheld <dj...@debian.org>:
> Hi.
>
> I just pushed a big list of changes into debian-master of
> packages.git. To really make the
> cleanups and fixes in *syncarchive* work, someone should remove
> archive/* on packages.debian.org master so that obsolete files get
> removed.

Also it might be necessary to call ./bin/setup-site once after pulling
the changes. I'm not sure what the cron job around daily does. daily
itself does call this because this would change daily itself, not a
good idea with shell scripts.

Regards,
-- 
Frank Lichtenheld <dj...@debian.org>

Cleaning up archive/ on packages.debian.org

[Frank Lichtenheld]

Hi.

I just pushed a big list of changes into debian-master of
packages.git. To really make the
cleanups and fixes in *syncarchive* work, someone should remove
archive/* on packages.debian.org master so that obsolete files get
removed.

Since I currently do not have a working SSH access to that machine, I
can't take care of it myself.

Thanks in advance,
  Frank
-- 
Frank Lichtenheld <dj...@debian.org>

Bug#815202: packages: machines and sponsors information is outdated

[Frank Lichtenheld]

On Sat, 20 Feb 2016 09:26:23 +0800 Paul Wise <p...@debian.org> wrote:
> Package: www.debian.org
> Severity: minor
> User:Â www.debian@packages.debian.org
> Usertags: packages
>
> The packages site says the two packages mirrors are piatti and rore but
> these were decommissioned a long time ago. It would be best to generate
> the machines and sponsors info from Debian LDAP on a regular basis so
> that this information never gets out of date. Some combination of
> the description, purpose, sponsor and allowedGroups LDAP fields should
> be enough to find the right hosts and display the right info. picconi
> and pkgmirror-1and1 are the current hosts for this service.

Patches welcome ;)

-- 
Frank Lichtenheld <dj...@debian.org>

Bug#790774: Not reproducable on my test instance

[Frank Lichtenheld]

I can reproduce this issue fine on packages.debian.org, but not my
test instance.

So I assume this comes from some obsolete files not cleaned up
correctly (probably due to the Contents move)

When we roll out all my changes in did in the last two days I will ask
for archive/ to be purged once. Hopefully this will fix this issue.

Regards,
  Frank

-- 
Frank Lichtenheld <dj...@debian.org>

Bug#814677: Not reproducable in my test instance

[Frank Lichtenheld]

I can reproduce this issue fine on packages.debian.org, but not my
test instance.

So I assume this comes from some obsolete files not cleaned up
correctly (probably due to the Contents move)

When we roll out all my changes in did in the last two days I will ask
for archive/ to be purged once. Hopefully this will fix this issue.

Regards,
  Frank

Bug#818761: packages.debian.org doesn't list experimental packages anymore

[Frank Lichtenheld]

Package: www.debian.org
Followup-For: Bug #818761

I've prepared a patch for this. Please find it attached.

I don't just want to push it though, since it would be good to clean
up the archive/ directory on packages.debian.org. So it would be
preferable that someone with access to the deployment merges it and
then takes care of the deployment immediately.

Regards,
  Frank


-- System Information:
Debian Release: 8.3
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
>From 63322b969c931107c3d26d3e9c8b1b24a41b7da5 Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <fr...@lichtenheld.de>
Date: Mon, 28 Mar 2016 20:21:12 +0200
Subject: [PATCH] Teach packages.debian.org to handle .xz archive files

Currently only for main archive, not backports or
debports, yet.
Crude mix of autodetection and configuration but
since at least experimental is completely broken
right now my priority was to get it working.

Closes: #818761
---
 bin/parse-packages| 38 ++
 bin/parse-sources | 35 ---
 config.sh.sed.in  |  4 
 cron.d/100syncarchive | 33 +
 4 files changed, 91 insertions(+), 19 deletions(-)

diff --git a/bin/parse-packages b/bin/parse-packages
index a7403a9..280adaf 100755
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -63,6 +63,37 @@ mkpath( "$DBDIR/xapian.new" );
 my %descriptions_english_db;
 tie %descriptions_english_db, "DB_File", "files/db/descriptions_translated_english_only.db", O_RDONLY, 0666, $DB_BTREE;
 
+my %ext_to_prog = (
+xz => 'xzcat',
+gz => 'zcat',
+);
+sub open_packages_files {
+my( $suite_dir, $component) = @_;
+
+my (@files, $prog);
+for my $ext (qw(xz gz)){
+	my $packages_match = "binary-*/Packages.$ext";
+	@files = ();
+	push @files, <"$suite_dir/$component/$packages_match">;
+	push @files, <"$suite_dir/updates/$component/$packages_match">;
+	push @files, <"$suite_dir/$component/debian-installer/$packages_match">;
+
+	if( @files ){
+	$prog = $ext_to_prog{$ext};
+	last;
+	}
+}
+
+if( @files && $prog ){
+	print "\tprog=$prog\n";
+	print "\tfiles=@files\n";
+	open my $fh, '-|', $prog, @files;
+	return $fh;
+}
+print "\tno files found, skipping...\n";
+return;
+}
+
 for my $suite (@SUITES) {
 my %package_names_suite = ();
 my %packages_all_db;
@@ -76,10 +107,9 @@ for my $suite (@SUITES) {
 print "\tseems not to exist, skipping...\n";
 next;
 }
-	open PKG, "zcat $TOPDIR/archive/$archive/$suite/$what/binary-*/Packages.gz"
-	. " $TOPDIR/archive/$archive/$suite/updates/$what/binary-*/Packages.gz"
-	. " $TOPDIR/archive/$archive/$suite/$what/debian-installer/binary-*/Packages.gz|";
-	while () {
+
+	my $fh = open_packages_files("$TOPDIR/archive/$archive/$suite/", $what) || next;
+	while (<$fh>) {
 		next if /^\s*$/;
 		my $data = "";
 		my %data = ();
diff --git a/bin/parse-sources b/bin/parse-sources
index 1f73bcc..a4e6d06 100755
--- a/bin/parse-sources
+++ b/bin/parse-sources
@@ -38,6 +38,36 @@ $/ = "";
 
 -d $DBDIR || mkpath( $DBDIR );
 
+my %ext_to_prog = (
+xz => 'xzcat',
+gz => 'zcat',
+);
+sub open_sources_files {
+my( $suite_dir, $component) = @_;
+
+my (@files, $prog);
+for my $ext (qw(xz gz)){
+	my $sources_match = "source/Sources.$ext";
+	@files = ();
+	push @files, <"$suite_dir/$component/$sources_match">;
+	push @files, <"$suite_dir/updates/$component/$sources_match">;
+
+	if( @files ){
+	$prog = $ext_to_prog{$ext};
+	last;
+	}
+}
+
+if( @files && $prog ){
+	print "\tprog=$prog\n";
+	print "\tfiles=@files\n";
+	open my $fh, '-|', $prog, @files;
+	return $fh;
+}
+print "\tno files found, skipping...\n";
+return;
+}
+
 for my $archive (@ARCHIVES) {
 for my $suite (@SUITES) {
 
@@ -51,9 +81,8 @@ for my $archive (@ARCHIVES) {
 		print "\tseems not to exist, skipping...\n";
 		next;
 	}
-	open PKG, "zcat $TOPDIR/archive/$archive/$suite/$what/source/Sources.gz"
-	. " $TOPDIR/archive/$archive/$suite/updates/$what/source/Sources.gz|";
-	while () {
+	my $fh = open_sources_files("$TOPDIR/archive/$archive/$suite/", $what) || next;
+	while (<$fh>) {
 		next if /^\s*$/;
 		my $data = "";
 		my %data = ();
diff --git a/config.sh.sed.in b/config.sh.sed.in
index 10970d2..03ffc31 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -6

[SCM] APT Archive Web-Frontend (Alioth repository) branch, archive-master, updated. switch-to-templates-780-gaa511b1

[Frank Lichtenheld]

The following commit has been merged in the archive-master branch:
commit aa511b16180f384ce387125161e8a402bb90a6a2
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Dec 20 01:45:22 2010 +0100

[ARCHIVE] Finalize etch support

Do not yet know what I will do about etch-m68k

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 64de2db..b9de56a 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -45,7 +45,7 @@ ddtplangs=ca cs da de eo es eu fi fr hu it ja km ko nl pl pt 
pt-br ru sk sv uk
 archives=us security backports volatile
 sections=main contrib non-free
 parts=$sections
-suites=bo hamm slink potato woody sarge sarge-volatile sarge-backports etch 
etch-volatile etch-backports etch-m68k
+suites=bo hamm slink potato woody sarge sarge-volatile sarge-backports etch 
etch-volatile etch-backports
 priorities=required important standard optional extra
 dists=$suites
 architectures=alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 
sparc
diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 5231508..c57a4ed 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -81,7 +81,7 @@ fi
 
 # security archive
 #
-for dist in slink potato woody sarge
+for dist in slink potato woody sarge etch
 do
 echo retrieve Release(.gpg) $dist
 test -d security/${dist} || mkdir -p security/${dist}
diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 6da9b12..a76c6e1 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,12 +64,15 @@ sub do_dispatch {
 delete $ENV{'LC_ALL'};
 delete $ENV{'LC_MESSAGES'};
 
-my %SUITES_ALIAS = ( oldstable = 'etch',
-stable = 'lenny',
-testing = 'squeeze',
-unstable = 'sid',
+my %SUITES_ALIAS = (
 '4.0' = 'etch',
-'5.0' = 'lenny' );
+'3.1' = 'sarge',
+'3.0' = 'woody',
+'2.2' = 'potato',
+'2.1' = 'slink',
+'2.0' = 'hamm',
+   '1.3.1' = 'bo', 
+);
 
 # Read in all the variables set by the form
 my $input;
diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 3464394..2316706 100644
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -33,7 +33,7 @@ sub do_search_contents {
 #FIXME: that's extremely hacky atm
 if ($params-{values}{suite}{no_replace}[0] eq 'default') {
$params-{values}{suite}{no_replace} =
-   $params-{values}{suite}{final} = $opts-{suite} = [ 'sarge' ];
+   $params-{values}{suite}{final} = $opts-{suite} = [ 'etch' ];
 }
 
 if (@{$opts-{suite}}  1) {
diff --git a/templates/config/archive_layout.tmpl 
b/templates/config/archive_layout.tmpl
index c563e6e..100f0fc 100644
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@ -3,13 +3,6 @@
main_archive = 'us'
standard_priority = 'optional'
 
-   suite_aliases = {
-   etch = 'oldstable', 
-   lenny = 'stable',
-   squeeze = 'testing',
-   sid = 'unstable',
-  }
-
section_titles = {
 main = g('packages that meet the Debian Free Software 
Guidelines'),
 contrib = g('packages that meet the Debian Free Software 
Guidelines but need software not in Debian main'),
diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index e1d102f..b022b88 100644
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -12,7 +12,7 @@
slink  = '2.1',
hamm   = '2.0',
bo = '1.3.1'}
-current_release = 'sarge'
+current_release = 'etch'
 all_sections = [ 'main', 'contrib', 'non-free' ]
 all_architectures = [ 'alpha', 'amd64', 'arm', 'hppa', 'i386', 'ia64',
  'mips', 'mipsel', 'powerpc', 's390', 'sparc' ]

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-798-gef9d4ac

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit ef9d4acb009ad00ca68c2566c0782bf2dd02733f
Merge: 28e5e3b92d691be9330be9327a39286293f24647 
f41adf504622cd6f777cac9bca6285407dc97c12
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Feb 7 22:48:00 2010 +0100

Merge remote branch 'alioth/master' into debian-master

diff --combined bin/extract_files
index 79b9946,5c57bab..a94fba0
--- a/bin/extract_files
+++ b/bin/extract_files
@@@ -564,10 -564,6 +564,10 @@@ sub read_deb 
}
  }
  $cache{$debname} ||= qx/dpkg-deb --info $debname control/;
 +unless ( $cache{$debname} ) {
 +  do_warning( extracting control information of file $debname failed );
 +  return;
 +}
  my $control = $cache{$debname};
  
  unless ( $raw_data = $parser-parse_mem( $control,
@@@ -611,7 -607,7 +611,7 @@@ sub collect_deb 
  return unless $pkg_data;
  
  if (exists 
$bin_packages{$pkg_data-{bin_name}}{$pkg_data-{bin_version}}{$pkg_data-{bin_arch}})
 {
-   do_warning( duplicated package $pkg_data-{bin_name}, version 
{$pkg_data-{bin_version}{$pkg_data-{bin_arch}} );
+   do_warning( duplicated package $pkg_data-{bin_name}, version 
$pkg_data-{bin_version}, arch $pkg_data-{bin_arch} );
return;
  } else {

$bin_packages{$pkg_data-{bin_name}}{$pkg_data-{bin_version}}{$pkg_data-{bin_arch}}
 = $pkg_data;

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-692-geefec1d

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit e52c622cafc5a0dee6437f60147535a192b90c3e
Author: Frank Lichtenheld dj...@new-pauli.djpig.de
Date:   Sun Jan 17 15:06:30 2010 +0100

extract_files: Fix syntax error in warning

diff --git a/bin/extract_files b/bin/extract_files
index 269078c..5c57bab 100755
--- a/bin/extract_files
+++ b/bin/extract_files
@@ -607,7 +607,7 @@ sub collect_deb {
 return unless $pkg_data;
 
 if (exists 
$bin_packages{$pkg_data-{bin_name}}{$pkg_data-{bin_version}}{$pkg_data-{bin_arch}})
 {
-   do_warning( duplicated package $pkg_data-{bin_name}, version 
{$pkg_data-{bin_version}{$pkg_data-{bin_arch}} );
+   do_warning( duplicated package $pkg_data-{bin_name}, version 
$pkg_data-{bin_version}, arch $pkg_data-{bin_arch} );
return;
 } else {

$bin_packages{$pkg_data-{bin_name}}{$pkg_data-{bin_version}}{$pkg_data-{bin_arch}}
 = $pkg_data;

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-790-g28e5e3b

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 28e5e3b92d691be9330be9327a39286293f24647
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Jan 17 14:08:36 2010 +

create_mirror: Ensure that format of trace file doesn't depend on locale

diff --git a/bin/create_mirror b/bin/create_mirror
index a6d8220..6ce4860 100755
--- a/bin/create_mirror
+++ b/bin/create_mirror
@@ -50,7 +50,7 @@ do
   --delete-excluded --delete-after \
   $topdir/$d/ $new/$d/
 done
-date -u  $new/www/Pics/.trace
+LC_ALL=POSIX LANG=POSIX date -u  $new/www/Pics/.trace
 
 ln -sfT $new $mirror/current
 find $mirror -mindepth 1 -maxdepth 1 -not -name ${STAMP} -type d -print0 \

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-789-g59da095

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 59da095beebcee4ec6d78531709d709db391017c
Merge: f13529a2f31d2dd523c2a5559f62c73129e3954d 
88495a473fb1aef31bfcf623d2f2f9cb722165ad
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Jan 16 19:29:07 2010 +

Merge commit 'alioth/master' into debian-master

diff --combined config.sh.sed.in
index 9cd7c0d,f5a511d..77ab212
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
 -#localdir=/org/ftp.debian.org/debian
 +localdir=/srv/mirrors/ftp.debian.org
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -51,8 -51,8 +51,8 @@@ dists=$suites
  architectures=alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 
kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
  arch_etch=alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
  arch_lenny=${arch_etch} armel
- arch_squeeze=alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc
- arch_sid=${arch_squeeze} avr32 hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
+ arch_squeeze=alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 
mips mipsel powerpc s390 sparc
+ arch_sid=${arch_squeeze} avr32 hurd-i386 m68k
  arch_experimental=${arch_sid}
  arch_lenny_proposed_updates=${arch_lenny}
  arch_etch_proposed_updates=${arch_etch}

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-775-ge367807

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 616332d8dd69eb67e61e50cbf531c698af542016
Merge: 748ceddd9cfe7f65f7e349321488be52c11f1e22 
536628c059f6988d3352cb91a942e2cfd4346a85
Author: Frank Lichtenheld dj...@debian.org
Date:   Fri Oct 30 11:01:25 2009 +0100

Merge commit 'origin/master' into ubuntu-master

Conflicts:
static/index.tmpl
templates/config.tmpl
templates/config/archive_layout.tmpl
templates/config/mirrors.tmpl

diff --combined conf/apache.conf.sed.in
index 4165bb9,91833a6..41bcc34
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -65,15 -65,14 +65,15 @@@
AddEncoding x-gzip .gz
  /Directory
  
 -VirtualHost *
 -   ServerAdmin webmas...@debian.org
 +VirtualHost 91.189.94.219:80
 +   ServerAdmin fr...@lichtenheld.de
 DocumentRoot %TOPDIR%/www/
 ServerName %SITE%
 +   ServerAlias packages.ubunut.com
 ErrorLog /var/log/apache2/%SITE%-error.log
 CustomLog /var/log/apache2/%SITE%-access.log combined
  
 -   Alias /cgi-bin/ %TOPDIR%/cgi-bin/
 +   ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/

 PerlModule ModPerl::Registry
 PerlTaintCheck On
@@@ -106,29 -105,29 +106,30 @@@
 RewriteRule ^/changelogs/ - [L]
 RewriteRule ^/Pics/ - [L]
 RewriteRule ^/about/ - [L]
 +   RewriteRule ^/ubuntu/ - [L]
 RewriteRule ^/[^/]+\.css - [L]
 RewriteRule ^/[^/]+\.js - [L]
 RewriteRule ^/favicon.ico$ - [L]
 RewriteRule ^/robots.txt$ - [L]
  
  #   RewriteRule ^/$ http://www.debian.org/distrib/packages
-RewriteRule ^/$/index.html [L]
+RewriteRule ^/$/index [L]
 RewriteRule ^/([^/+]*)([+])([^/]*)$/$1%%{%}2B$3 [N]
 RewriteRule ^/changelog:(.+)$  /changelogs/${changelog-url:$1} [R,L,NE]
 RewriteRule ^/src:([^/]+)$ 
/search?searchon=sourcenameskeywords=$1 [R,L,NE]
 RewriteRule ^/file:(.+)$   /search?searchon=contentskeywords=$1 
[R,L,NE]
-RewriteCond %{QUERY_STRING} ^$ [OR]
-RewriteCond %{REQUEST_URI} !^/search$
-RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
-RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
- 
+
 RewriteCond %{QUERY_STRING} =
 RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
 RewriteCond %TOPDIR%/www%{REQUEST_FILENAME}.en.html -f [OR]
 RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l
 RewriteRule . - [L]
  
+RewriteCond %{QUERY_STRING} ^$ [OR]
+RewriteCond %{REQUEST_URI} !^/search$
+RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
+RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
+ 
 RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]
  
  #  In case we need to disable the site again
@@@ -140,17 -139,3 +141,17 @@@
  #   RewriteRule . /index.html
  
  /VirtualHost
 +
 +VirtualHost 91.189.94.219:80
 +   ServerAdmin fr...@lichtenheld.de
 +   DocumentRoot %TOPDIR%/www/
 +   ServerName packages.ubuntu.net
 +   ServerAlias packages.ubuntulinux.org
 +   ErrorLog /var/log/apache2/%SITE%-error.log
 +   CustomLog /var/log/apache2/%SITE%-access.log combined
 +
 +   ScriptAlias /cgi-bin %TOPDIR%/cgi-bin/
 +
 +   RedirectMatch permanent (.*) http://%SITE%$1
 +/VirtualHost
 +
diff --combined templates/config.tmpl
index 0cc7848,85c52f7..a8a72b6
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -3,68 -3,68 +3,70 @@@
 po_lang = 'en'
 ddtp_lang = 'en'
  
 -   organisation = 'Debian'
 -   project_homepage = 'http://www.debian.org/'
 +   organisation = 'Ubuntu'
 +   project_homepage = 'http://www.ubuntu.com/'
 packages_homepage = '/'
 +   packages_homepage_abs = 'http://packages.ubuntu.com/'
+packages_homepage_abs = 'http://packages.debian.net/'
 -   old_releases = 'http://archive.debian.net/'
++   old_releases = http://old-releases.ubuntu.com/
 searchformurl = packages_homepage
 search_url = '/search'
 tags_url = 'http://debtags.alioth.debian.org/'
 bugs_url = 'http://bugs.debian.org/'
 +   launchpad_url = 'https://launchpad.net/distros/ubuntu/+source/'
 pts_url = 'http://packages.qa.debian.org/'
 ddpo_url = 'http://qa.debian.org/developer.php?login='
 src_bugs_url = bugs_url _ 'src:'
 -   mirror_url = 'http://ftp.debian.org/'
 -   security_mirror = 'security.debian.org'
 -   security_mirror_url = security_mirror _ '/debian-security'
 -   security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   mirror_url = 'http://archive.ubuntu.com/'
 +   security_mirror = 'security.ubuntu.com'
 +   security_mirror_url = security_mirror _ '/ubuntu'
 +   security_suite_suffix = '-security'
 +   changelogs_url = 'http://changelogs.ubuntu.com/changelogs/'
 policy_url = 'http://www.debian.org/doc/debian-policy/'
 -   cn_help_url = project_homepage _ 'intro/cn'
 -   patch_tracking_url = 'http://patch-tracker.debian.org/package'
 +#   cn_help_url = project_homepage _ 'intro/cn

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-775-ge367807

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit ce10f2fe75bc7b12f7230aee1a09437377ec5680
Author: Frank Lichtenheld dj...@debian.org
Date:   Fri Oct 30 11:11:27 2009 +0100

[UBUNTU] karmic is released, reflect that, add lucid

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 8ab6a25..c75039e 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -42,7 +42,7 @@ ddtplangs=be ca cs da de en-gb eo es et eu fi fr gl hu id it 
ja ka km ko lt ml
 archives=us security
 sections=main multiverse restricted universe
 parts=$sections
-suites=dapper dapper-updates dapper-backports hardy hardy-updates 
hardy-backports intrepid intrepid-updates intrepid-backports jaunty 
jaunty-updates jaunty-backports karmic
+suites=dapper dapper-updates dapper-backports hardy hardy-updates 
hardy-backports intrepid intrepid-updates intrepid-backports jaunty 
jaunty-updates jaunty-backports karmic karmic-updates karmic-backports lucid
 dists=$suites
 priorities=required important standard optional extra
 architectures=i386 amd64 powerpc
@@ -61,6 +61,9 @@ arch_jaunty_backports=${arch_jaunty}
 arch_karmic=${arch_jaunty}
 arch_karmic_updates=${arch_karmic}
 arch_karmic_backports=${arch_karmic}
+arch_lucid=${arch_karmic}
+arch_lucid_updates=${arch_lucid}
+arch_lucid_backports=${arch_lucid}
 
 # Miscellaneous
 #
diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm
index f52221d..88ecb5c 100644
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@ -180,7 +180,7 @@ our @SUITES_SORT = qw(
squeeze
sid unstable experimental
warty hoary breezy dapper edgy feisty gutsy hardy
-   intrepid jaunty karmic);
+   intrepid jaunty karmic lucid);
 our @ARCHIVE_SORT = qw( non-US security updates volatile backports );
 our @PRIORITY_SORT = qw( required important standard optional extra );
 my $i = 1000;
diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 7096417..96e1836 100644
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -33,7 +33,7 @@ sub do_search_contents {
 #FIXME: that's extremely hacky atm
 if ($params-{values}{suite}{no_replace}[0] eq 'default') {
$params-{values}{suite}{no_replace} =
-   $params-{values}{suite}{final} = $opts-{suite} = [ 'jaunty' ];
+   $params-{values}{suite}{final} = $opts-{suite} = [ 'karmic' ];
 }
 
 if (@{$opts-{suite}}  1) {
diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index f8b78e9..f3e7dbf 100644
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -9,13 +9,15 @@
   'hardy', 'hardy-updates', 'hardy-backports',
   'intrepid', 'intrepid-updates', 'intrepid-backports',
   'jaunty', 'jaunty-updates', 'jaunty-backports',
-  'karmic', ]
+  'karmic', 'karmic-updates', 'karmic-backports',
+  'lucid' ]
 version_numbers = { dapper = '6.06LTS',
hardy  = '8.04LTS',
intrepid = '8.10',
jaunty = '9.04',
+karmic = '9.10',
  }
-current_release = 'jaunty'
+current_release = 'karmic'
 all_sections = [ 'main', 'multiverse', 'restricted', 'universe' ]
 all_architectures = [ 'i386', 'amd64', 'powerpc' ]
 -%]
@@ -124,6 +126,8 @@ Distribution:
 hr
 h2News/h2
 dl
+dt2009-10-30/dt
+ddReflect karmic release, add lucid./dd
 dt2009-04-24/dt
 ddReflect jaunty release, add karmic, remove gutsy/dd
 dt2009-02-21/dt

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-775-ge367807

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit a94292426fc9c73044803622d2b88b5902982e9c
Author: Frank Lichtenheld dj...@debian.org
Date:   Fri Oct 30 11:05:16 2009 +0100

[UBUNTU] Move homepage to new template mechanism

diff --git a/static/index.tmpl b/static/index.tmpl
deleted file mode 100644
index 146b562..000
--- a/static/index.tmpl
+++ /dev/null
@@ -1,347 +0,0 @@
-[%- PROCESS 'html/head.tmpl' 
-   title_tag = $organisation Packages Search
-   page_title = $organisation Packages Search
-   keywords = $organisation, Packages
-   html_meta = 'meta name=verify-v1 
content=Rg2bDR1kWPGd8k8v9NOgnmtUQHO6UaKX2glZWVDptok='
--%]
-[%-
-all_suites = [ 'dapper', 'dapper-updates', 'dapper-backports',
-  'hardy', 'hardy-updates', 'hardy-backports',
-  'intrepid', 'intrepid-updates', 'intrepid-backports',
-  'jaunty', 'jaunty-updates', 'jaunty-backports',
-  'karmic', ]
-version_numbers = { dapper = '6.06LTS',
-   hardy  = '8.04LTS',
-   intrepid = '8.10',
-   jaunty = '9.04',
- }
-current_release = 'jaunty'
-all_sections = [ 'main', 'multiverse', 'restricted', 'universe' ]
-all_architectures = [ 'i386', 'amd64', 'powerpc' ]
--%]
-
-pThis site provides you with information about all the packages
-available in the a href=[% project_homepage %][% organisation %]/a
-Package archive.
-
-pemPlease contact a href=mailto:[% admin.mail %][% admin.name %]/a
-if you encounter any problems!/em/p
-
-h2Browse through the lists of packages:/h2
-
-ul style=font-size:large
-[% FOREACH s IN all_suites %]
-lia href=[% s %]/[% s %]/a
-[% IF version_numbers.$s %]([% version_numbers.$s %])[% END %]/li
-[% END %]
-/ul
-
-pThere is also a list of a href=[% all_suites.-1 %]/main/newpkgpackages
-recently added to [% all_suites.-1 %]/a./p
-
-pOld releases can be found at a 
href=http://old-releases.ubuntu.com/;old-releases.ubuntu.com/a/p
-
-h2Search/h2
-
-h3Search package directories/h3
-
-form method=GET action=/search
-label for=kwKeyword:/label
-input type=text size=30 name=keywords id=kw
-input type=submit value=Search input type=reset value=Reset
-br
-Search on:
-input type=radio name=searchon value=names id=onlynames 
checked=checked
-label for=onlynamesPackage names only/labelnbsp;nbsp;
-input type=radio name=searchon value=all id=descs
-label for=descsDescriptions/label
-
-input type=radio name=searchon value=sourcenames id=src
-label for=srcSource package names/label
-br
-Only show exact matches:
-input type=checkbox name=exact value=1
-br
-Distribution:
-select name=suite
-[% FOREACH s IN all_suites %]
-  option value=[% s %] [% 'selected=selected' IF s == current_release 
%][% s %]/option
-[% END %]
-  option value=allany/option
-/select
-Section:
-select name=section
-[% FOREACH s IN all_sections %]
-  option value=[% s %][% s %]/option
-[% END %]
-  option value=all selected=selectedany/option
-/select
-/form
-pThere are shortcuts for some searches available:/p
-ul
-  licode[% packages_homepage %]varname/var/code for
-  the search on package names./li
-
-  licode[% packages_homepage %]src:varname/var/code
-  for the search on source package names./li
-/ul
-hr
-
-h3a name=search_contentsSearch the contents of packages/a/h3
-
-PThis search engine allows you to search the contents of [% organisation %]
-distributions for any files (or just parts of file names) that are
-part of packages.
-You can also get a full list of files in a given package.
-br
-form method=GET action=/search
-input type=hidden name=searchon value=contents
-
-label for=keywordKeyword:/label
-input type=text size=30 name=keywords id=keyword nbsp;
-
-input type=submit value=Search
-nbsp;input type=reset value=Reset
-br
-Display:
-br
-input type=radio name=mode value=exactfilename id=exactfilename 
checked=checked
-  label for=exactfilenamepackages that contain files named like 
this/label
-br
-input type=radio name=mode value= id=suffixpathname
-  label for=suffixpathnamepackages that contain files whose names end with 
the keyword/label
-br
-input type=radio name=mode value=filename id=filename
-  label for=filenamepackages that contain files whose names contain the 
keyword/label
-br
-label for=distroDistribution:/label
-
-select name=suite id=distro
-[% FOREACH s IN all_suites %]
-  option value=[% s %] [% 'selected=selected' IF s == current_release 
%][% s %]/option
-[% END %]
-/select
-label for=architectureArchitecture:/label
-select name=arch id=architecture
-[% FOREACH a IN all_architectures %]
-  option value=[% a %][% a %]/option
-[% END %]
-  option value=any selected=selectedany/option
-/select
-/form
-
-hr
-h2News/h2
-dl
-dt2009-04-24/dt
-ddReflect jaunty release, add karmic, remove gutsy/dd
-dt2009-02-21/dt
-ddRemove feisty./dd
-dt2008-11-03/dt
-ddAdd jaunty./dd
-dt2008-10-30/dt
-ddReflect intrepid release./dd
-dt2008-06

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-775-ge367807

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit e367807c640d4e19a16c8e4af15a6821fe9c0603
Author: Frank Lichtenheld dj...@debian.org
Date:   Fri Oct 30 11:22:43 2009 +0100

[UBUNTU] Fix syntax error in config.tmpl

diff --git a/templates/config.tmpl b/templates/config.tmpl
index a8a72b6..ef9c4a6 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -8,7 +8,7 @@
packages_homepage = '/'
packages_homepage_abs = 'http://packages.ubuntu.com/'
packages_homepage_abs = 'http://packages.debian.net/'
-   old_releases = http://old-releases.ubuntu.com/
+   old_releases = 'http://old-releases.ubuntu.com/'
searchformurl = packages_homepage
search_url = '/search'
tags_url = 'http://debtags.alioth.debian.org/'

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-675-g536628c

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit a3fba217b79d4a466e83a69c26798bdea7446547
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Jul 19 14:44:02 2009 +0200

Packages::Sections: Remove 'Debian/GNU Linux' from description of 'net'

The Debian part is distracting on the Ubuntu site, and the Linux
part doesn't fit for Debian anymore due to kfreebsd. So just remove
it.

diff --git a/lib/Packages/Sections.pm b/lib/Packages/Sections.pm
index 580f7b1..032c482 100644
--- a/lib/Packages/Sections.pm
+++ b/lib/Packages/Sections.pm
@@ -72,7 +72,7 @@ our %sections_descs = (
  misc  = [ N_(Miscellaneous),
 N_(Miscellaneous utilities that didn\'t 
fit well anywhere else.) ],
  net   = [ N_(Network),
-N_(Daemons and clients to connect your 
Debian GNU/Linux system to the world.) ],
+N_(Daemons and clients to connect your 
system to the world.) ],
  news  = [ N_(Newsgroups),
 N_(Software to access Usenet, to set up 
news servers, etc.) ],
  oldlibs   = [ N_(Old Libraries),

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-675-g536628c

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 1705d920d593b235711eb3c7f0949c5ae4dcde4f
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Jul 19 14:46:50 2009 +0200

Packages::Sections: Fix grammatical error in description of 'otherosfs'

diff --git a/lib/Packages/Sections.pm b/lib/Packages/Sections.pm
index 032c482..aaa5650 100644
--- a/lib/Packages/Sections.pm
+++ b/lib/Packages/Sections.pm
@@ -80,7 +80,7 @@ our %sections_descs = (
  ocaml = [ N_(OCaml),
 N_(Everything about OCaml, an ML language 
implementation.) ],
  otherosfs = [ N_(Other OS\'s and file systems),
-N_(Software to run programs compiled for 
other operating system, and to use their filesystems.) ],
+N_(Software to run programs compiled for 
other operating systems, and to use their filesystems.) ],
  perl  = [ N_(Perl),
 N_(Everything about Perl, an interpreted 
scripting language.) ],
  php   = [ N_(PHP),

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-675-g536628c

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 536628c059f6988d3352cb91a942e2cfd4346a85
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Tue Oct 27 22:43:43 2009 +0100

Unfuzzy sections.de.po

diff --git a/po/sections.de.po b/po/sections.de.po
index f9a5bdf..8964974 100644
--- a/po/sections.de.po
+++ b/po/sections.de.po
@@ -299,12 +299,9 @@ msgid Network
 msgstr Netzwerk
 
 #: lib/Packages/Sections.pm:75
-#, fuzzy
-#| msgid 
-#| Daemons and clients to connect your Debian GNU/Linux system to the world.
 msgid Daemons and clients to connect your system to the world.
 msgstr 
-Daemons und Clients um Ihr Debian GNU/Linux-System mit der Welt zu verbinden.
+Daemons und Clients um Ihr System mit der Welt zu verbinden.
 
 #: lib/Packages/Sections.pm:76
 msgid Newsgroups
@@ -339,10 +336,6 @@ msgid Other OS's and file systems
 msgstr Andere Betriebs- und Dateisysteme
 
 #: lib/Packages/Sections.pm:83
-#, fuzzy
-#| msgid 
-#| Software to run programs compiled for other operating system, and to use 
-#| their filesystems.
 msgid 
 Software to run programs compiled for other operating systems, and to use 
 their filesystems.

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-771-gf13529a

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit f13529a2f31d2dd523c2a5559f62c73129e3954d
Merge: 20687302e54e781d7f675f227ba6441df1be79dc 
dc95de76e0fec5f24c66de1bd743c6a5333dc5c3
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Tue Oct 27 22:53:33 2009 +0100

Merge commit 'alioth/master' into debian-master

Conflicts:
conf/apache.conf.sed.in
static/index.tmpl
templates/config.tmpl

diff --combined conf/apache.conf.sed.in
index fb7d0ce,91833a6..eac75bc
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -65,11 -65,10 +65,11 @@@
AddEncoding x-gzip .gz
  /Directory
  
 -VirtualHost *
 +VirtualHost *:80
 ServerAdmin webmas...@debian.org
 DocumentRoot %TOPDIR%/www/
 ServerName %SITE%
 +   ServerAlias packages-piatti.debian.org packages-powell.debian.org 
packages-rore.debian.org
 ErrorLog /var/log/apache2/%SITE%-error.log
 CustomLog /var/log/apache2/%SITE%-access.log combined
  
@@@ -111,23 -110,24 +111,24 @@@
 RewriteRule ^/favicon.ico$ - [L]
 RewriteRule ^/robots.txt$ - [L]
  
 -#   RewriteRule ^/$ http://www.debian.org/distrib/packages
 -   RewriteRule ^/$/index [L]
 +   RewriteRule ^/$ http://www.debian.org/distrib/packages
- #   RewriteRule ^/$ /index.html [L]
++#   RewriteRule ^/$ /index [L]
 RewriteRule ^/([^/+]*)([+])([^/]*)$/$1%%{%}2B$3 [N]
 RewriteRule ^/changelog:(.+)$  /changelogs/${changelog-url:$1} [R,L,NE]
 RewriteRule ^/src:([^/]+)$ 
/search?searchon=sourcenameskeywords=$1 [R,L,NE]
 RewriteRule ^/file:(.+)$   /search?searchon=contentskeywords=$1 
[R,L,NE]
-RewriteCond %{QUERY_STRING} ^$ [OR]
-RewriteCond %{REQUEST_URI} !^/search$
-RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
-RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
- 
+
 RewriteCond %{QUERY_STRING} =
 RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
 RewriteCond %TOPDIR%/www%{REQUEST_FILENAME}.en.html -f [OR]
 RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l
 RewriteRule . - [L]
  
+RewriteCond %{QUERY_STRING} ^$ [OR]
+RewriteCond %{REQUEST_URI} !^/search$
+RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
+RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
+ 
 RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]
  
  #  In case we need to disable the site again
diff --combined templates/config.tmpl
index 0508f16,85c52f7..26d6e85
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -6,7 -6,8 +6,8 @@@
 organisation = 'Debian'
 project_homepage = 'http://www.debian.org/'
 packages_homepage = '/'
 -   packages_homepage_abs = 'http://packages.debian.net/'
 +   packages_homepage_abs = 'http://packages.debian.org/'
+old_releases = 'http://archive.debian.net/'
 searchformurl = packages_homepage
 search_url = '/search'
 tags_url = 'http://debtags.alioth.debian.org/'
@@@ -18,10 -19,10 +19,10 @@@
 security_mirror = 'security.debian.org'
 security_mirror_url = security_mirror _ '/debian-security'
 security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   changelogs_url = '/changelogs/'
 policy_url = 'http://www.debian.org/doc/debian-policy/'
 cn_help_url = project_homepage _ 'intro/cn'
-patch_tracking_url = 'http://patch-tracking.debian.net/package'
+patch_tracking_url = 'http://patch-tracker.debian.org/package'
 logo = {
url = project_homepage,
  src = '/Pics/openlogo-nd-25.png',
@@@ -51,28 -52,19 +52,28 @@@
 trademarknotes = g('%s is a a href=%strademark/a of %s', 
organisation, trademark.url, trademark.name)
 sponsors = [
 {
 -  url = 'http://example.invalid/',
 -  name = 'Example Sponsor, Inc.',
 +  url = 'http://1und1.de/',
 +  name = '11 Internet AG',
 },
 {
 -  url = 'http://example2.invalid/',
 -  name = 'Example2 Sponsor, Inc.',
 +  url = 'http://www.hp.com/',
 +  name = 'Hewlett-Packard',
 +   },
 +   {
 +  url = 'http://cs.helsinki.fi/index.en.html',
 +  name = 'University of Helsinki - Department of Computer Science',
 +   },
 +   {
 +  url = 'http://www.csail.mit.edu/',
 +  name = 'MIT Computer Science  Artificial Intelligence Lab',
 },
 ]
  -%]
  [%-
 # possible values for importance: high, normal, low
 -   sitewidemsg = { importance = high,
 - txt = g('Please note that this is an experimental version 
of a href=http://%s/;%s/a. Errors and obsolete information should be 
expected', 'packages.debian.org', 'packages.debian.org') }
 +#   sitewidemsg = { importance = high,
 +#txt = g('Please note that this is an experimental version 
of a href=http://%s/;%s/a. Errors and obsolete information should be 
expected', 'packages.debian.org', 'packages.debian.org') }
 +#txt = Site

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-646-g02bdaff

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 91eaa551c3994173d5d528a4fdda6f7ee76557d5
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Jul 6 00:03:37 2009 +0200

homepage.tmpl: Mark page title and keywords as translatable

diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index 6dabe9f..aa17ea6 100644
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -1,7 +1,7 @@
 [%- PROCESS 'html/head.tmpl' 
-   title_tag = $organisation Packages Search
-   page_title = $organisation Packages Search
-   keywords = $organisation, Packages
+   title_tag = g('%s Packages Search', organisation)
+   page_title = g('%s Packages Search', organisation)
+   keywords = g('Packages')
 -%]
 [%-
 all_suites = [ 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports',

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-646-g02bdaff

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 0a44948edd189f22c09a52b3aad9a7274ff90ea6
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Jul 6 00:04:05 2009 +0200

Translate homepage to German

diff --git a/po/templates.de.po b/po/templates.de.po
index 05ce56a..a8a8b7b 100644
--- a/po/templates.de.po
+++ b/po/templates.de.po
@@ -426,73 +426,63 @@ msgstr Pakete
 msgid 
 This site provides you with information about all the packages available in 
 the a href=\%s\%s/a Package archive.
-msgstr 
+msgstr Diese Seite bietet Ihnen Informationen über alle Pakete, die im a 
href=\%s\%s/a-Paketarchiv verfügbar sind.
 
 #: templates/html/homepage.tmpl:21
 msgid 
 Please contact a href=\mailto:%s\;%s/a if you encounter any problems!
-msgstr 
+msgstr Bitte kontaktieren Sie a href=\mailto:%s\;%s/a, wenn Sie Probleme 
bemerken!
 
 #: templates/html/homepage.tmpl:23
 msgid Browse through the lists of packages:
-msgstr 
+msgstr Stöbern in den Paketlisten:
 
 #: templates/html/homepage.tmpl:32
 msgid 
 There is also a list of a href=\%s/main/newpkg\packages recently added 
 to %s/a.
-msgstr 
+msgstr Es gibt auch eine Liste der a href=\%s/main/newpkg\Pakete, die 
kürzlich zu %s hinzugefügt wurden/a.
 
 #: templates/html/homepage.tmpl:34
-#, fuzzy
-#| msgid This service is sponsored by a href=\%s\%s/a.
 msgid Old releases can be found at a href=\%s\%s/a.
-msgstr Dieser Service wird von a href=\%s\%s/a unterstützt.
+msgstr Alte Veröffentlichungen finden Sie auf a href=\%s\%s/a.
 
 #: templates/html/homepage.tmpl:38
 msgid Search package directories
-msgstr 
+msgstr Durchsuchen der Paketlisten
 
 #: templates/html/homepage.tmpl:41 templates/html/homepage.tmpl:85
 msgid Keyword:
-msgstr 
+msgstr Suchbegriff:
 
 #: templates/html/homepage.tmpl:43 templates/html/homepage.tmpl:89
 msgid Reset
-msgstr 
+msgstr Zurücksetzen
 
 #: templates/html/homepage.tmpl:45
-#, fuzzy
-#| msgid Search
 msgid Search on:
-msgstr Suche
+msgstr Suche in:
 
 #: templates/html/homepage.tmpl:47
-#, fuzzy
-#| msgid package names
 msgid Package names only
 msgstr Paketnamen
 
 #: templates/html/homepage.tmpl:49
-#, fuzzy
-#| msgid descriptions
 msgid Descriptions
 msgstr Beschreibungen
 
 #: templates/html/homepage.tmpl:51
-#, fuzzy
-#| msgid source package names
 msgid Source package names
 msgstr Quellcodepaketnamen
 
 #: templates/html/homepage.tmpl:53
 msgid Only show exact matches:
-msgstr 
+msgstr Zeige nur genaue Treffer:
 
 #: templates/html/homepage.tmpl:61 templates/html/homepage.tmpl:68
 #: templates/html/homepage.tmpl:114
 msgid any
-msgstr 
+msgstr alle
 
 #: templates/html/homepage.tmpl:63 templates/html/show.tmpl:16
 msgid Section:
@@ -500,20 +490,20 @@ msgstr Bereiche:
 
 #: templates/html/homepage.tmpl:71
 msgid There are shortcuts for some searches available:
-msgstr 
+msgstr Für einige Suchaufrufe sind Kurzschreibweisen verfügbar:
 
 #: templates/html/homepage.tmpl:73
 msgid code%svarname/var/code for the search on package names.
-msgstr 
+msgstr code%svarname/var/code für die Suche in Paketnamen.
 
 #: templates/html/homepage.tmpl:75
 msgid 
 code%ssrc:varname/var/code for the search on source package names.
-msgstr 
+msgstr code%ssrc:varname/var/code für die Suche in Quellpaketnamen.
 
 #: templates/html/homepage.tmpl:79
 msgid Search the contents of packages
-msgstr 
+msgstr Durchsuche Paketinhalte
 
 #: templates/html/homepage.tmpl:81
 msgid 
@@ -524,25 +514,23 @@ msgstr 
 
 #: templates/html/homepage.tmpl:91
 msgid Display:
-msgstr 
+msgstr Zeige:
 
 #: templates/html/homepage.tmpl:94
 msgid packages that contain files named like this
-msgstr 
+msgstr Pakete, die Dateien dieses Namens enthalten
 
 #: templates/html/homepage.tmpl:97
 msgid packages that contain files whose names end with the keyword
-msgstr 
+msgstr Pakete, die Dateien enthalten, deren Name mit dem Suchbegriff enden
 
 #: templates/html/homepage.tmpl:100
 msgid packages that contain files whose names contain the keyword
-msgstr 
+msgstr Pakete, die Dateien enthalten, deren Name den Suchbegriff enthält
 
 #: templates/html/homepage.tmpl:109
-#, fuzzy
-#| msgid Architecture
 msgid Architecture:
-msgstr Architektur
+msgstr Architektur:
 
 #: templates/html/index_head.tmpl:2
 msgid Source Packages in \%s\, %s %s

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-646-g02bdaff

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 02bdaff0b3a148bf4ebe3687125fb981d194e8ba
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Jul 6 00:09:09 2009 +0200

Complete German translation of homepage

diff --git a/po/templates.de.po b/po/templates.de.po
index 9baed4c..c5ed472 100644
--- a/po/templates.de.po
+++ b/po/templates.de.po
@@ -424,10 +424,8 @@ msgid Packages
 msgstr Pakete
 
 #: templates/html/homepage.tmpl:2 templates/html/homepage.tmpl:3
-#, fuzzy
-#| msgid %s Packages Homepage
 msgid %s Packages Search
-msgstr %s-Pakete-Homepage
+msgstr %s-Paket-Suche
 
 #: templates/html/homepage.tmpl:19
 msgid 
@@ -524,6 +522,9 @@ msgid 
 any files (or just parts of file names) that are part of packages. You can 
 also get a full list of files in a given package.
 msgstr 
+Diese Suchmaschine erlaubt es Ihnen, in den Inhalten der 
%s-Veröffentlichungen nach Dateien (oder Teilen von Dateinamen)
+ zu suchen, die in den Paketen enthalten sind. Sie können auch die komplette 
Liste der in einem bestimmten Paket enthaltenen
+ Dateien anzeigen.
 
 #: templates/html/homepage.tmpl:91
 msgid Display:

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, archive-master, updated. switch-to-templates-679-g6a99f47

[Frank Lichtenheld]

The following commit has been merged in the archive-master branch:
commit 6a99f4714326a371636fae11a2613160a32d8c8f
Merge: 1e0b8833ffc8fa00e781ee09072599f18599a004 
02bdaff0b3a148bf4ebe3687125fb981d194e8ba
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Jul 6 00:16:40 2009 +0200

Merge branch 'master' into archive-master

Conflicts:
static/index.tmpl
templates/config.tmpl

diff --combined conf/apache.conf.sed.in
index 7c78ef6,91833a6..49d88fa
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -8,7 -8,10 +8,7 @@@
  
# Nice caching..
ExpiresActive On
 -  ExpiresDefault access plus 1 day
 -  ExpiresByType image/gif  modification plus 1 year
 -  ExpiresByType image/jpeg modification plus 1 year
 -  ExpiresByType image/png  modification plus 1 year
 +  ExpiresDefault access plus 1 year
  
# language stuff
# you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@@ -69,18 -72,18 +69,18 @@@
 ErrorLog /var/log/apache2/%SITE%-error.log
 CustomLog /var/log/apache2/%SITE%-access.log combined
  
 -   Alias /cgi-bin/ %TOPDIR%/cgi-bin/
 +   ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/

 PerlModule ModPerl::Registry
 PerlTaintCheck On
 -   PerlRequire %TOPDIR%/bin/mod_perl-startup
 +#   PerlRequire %TOPDIR%/bin/mod_perl-startup
 PerlSwitches -T
 Location /cgi-bin/
 -  SetHandler perl-script
 -  PerlInitHandler Apache2::Reload
 -  PerlHandler ModPerl::Registry
 +#  SetHandler perl-script
 +#  PerlInitHandler Apache2::Reload
 +#  PerlHandler ModPerl::Registry
Options +ExecCGI
 -  PerlSendHeader On
 +#  PerlSendHeader On
allow from all
 /Location
  
@@@ -108,22 -111,23 +108,23 @@@
 RewriteRule ^/robots.txt$ - [L]
  
  #   RewriteRule ^/$ http://www.debian.org/distrib/packages
-RewriteRule ^/$/index.html [L]
+RewriteRule ^/$/index [L]
 RewriteRule ^/([^/+]*)([+])([^/]*)$/$1%%{%}2B$3 [N]
 RewriteRule ^/changelog:(.+)$  /changelogs/${changelog-url:$1} [R,L,NE]
 RewriteRule ^/src:([^/]+)$ 
/search?searchon=sourcenameskeywords=$1 [R,L,NE]
 RewriteRule ^/file:(.+)$   /search?searchon=contentskeywords=$1 
[R,L,NE]
-RewriteCond %{QUERY_STRING} ^$ [OR]
-RewriteCond %{REQUEST_URI} !^/search$
-RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
-RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
- 
+
 RewriteCond %{QUERY_STRING} =
 RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
 RewriteCond %TOPDIR%/www%{REQUEST_FILENAME}.en.html -f [OR]
 RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l
 RewriteRule . - [L]
  
+RewriteCond %{QUERY_STRING} ^$ [OR]
+RewriteCond %{REQUEST_URI} !^/search$
+RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
+RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
+ 
 RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]
  
  #  In case we need to disable the site again
diff --combined lib/Packages/Dispatcher.pm
index a46b2d5,08c6f96..6da9b12
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@@ -94,7 -94,7 +94,7 @@@ sub do_dispatch 
  Packages::DB::init();
  my $last_modified = $Packages::DB::db_read_time;
  my $now = time;
 -my $expires = $last_modified + (12*3600);
 +my $expires = $last_modified + (365*24*3600);
  $expires = $now + 3600 if $expires  $now;
  # allow some fudge, since the db mod time is not the end of
  # the cron job
@@@ -177,7 -177,11 +177,11 @@@
} elsif (@components == 0) {
fatal_error( We're supposed to display the homepage here, instead 
of getting dispatch.pl );
} elsif (@components == 1) {
-   $what_to_do = 'search';
+   if ($components[0] eq 'index') {
+   $what_to_do = 'homepage';
+   } else {
+   $what_to_do = 'search';
+   }
} else {
  
for ($components[-1]) {
diff --combined lib/Packages/DoIndex.pm
index 9eaf34e,6af0c3a..40f79fd
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@@ -12,7 -12,12 +12,12 @@@ use Packages::Config qw( $TOPDIR )
  use Packages::CGI;
  
  our @ISA = qw( Exporter );
- our @EXPORT = qw( do_index do_allpackages );
+ our @EXPORT = qw( do_homepage do_index do_allpackages );
+ 
+ sub do_homepage {
+ $_[1]-{suite} = [];
+ return send_file( 'index', @_ );
+ }
  
  sub do_index {
  return send_file( 'index', @_ );
@@@ -46,7 -51,7 +51,7 @@@ sub send_file 
  my $wwwdir = $TOPDIR/www;
  my $path = ;
  $path .= source/ if $opts-{source};
- $path .= $opts-{suite}[0]/;
+ $path .= $opts-{suite}[0]/ if @{$opts-{suite}};
  $path .= $opts-{archive}[0]/ if @{$opts-{archive}} == 1;
  $path .= $opts-{subsection}[0]/ if @{$opts-{subsection}};
  $path .= $opts-{priority}[0]/ if @{$opts-{priority}};
@@@ -63,7

[SCM] APT Archive Web-Frontend (Alioth repository) branch, archive-master, updated. switch-to-templates-680-ge57a5c6

[Frank Lichtenheld]

The following commit has been merged in the archive-master branch:
commit e57a5c62bd685641e0cf896e09e6d256cc572428
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Jul 6 00:28:03 2009 +0200

homepage.tmpl: Make old_releases link optional

For the benefit of the archive instances.

diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index bebb31f..90796d7 100644
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -32,7 +32,9 @@
 
 p[% g('There is also a list of a href=%s/main/newpkgpackages recently 
added to %s/a.', all_suites.-1, all_suites.-1) %]/p
 
+[% IF old_releases %]
 p[% g('Old releases can be found at a href=%s%s/a.', old_releases, 
old_releases) %]/p
+[% END %]
 
 h2[% g('Search') %]/h2
 

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-647-gd462e59

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit d462e5996786286a95286716e3c96bc40a2892a9
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Jul 6 00:28:03 2009 +0200

homepage.tmpl: Make old_releases link optional

For the benefit of the archive instances.
(cherry picked from commit e57a5c62bd685641e0cf896e09e6d256cc572428,
because committed and pushed in wrong branch)

diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index aa17ea6..0f77b5c 100644
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -31,7 +31,9 @@
 
 p[% g('There is also a list of a href=%s/main/newpkgpackages recently 
added to %s/a.', all_suites.-1, all_suites.-1) %]/p
 
+[% IF old_releases %]
 p[% g('Old releases can be found at a href=%s%s/a.', old_releases, 
old_releases) %]/p
+[% END %]
 
 h2[% g('Search') %]/h2
 

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-730-g0438ce5

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 0438ce5807cbe2ea9b8aeeb38f5f8a6565b0f3ac
Merge: 70fbc048de65db4f013ce06b16fa5e01fc26c8b0 
41ebce59dc918cf53ec606ec288ff99b8d7e5520
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Jul 4 16:48:10 2009 +0200

Merge branch 'master' into ubuntu-master

diff --combined lib/Deb/Versions.pm
index 62aa0b8,50b5ccb..f52221d
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@@ -165,7 -165,12 +165,12 @@@ sub _lcmp 
  return length( $v1 ) = length( $v2 );
  }
  
- our @SUITES_SORT = qw(  woody
+ our @SUITES_SORT = qw(  
+   bo
+   hamm
+   slink
+   potato
+   woody
sarge
oldstable
etch etch-m68k
@@@ -174,8 -179,7 +179,8 @@@
testing testing-proposed-updates
squeeze
sid unstable experimental
 -  warty hoary breezy dapper edgy feisty gutsy hardy 
intrepid jaunty);
 +  warty hoary breezy dapper edgy feisty gutsy hardy
 +  intrepid jaunty karmic);
  our @ARCHIVE_SORT = qw( non-US security updates volatile backports );
  our @PRIORITY_SORT = qw( required important standard optional extra );
  my $i = 1000;

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-733-g6e92a4c

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 6e92a4c26c55a0c9ecfa84973edfb849bab8b770
Merge: 1a7bebab3e2a57928a485a31fa73c900e28772e5 
15a0877194f3d709bf080d35a51a649ea1ef7b51
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Jul 4 17:30:03 2009 +0200

Merge branch 'master' into debian-master


-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-733-g748cedd

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 748ceddd9cfe7f65f7e349321488be52c11f1e22
Merge: 0438ce5807cbe2ea9b8aeeb38f5f8a6565b0f3ac 
15a0877194f3d709bf080d35a51a649ea1ef7b51
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Jul 4 17:30:31 2009 +0200

Merge branch 'master' into ubuntu-master


-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-734-ge90fd44

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit e90fd442712e8cee098c66f044d48e8f3c553033
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Jul 4 21:29:39 2009 +0200

index.tmpl: Use packages_homepage_abs for shortcut explanation

diff --git a/static/index.tmpl b/static/index.tmpl
index 524dff3..cbd3c07 100644
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -73,10 +73,10 @@ Section:
 /form
 pThere are shortcuts for some searches available:/p
 ul
-  licode[% packages_homepage %]varname/var/code for
+  licode[% packages_homepage_abs %]varname/var/code for
   the search on package names./li
 
-  licode[% packages_homepage %]src:varname/var/code
+  licode[% packages_homepage_abs %]src:varname/var/code
   for the search on source package names./li
 /ul
 hr

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-641-g0e2a94f

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 597347c0fe994954d5e5168368fb21e743a39def
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Jul 4 22:30:21 2009 +0200

Make static pages translatable via templates.pot and convert homepage to 
use it

This is currently only for the benefit of every site except packages.d.o 
since
that uses a page on www.d.o instead which is translated there.

diff --git a/bin/translate_static_page b/bin/translate_static_page
new file mode 100755
index 000..e62bbb9
--- /dev/null
+++ b/bin/translate_static_page
@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use POSIX;
+use File::Basename;
+
+use lib './lib';
+
+use Packages::CommonCode qw(:all);
+use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES @LANGUAGES );
+use Packages::Template;
+use Packages::I18N::Locale;
+Packages::Config::init( './' );
+
+my $template = new Packages::Template( $TOPDIR/templates, 'html');
+
+if( @ARGV % 2 ){
+die usage: translate_static_page [[template outputfile]...]\n;
+}
+my %pages = @ARGV;
+print translate static pages ...\n;
+while( my ($tmpl, $output) = each %pages ) {
+my $outdir = dirname($output);
+my $outfile = basename($output);
+mkdirp ( $outdir );
+foreach my $lang (@LANGUAGES) {
+   my $charset = 'UTF-8';
+   my $cat = Packages::I18N::Locale-get_handle($lang)
+   or die get_handle failed for $lang;
+   print writing $outfile (lang=$lang)...\n;
+
+   my %content = ( po_lang = $lang, ddtp_lang = $lang,
+   charset = $charset, cat = $cat,
+   used_langs = \...@languages );
+
+   $template-page( $tmpl, \%content,
+$TOPDIR/$output.$lang.html.new);
+   activate( $TOPDIR/$output.$lang.html );
+}
+}
diff --git a/cron.d/500update_po b/cron.d/500update_po
index 9950b8a..5a84ea9 100755
--- a/cron.d/500update_po
+++ b/cron.d/500update_po
@@ -31,6 +31,7 @@ templates/html/error.tmpl
 templates/html/filelist.tmpl
 templates/html/foot.tmpl
 templates/html/head.tmpl
+templates/html/homepage.tmpl
 templates/html/index_head.tmpl
 templates/html/index_foot.tmpl
 templates/html/messages.tmpl
diff --git a/cron.d/700install_static b/cron.d/700install_static
index 933fb21..05723a4 100755
--- a/cron.d/700install_static
+++ b/cron.d/700install_static
@@ -6,5 +6,8 @@ set -e
 
 test -d $htmldir || mkdir -p $htmldir
 
-cd $topdir  ttree --perl5lib=${libdir} --load_perl --eval_perl \
-   -f ./conf/ttreerc
+cd $topdir
+ttree --perl5lib=${libdir} --load_perl --eval_perl \
+  -f ./conf/ttreerc
+
+./bin/translate_static_page homepage www/index
diff --git a/static/index.tmpl b/static/index.tmpl
deleted file mode 100644
index 524dff3..000
--- a/static/index.tmpl
+++ /dev/null
@@ -1,129 +0,0 @@
-[%- PROCESS 'html/head.tmpl' 
-   title_tag = $organisation Packages Search
-   page_title = $organisation Packages Search
-   keywords = $organisation, Packages
--%]
-[%-
-all_suites = [ 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports',
-  'lenny', 'lenny-volatile', 'lenny-backports', 'squeeze', 
'sid' ]
-version_numbers = { sarge = '3.1',
-   etch  = '4.0',
-   lenny = '5.0' }
-current_release = 'lenny'
-all_sections = [ 'main', 'contrib', 'non-free' ]
-all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'avr32', 'hppa', 
'i386',
- 'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips',
- 'mipsel', 'm68k', 'powerpc', 's390', 'sparc' ]
--%]
-
-pThis site provides you with information about all the packages
-available in the a href=[% project_homepage %][% organisation %]/a
-Package archive.
-
-pemPlease contact a href=mailto:[% admin.mail %][% admin.name %]/a
-if you encounter any problems!/em/p
-
-h2Browse through the lists of packages:/h2
-
-ul style=font-size:large
-[% FOREACH s IN all_suites %]
-lia href=[% s %]/[% s %]/a
-[% IF version_numbers.$s %]([% version_numbers.$s %])[% END %]/li
-[% END %]
-/ul
-
-pThere is also a list of a href=[% all_suites.-1 %]/main/newpkgpackages
-recently added to [% all_suites.-1 %]/a./p
-
-h2Search/h2
-
-h3Search package directories/h3
-
-form method=GET action=/search
-label for=kwKeyword:/label
-input type=text size=30 name=keywords id=kw
-input type=submit value=Search input type=reset value=Reset
-br
-Search on:
-input type=radio name=searchon value=names id=onlynames 
checked=checked
-label for=onlynamesPackage names only/labelnbsp;nbsp;
-input type=radio name=searchon value=all id=descs
-label for=descsDescriptions/label
-
-input type=radio name=searchon value=sourcenames id=src
-label for=srcSource package names/label
-br
-Only show exact matches:
-input type=checkbox name=exact value=1
-br
-Distribution:
-select name=suite
-[% FOREACH s IN all_suites %]
-  option value=[% s %] [% 'selected=selected' IF s == current_release 
%][% s

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-641-g0e2a94f

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit e86f7dbf94297bacc9e1d2e0046dfedb3659c820
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Jul 4 22:35:43 2009 +0200

Add a link to old releases on homepage

Eliminates a Ubuntu patch and makes sense for Debian, too.

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 77e6db1..1792ac5 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -7,6 +7,7 @@
project_homepage = 'http://www.debian.org/'
packages_homepage = '/'
packages_homepage_abs = 'http://packages.debian.net/'
+   old_releases = 'http://archive.debian.net/'
searchformurl = packages_homepage
search_url = '/search'
tags_url = 'http://debtags.alioth.debian.org/'
diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index 40764e7..7aa276e 100644
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -31,6 +31,8 @@
 
 p[% g('There is also a list of a href=%s/main/newpkgpackages recently 
added to %s/a.', all_suites.-1, all_suites.-1) %]/p
 
+p[% g('Old releases can be found at a href=%s%s/a.', old_releases, 
old_releases) %]/p
+
 h2[% g('Search') %]/h2
 
 h3[% g('Search package directories') %]/h3

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-641-g0e2a94f

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 0e2a94fd63e8f95dac115fde72163cf44aba9290
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Jul 4 23:33:22 2009 +0200

Emply various dark magic, so that the language override works for the 
homepage

Oh, so many parts of this need a clean rewrite...

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index b0b33e3..91833a6 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -111,22 +111,23 @@
RewriteRule ^/robots.txt$ - [L]
 
 #   RewriteRule ^/$ http://www.debian.org/distrib/packages
-   RewriteRule ^/$ /index.html [L]
+   RewriteRule ^/$ /index [L]
RewriteRule ^/([^/+]*)([+])([^/]*)$ /$1%%{%}2B$3 [N]
RewriteRule ^/changelog:(.+)$   /changelogs/${changelog-url:$1} [R,L,NE]
RewriteRule ^/src:([^/]+)$  
/search?searchon=sourcenameskeywords=$1 [R,L,NE]
RewriteRule ^/file:(.+)$/search?searchon=contentskeywords=$1 
[R,L,NE]
-   RewriteCond %{QUERY_STRING} ^$ [OR]
-   RewriteCond %{REQUEST_URI} !^/search$
-   RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
-   RewriteRule ^/([^/]+)$  /search?keywords=$1 [R,L,NE]
-
+   
RewriteCond %{QUERY_STRING} =
RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
RewriteCond %TOPDIR%/www%{REQUEST_FILENAME}.en.html -f [OR]
RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l
RewriteRule . - [L]
 
+   RewriteCond %{QUERY_STRING} ^$ [OR]
+   RewriteCond %{REQUEST_URI} !^/search$
+   RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
+   RewriteRule ^/([^/]+)$  /search?keywords=$1 [R,L,NE]
+
RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]
 
 #  In case we need to disable the site again
diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 484e222..08c6f96 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -177,7 +177,11 @@ sub do_dispatch {
} elsif (@components == 0) {
fatal_error( We're supposed to display the homepage here, instead 
of getting dispatch.pl );
} elsif (@components == 1) {
-   $what_to_do = 'search';
+   if ($components[0] eq 'index') {
+   $what_to_do = 'homepage';
+   } else {
+   $what_to_do = 'search';
+   }
} else {
 
for ($components[-1]) {
diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index 5aba6b3..6af0c3a 100644
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -12,7 +12,12 @@ use Packages::Config qw( $TOPDIR );
 use Packages::CGI;
 
 our @ISA = qw( Exporter );
-our @EXPORT = qw( do_index do_allpackages );
+our @EXPORT = qw( do_homepage do_index do_allpackages );
+
+sub do_homepage {
+$_[1]-{suite} = [];
+return send_file( 'index', @_ );
+}
 
 sub do_index {
 return send_file( 'index', @_ );
@@ -46,7 +51,7 @@ sub send_file {
 my $wwwdir = $TOPDIR/www;
 my $path = ;
 $path .= source/ if $opts-{source};
-$path .= $opts-{suite}[0]/;
+$path .= $opts-{suite}[0]/ if @{$opts-{suite}};
 $path .= $opts-{archive}[0]/ if @{$opts-{archive}} == 1;
 $path .= $opts-{subsection}[0]/ if @{$opts-{subsection}};
 $path .= $opts-{priority}[0]/ if @{$opts-{priority}};
diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index 7aa276e..6dabe9f 100644
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -115,4 +115,4 @@ Distribution:
 /select
 /form
 
-[% PROCESS 'html/foot.tmpl' copyright.years = '1997 - 2009' %]
+[% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years = 
'1997 - 2009' %]

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-635-g41ebce5

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 41ebce59dc918cf53ec606ec288ff99b8d7e5520
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Thu Jun 18 21:27:58 2009 +0200

create_index_pages: Do not die due to namespace collisions

If for whatever reason the same name appears in more than one
set of sections, subsections, and priorities, the code used
to die. The new code will not handle this very well either
(you will get repeated lines in the affected file), but
at least it will not take everything else with it.

diff --git a/bin/create_index_pages b/bin/create_index_pages
index 3e9fc52..66d7838 100755
--- a/bin/create_index_pages
+++ b/bin/create_index_pages
@@ -10,6 +10,7 @@ use Storable;
 use HTML::Entities;
 use URI::Escape;
 use Compress::Zlib;
+use IO::Handle;
 
 use lib './lib';
 
@@ -75,6 +76,10 @@ sub open_file {
 
 print opening $key\n;
 mkdirp ( $wwwdir/$key );
+if ($fh{$key}) {
+   warn filehandle for $key already open\n;
+   return;
+}
 open($fh{$key}, '',
 $wwwdir/$key/$file.slices.new)
or die Cannot open file $wwwdir/$key/$file.slices.new: $!;
@@ -95,6 +100,10 @@ sub close_file {
 $file ||= 'index';
 
 print closing $key\n;
+unless ($fh{$key}-opened()) {
+   warn filehandle for $key already closed\n;
+   return;
+}
 
 foreach my $lang (@LANGUAGES) {
print {$fh{$key}} \n$s{begin}{$lang}\n;

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-630-g53ec702

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 53ec702600ecf0c792e9df5e6422a77e92ce5ad6
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Thu Jun 11 19:23:47 2009 +0200

translate new string

diff --git a/po/templates.de.po b/po/templates.de.po
index 4445e4f..825aae7 100644
--- a/po/templates.de.po
+++ b/po/templates.de.po
@@ -106,7 +106,7 @@ msgstr GNU/kFreeBSD (amd64)
 
 #: templates/config/architectures.tmpl:20
 msgid AVR32
-msgstr 
+msgstr AVR32
 
 #: templates/config/archive_layout.tmpl:14
 msgid packages that meet the Debian Free Software Guidelines

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-725-g1a7beba

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 1a7bebab3e2a57928a485a31fa73c900e28772e5
Merge: 9a482e584a6b5337a90385ad1d54ae3190330dce 
53ec702600ecf0c792e9df5e6422a77e92ce5ad6
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Thu Jun 11 19:25:02 2009 +0200

Merge branch 'master' into debian-master

diff --combined config.sh.sed.in
index 860f7e1,4e228e4..9cd7c0d
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
 -#localdir=/org/ftp.debian.org/debian
 +localdir=/srv/mirrors/ftp.debian.org
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -40,7 -40,7 +40,7 @@@ search_url=/search
  
  # Architectures
  #
- polangs=de fi fr hu ja nl ru sv uk zh-cn
+ polangs=de fi fr hu ja nl ru sk sv uk zh-cn
  ddtplangs=ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv 
uk zh zh-cn zh-tw
  archives=us security debports backports volatile
  sections=main contrib non-free

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-724-g70fbc04

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 70fbc048de65db4f013ce06b16fa5e01fc26c8b0
Merge: 0a408bcfa254712cd4f4ed0bd19bc24d412a6eb6 
53ec702600ecf0c792e9df5e6422a77e92ce5ad6
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Thu Jun 11 19:26:31 2009 +0200

Merge branch 'master' into ubuntu-master

Conflicts:
config.sh.sed.in

diff --combined config.sh.sed.in
index b82322d,4e228e4..8ab6a25
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -24,9 -24,12 +24,9 @@@ cachedir=${topdir}/cach
  # path to private ftp directory
  #ftproot=/org/ftp.root
  
 -ftpsite=http://ftp.de.debian.org/debian
 -security_ftpsite=http://security.debian.org/debian-security
 -volatile_ftpsite=http://volatile.debian.org/debian-volatile
 -backports_ftpsite=http://backports.org/debian
 -debports_ftpsite=http://ftp.debian-ports.org/debian
 -ddtp_ftpsite=
 +ftpsite=http://archive.ubuntu.com/ubuntu
 +security_ftpsite=http://archive.ubuntu.com/ubuntu
 +#ddtp_ftpsite=http://archive.ubuntu.com/ubuntu
  
  wget_cmd=wget --no-verbose --tries=2 --timeout=60
  check_release_cmd=perl -I${libdir} ${bindir}/check-release --verbose 
--ignoremissing --keyring ${configdir}/trusted.gpg
@@@ -37,30 -40,22 +37,30 @@@ search_url=/search
  
  # Architectures
  #
- polangs=de fi fr hu ja nl ru sv uk zh-cn
+ polangs=de fi fr hu ja nl ru sk sv uk zh-cn
 -ddtplangs=ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv 
uk zh zh-cn zh-tw
 -archives=us security debports backports volatile
 -sections=main contrib non-free
 +ddtplangs=be ca cs da de en-gb eo es et eu fi fr gl hu id it ja ka km ko lt 
ml nl oc pl pt pt-br ro ru sk sl sv tr uk vi zh-cn zh-hk zh-tw
 +archives=us security
 +sections=main multiverse restricted universe
  parts=$sections
 -suites=etch etch-m68k etch-volatile etch-backports lenny lenny-volatile 
lenny-backports squeeze sid experimental
 -priorities=required important standard optional extra
 +suites=dapper dapper-updates dapper-backports hardy hardy-updates 
hardy-backports intrepid intrepid-updates intrepid-backports jaunty 
jaunty-updates jaunty-backports karmic
  dists=$suites
 -architectures=alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 
kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
 -arch_etch=alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
 -arch_lenny=${arch_etch} armel
 -arch_squeeze=alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc
 -arch_sid=${arch_squeeze} avr32 hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
 -arch_experimental=${arch_sid}
 -arch_lenny_proposed_updates=${arch_lenny}
 -arch_etch_proposed_updates=${arch_etch}
 +priorities=required important standard optional extra
 +architectures=i386 amd64 powerpc
 +arch_dapper=i386 amd64 powerpc
 +arch_dapper_updates=${arch_dapper}
 +arch_dapper_backports=${arch_dapper}
 +arch_hardy=i386 amd64
 +arch_hardy_updates=${arch_hardy}
 +arch_hardy_backports=${arch_hardy}
 +arch_intrepid=${arch_hardy}
 +arch_intrepid_updates=${arch_intrepid}
 +arch_intrepid_backports=${arch_intrepid}
 +arch_jaunty=${arch_intrepid}
 +arch_jaunty_updates=${arch_jaunty}
 +arch_jaunty_backports=${arch_jaunty}
 +arch_karmic=${arch_jaunty}
 +arch_karmic_updates=${arch_karmic}
 +arch_karmic_backports=${arch_karmic}
  
  # Miscellaneous
  #

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, archive-master, updated. switch-to-templates-663-g1e0b883

[Frank Lichtenheld]

The following commit has been merged in the archive-master branch:
commit 1e0b8833ffc8fa00e781ee09072599f18599a004
Merge: 0a335eaba954e57a0e9944a0a1760f3868c5622b 
adbcfcb29cc7e21e46f7b3e1cace9de0d95f9a28
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Thu Jun 11 19:51:01 2009 +0200

Merge branch 'master' into archive-master

Conflicts:
lib/Deb/Versions.pm


-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, archive-master, updated. switch-to-templates-663-g1e0b883

[Frank Lichtenheld]

The following commit has been merged in the archive-master branch:
commit 0a335eaba954e57a0e9944a0a1760f3868c5622b
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Thu Jun 11 19:45:58 2009 +0200

[ARCHIVE] Disable sponsors, there are none currently

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 828a1c8..045ae5e 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -50,14 +50,14 @@
}
trademarknotes = g('%s is a a href=%strademark/a of %s', 
organisation, trademark.url, trademark.name)
sponsors = [
-   {
-   url = 'http://example.invalid/',
-   name = 'Example Sponsor, Inc.',
-   },
-   {
-   url = 'http://example2.invalid/',
-   name = 'Example2 Sponsor, Inc.',
-   },
+#   {
+#  url = 'http://example.invalid/',
+#  name = 'Example Sponsor, Inc.',
+#   },
+#   {
+#  url = 'http://example2.invalid/',
+#  name = 'Example2 Sponsor, Inc.',
+#   },
]
 -%]
 [%-

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, archive-master, updated. switch-to-templates-663-g1e0b883

[Frank Lichtenheld]

The following commit has been merged in the archive-master branch:
commit b2b9a31b9adfdd251590eb1bfb72c95d5538e392
Merge: 9be316ca72fbb573211c162a828c244ea8fe5224 
53ec702600ecf0c792e9df5e6422a77e92ce5ad6
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Thu Jun 11 19:44:59 2009 +0200

Merge branch 'master' into archive-master

Conflicts:
config.sh.sed.in
cron.d/100syncarchive_backports
cron.d/100syncarchive_debports
cron.d/100syncarchive_m68k
lib/Deb/Versions.pm
lib/Packages/DoSearchContents.pm
lib/Packages/DoShow.pm
static/index.tmpl
templates/config.tmpl
templates/config/mirrors.tmpl

diff --combined bin/parse-packages
index 3f282a1,6f89070..6dad93e
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@@ -85,8 -85,6 +85,8 @@@ for my $suite (@SUITES) 
$key =~ tr [A-Z] [a-z];
$data{$key} = $value;
}
 +  # Skip broken debs
 +  next unless $data{architecture};
# Skip double package
next if exists($packages_all_db{$data{'package'} 
$data{'architecture'} $data{'version'}});
# Skip arch:all for amd64  debports, any non-redundancy is
@@@ -117,10 -115,12 +117,12 @@@
foreach (@complete_tags) {
my ($facet, $tag) = split( /::/, $_, 2);
if ($tag =~ s/^\{(.+)\}$/$1/) {
+   warn pkg=$data{package} tags=$data{tag}\n unless 
$facet  $tag;
foreach (split( /,/, $tag )) {
push @tags, ${facet}::$_;
}
} else {
+   warn pkg=$data{package} tags=$data{tag}\n unless 
$facet  $tag;
push @tags, ${facet}::$tag;
}
}
diff --combined conf/apache.conf.sed.in
index a3eca9b,b0b33e3..7c78ef6
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -8,7 -8,10 +8,7 @@@
  
# Nice caching..
ExpiresActive On
 -  ExpiresDefault access plus 1 day
 -  ExpiresByType image/gif  modification plus 1 year
 -  ExpiresByType image/jpeg modification plus 1 year
 -  ExpiresByType image/png  modification plus 1 year
 +  ExpiresDefault access plus 1 year
  
# language stuff
# you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@@ -69,18 -72,18 +69,18 @@@
 ErrorLog /var/log/apache2/%SITE%-error.log
 CustomLog /var/log/apache2/%SITE%-access.log combined
  
 -   Alias /cgi-bin/ %TOPDIR%/cgi-bin/
 +   ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/

 PerlModule ModPerl::Registry
 PerlTaintCheck On
 -   PerlRequire %TOPDIR%/bin/mod_perl-startup
 +#   PerlRequire %TOPDIR%/bin/mod_perl-startup
 PerlSwitches -T
 Location /cgi-bin/
 -  SetHandler perl-script
 -  PerlInitHandler Apache2::Reload
 -  PerlHandler ModPerl::Registry
 +#  SetHandler perl-script
 +#  PerlInitHandler Apache2::Reload
 +#  PerlHandler ModPerl::Registry
Options +ExecCGI
 -  PerlSendHeader On
 +#  PerlSendHeader On
allow from all
 /Location
  
@@@ -113,8 -116,9 +113,9 @@@
 RewriteRule ^/changelog:(.+)$  /changelogs/${changelog-url:$1} [R,L,NE]
 RewriteRule ^/src:([^/]+)$ 
/search?searchon=sourcenameskeywords=$1 [R,L,NE]
 RewriteRule ^/file:(.+)$   /search?searchon=contentskeywords=$1 
[R,L,NE]
-RewriteCond %{REQUEST_URI} !^/search$ [OR]
-RewriteCond %{QUERY_STRING} ^$
+RewriteCond %{QUERY_STRING} ^$ [OR]
+RewriteCond %{REQUEST_URI} !^/search$
+RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
 RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
  
 RewriteCond %{QUERY_STRING} =
diff --combined config.sh.sed.in
index eb96154,4e228e4..50f6dc1
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,16 -19,17 +19,16 @@@ cachedir=${topdir}/cach
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
 -#localdir=/org/ftp.debian.org/debian
 +localdir=/srv/archive.debian.org/ftp
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
  
 -ftpsite=http://ftp.de.debian.org/debian
 -security_ftpsite=http://security.debian.org/debian-security
 -volatile_ftpsite=http://volatile.debian.org/debian-volatile
 -backports_ftpsite=http://backports.org/debian
 -debports_ftpsite=http://ftp.debian-ports.org/debian
 -ddtp_ftpsite=
 +ftpsite=http://archive.debian.org/debian
 +security_ftpsite=http://archive.debian.org/debian-security
 +volatile_ftpsite=http://archive.debian.org/debian-volatile
 +backports_ftpsite=http://archive.debian.org/backports.org
 +ddtp_ftpsite=http://ftp.de.debian.org/debian
  
  wget_cmd=wget --no-verbose --tries=2 --timeout=60
  check_release_cmd=perl -I${libdir} ${bindir}/check-release --verbose 
--ignoremissing --keyring

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-archive, created. switch-to-templates-725-g12b8ef6

[Frank Lichtenheld]

The branch, ubuntu-archive has been created
at  12b8ef674502a3deffa3e8c9eca57f2dcbbb53a0 (commit)

- Shortlog 
commit 12b8ef674502a3deffa3e8c9eca57f2dcbbb53a0
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Fri Jun 12 01:21:45 2009 +0200

[UBUNTU ARCHIVE] Adapt configuration to display the contents of 
old-releases.u.c

---

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

reassign 532072 to www.debian.org

[Frank Lichtenheld]

reassign 532072 www.debian.org 


-- 
To UNSUBSCRIBE, email to debian-www-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-622-g50383c8

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 50383c8280d6ce318e3b1a1a9ad2a1343c2483f9
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Jun 7 20:54:57 2009 +0200

Updated debtags.pot and merge to .po files

diff --git a/po/debtags.de.po b/po/debtags.de.po
index 908b6f5..bf2af35 100644
--- a/po/debtags.de.po
+++ b/po/debtags.de.po
@@ -10,6 +10,11 @@ msgstr 
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 
+#. Tag: x11::xserver, long desc
+#: files/debtags/vocabulary
+msgid  X servers and drivers for the X server (input and video)
+msgstr 
+
 #. Tag: special::not-yet-tagged, short desc
 #: files/debtags/vocabulary
 msgid !Not yet tagged packages!
@@ -339,7 +344,8 @@ msgstr 
 stattfindet, wird ein zentraler Knoten, der sogenannte Tracker, benötigt, um 
 eine Liste aller Clients zu bewahren, die die gleiche Datei herunterladen 
 oder zur Verfügung stellen.\n
-Link: http://www.bittorrent.com/ Link: 
http://de.wikipedia.org/wiki/BitTorrent;
+Link: http://www.bittorrent.com/ Link: http://de.wikipedia.org/wiki/;
+BitTorrent
 
 #. Tag: web::blog, short desc
 #: files/debtags/vocabulary
@@ -2010,6 +2016,13 @@ msgstr Meta-Paket
 msgid Metapackages
 msgstr Meta-Pakete
 
+#. Tag: field::meteorology, short desc
+#: files/debtags/vocabulary
+#, fuzzy
+#| msgid Geology
+msgid Meteorology
+msgstr Geologie
+
 #. Tag: sound::mixer, short desc
 #: files/debtags/vocabulary
 msgid Mixing
@@ -3599,13 +3612,13 @@ msgid 
 Link: http://en.wikipedia.org/wiki/Line_Printer_Daemon_protocol Link: http://;
 www.ietf.org/rfc/rfc1179.txt
 msgstr 
-Das »Line Printer Daemon«-Protokoll dient dem Zugriff oder der Bereitstellung 

-von Netzdruckdiensten in einem Unix-Netz, kann aber auch für lokale 
-Installationen verwandt werden.\n
+Das »Line Printer Daemon«-Protokoll dient dem Zugriff oder der 
+Bereitstellung von Netzdruckdiensten in einem Unix-Netz, kann aber auch für 
+lokale Installationen verwandt werden.\n
 CUPS, das »Common Unix Printing System«, wurde als Ersatz für das alte LPD-/
 LPR-System unter Beibehaltung der Rückwärtskompatibilität entwickelt.\n
-Link: http://de.wikipedia.org/wiki/Berkeley_Printing_System Link: http://;
-www.ietf.org/rfc/rfc1179.txt
+Link: http://de.wikipedia.org/wiki/Berkeley_Printing_System Link: http://www.;
+ietf.org/rfc/rfc1179.txt
 
 #. Tag: protocol::msn-messenger, long desc
 #: files/debtags/vocabulary
@@ -3863,9 +3876,10 @@ msgid 
 msgstr 
 »Trivial File Transfer Protocol«, ein einfaches Dateiübertragungsprotokoll. 
 TFTP erlaubt es Clients, eine Datei von einem Rechner in der Ferne abzuholen 
-oder dort abzulegen. Eines der Haupteinsatzzwecke ist das Booten von Rechnern 

-ohne Festplatten über Netz in einem »Local Area Network« (lokalen Netz). 
-Entwicklungsziel war die einfache Implementierung, so dass es ins ROM 
passt.\n
+oder dort abzulegen. Eines der Haupteinsatzzwecke ist das Booten von 
+Rechnern ohne Festplatten über Netz in einem »Local Area Network« (lokalen 
+Netz). Entwicklungsziel war die einfache Implementierung, so dass es ins ROM 
+passt.\n
 Link: http://de.wikipedia.org/wiki/Trivial_File_Transfer_Protocol Link: 
 http://www.ietf.org/rfc/rfc1350.txt;
 
@@ -3940,8 +3954,8 @@ msgid 
 Link: http://en.wikipedia.org/wiki/User_Datagram_Protocol Link: http://www.;
 ietf.org/rfc/rfc768.txt
 msgstr 
-»User Datagram Protocol«, ein Kernprotokoll der Internet-Protokoll-Suite wird 

-für den Datentransport eingesetzt.\n
+»User Datagram Protocol«, ein Kernprotokoll der Internet-Protokoll-Suite 
+wird für den Datentransport eingesetzt.\n
 UDP ist nicht so zuverlässig wie TCP, aber schneller und daher für 
 zeitkritische Zwecke wie das DNS-Protokoll oder VoIP besser geeignet.\n
 Link: http://de.wikipedia.org/wiki/User_Datagram_Protocol Link: http://www.;
@@ -4112,8 +4126,8 @@ msgstr World Wide Web
 
 #. Tag: x11::xserver, short desc
 #: files/debtags/vocabulary
-msgid X Server
-msgstr X-Server
+msgid X Server and Drivers
+msgstr 
 
 #. Tag: interface::x11, short desc
 #. Facet: x11, short desc
@@ -4195,9 +4209,9 @@ msgid 
 * DNS-SD for service discovery\n
 Link: http://www.zeroconf.org Link: http://en.wikipedia.org/wiki/Zeroconf;
 msgstr 
-»Zero Configuration Networking« (Zeroconfig) ist eine Sammlung von Techniken, 

-die automatisch ein benutzbares IP-Netz ohne Konfiguration oder spezielle 
-Server erstellt.\n
+»Zero Configuration Networking« (Zeroconfig) ist eine Sammlung von 
+Techniken, die automatisch ein benutzbares IP-Netz ohne Konfiguration oder 
+spezielle Server erstellt.\n
 Diese Markierung wird für Pakete verwandt, die eines oder mehrere der 
 folgenden Punkte implementieren:\n
 * IPv4LL zur Adressauswahl\n
@@ -4240,29 +4254,32 @@ msgstr wxWidgets
 msgid xDSL Modem
 msgstr xDSL-Modem
 
-#~ msgid Source code
-#~ msgstr Quellcode
+#~ msgid 
+#~ Direct Client to Client protocol used by Internet Relay Chat clients.
+#~ msgstr 
+#~ Direktes Client-zu-Client-Protokoll, verwendet von Clients für Internet 
+#~ Relay Chat

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-624-gd2c37ad

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit d2c37ad5a233f2026d3309905f6715ec672be45b
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Jun 7 21:21:26 2009 +0200

Add AVR32 from debian-ports.org

Requested by Bradley Smith in Bug#528099

diff --git a/bin/parse-contents b/bin/parse-contents
index a72bb71..11d076f 100755
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -142,7 +142,7 @@ for my $suite (@suites) {
 
activate($filelist_db);
#FIXME: hardcoded archs. (debports has no contrib/non-free)
-   if ($arch ne 'm68k') {
+   if ($arch ne 'avr32' and $arch ne 'm68k') {
system(ln, -sf, basename($filelist_db),
   $DBDIR/filelists_${suite}_all.db) == 0
   or die Oops;
diff --git a/config.sh.sed.in b/config.sh.sed.in
index f9c1b07..6cdfa0c 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -48,11 +48,11 @@ parts=$sections
 suites=etch etch-m68k etch-volatile etch-backports lenny lenny-volatile 
lenny-backports squeeze sid experimental
 priorities=required important standard optional extra
 dists=$suites
-architectures=alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
+architectures=alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 
kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
 arch_etch=alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
 arch_lenny=${arch_etch} armel
 arch_squeeze=alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc
-arch_sid=${arch_squeeze} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
+arch_sid=${arch_squeeze} avr32 hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
 arch_experimental=${arch_sid}
 arch_lenny_proposed_updates=${arch_lenny}
 arch_etch_proposed_updates=${arch_etch}
diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
index 16dae22..a45a144 100755
--- a/cron.d/100syncarchive_debports
+++ b/cron.d/100syncarchive_debports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # Main archive
 #
-architectures=m68k
+architectures=avr32 m68k
 
 for dist in sid experimental
   do
diff --git a/static/index.tmpl b/static/index.tmpl
index 136f89e..524dff3 100644
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -11,7 +11,7 @@
lenny = '5.0' }
 current_release = 'lenny'
 all_sections = [ 'main', 'contrib', 'non-free' ]
-all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'hppa', 'i386',
+all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'avr32', 'hppa', 
'i386',
  'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips',
  'mipsel', 'm68k', 'powerpc', 's390', 'sparc' ]
 -%]
diff --git a/templates/config/architectures.tmpl 
b/templates/config/architectures.tmpl
index 41434a3..8d52739 100644
--- a/templates/config/architectures.tmpl
+++ b/templates/config/architectures.tmpl
@@ -17,6 +17,7 @@ architectures = {
armel   = g('EABI ARM'),
kfreebsd-i386 = g('GNU/kFreeBSD (i386)'),
kfreebsd-amd64 = g('GNU/kFreeBSD (amd64)'),
+   avr32   = g('AVR32'),
 }
 
 %]
diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index b161ed6..7c852e9 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -160,6 +160,10 @@ mirrors = {
title = g('ports of packages to architectures not yet or not 
anymore available in Debian'),
mirror_list = 'http://wiki.debian.org/DebianPorts/Mirrors',
unofficial_port = {
+   avr32 = {
+   url = 'http://avr32.debian.net/',
+   name = 'AVR32',
+   },
m68k = {
url_name = 'm68k',
name = 'M68K',

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-718-g9a482e5

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 9a482e584a6b5337a90385ad1d54ae3190330dce
Merge: dbd8e7af8c0979c550562a609bd2f7e98c449902 
d2c37ad5a233f2026d3309905f6715ec672be45b
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Jun 7 21:54:31 2009 +0200

Merge branch 'master' into debian-master

diff --combined config.sh.sed.in
index b85a83b,6cdfa0c..860f7e1
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
 -#localdir=/org/ftp.debian.org/debian
 +localdir=/srv/mirrors/ftp.debian.org
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -48,11 -48,11 +48,11 @@@ parts=$sections
  suites=etch etch-m68k etch-volatile etch-backports lenny lenny-volatile 
lenny-backports squeeze sid experimental
  priorities=required important standard optional extra
  dists=$suites
- architectures=alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
+ architectures=alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 
kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
  arch_etch=alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
  arch_lenny=${arch_etch} armel
  arch_squeeze=alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc
- arch_sid=${arch_squeeze} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
+ arch_sid=${arch_squeeze} avr32 hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
  arch_experimental=${arch_sid}
  arch_lenny_proposed_updates=${arch_lenny}
  arch_etch_proposed_updates=${arch_etch}

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-717-g0a408bc

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 0a408bcfa254712cd4f4ed0bd19bc24d412a6eb6
Merge: a3a30de1bd4be8a1812a7f74df5990da26008446 
d2c37ad5a233f2026d3309905f6715ec672be45b
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Jun 7 21:56:42 2009 +0200

Merge branch 'master' into ubuntu-master

Conflicts:
config.sh.sed.in
cron.d/100syncarchive_debports
static/index.tmpl
templates/config/mirrors.tmpl

diff --combined bin/parse-contents
index 26f7151,11d076f..ac88420
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@@ -85,11 -85,9 +85,11 @@@ for my $suite (@suites) 
  
open CONT, zcat $filename|$what
or die $!;
 -  while (CONT) { last if /^FILE/mo; }
 -  if (eof(CONT)) { # no header found
 +  my $header_found = 0;
 +  while (CONT) { /^FILE/mo  do { $header_found = 1; last };}
 +  if (eof(CONT)) { # no header found or only header found
close CONT; # explicit close to reset $.
 +  next if $header_found;
open CONT, zcat $filename|$what;
}
while (CONT) {
@@@ -144,7 -142,7 +144,7 @@@
  
activate($filelist_db);
#FIXME: hardcoded archs. (debports has no contrib/non-free)
-   if ($arch ne 'm68k') {
+   if ($arch ne 'avr32' and $arch ne 'm68k') {
system(ln, -sf, basename($filelist_db),
   $DBDIR/filelists_${suite}_all.db) == 0
   or die Oops;

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-706-ga3a30de

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit a3a30de1bd4be8a1812a7f74df5990da26008446
Author: Frank Lichtenheld dj...@debian.org
Date:   Fri Apr 24 23:01:28 2009 +0200

[UBUNTU] Jaunty Release

Reflect jaunty release, add karmic, remove gutsy.

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 36e2452..b82322d 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -42,16 +42,13 @@ ddtplangs=be ca cs da de en-gb eo es et eu fi fr gl hu id 
it ja ka km ko lt ml
 archives=us security
 sections=main multiverse restricted universe
 parts=$sections
-suites=dapper dapper-updates dapper-backports gutsy gutsy-updates 
gutsy-backports hardy hardy-updates hardy-backports intrepid intrepid-updates 
intrepid-backports jaunty
+suites=dapper dapper-updates dapper-backports hardy hardy-updates 
hardy-backports intrepid intrepid-updates intrepid-backports jaunty 
jaunty-updates jaunty-backports karmic
 dists=$suites
 priorities=required important standard optional extra
 architectures=i386 amd64 powerpc
 arch_dapper=i386 amd64 powerpc
 arch_dapper_updates=${arch_dapper}
 arch_dapper_backports=${arch_dapper}
-arch_gutsy=${arch_dapper}
-arch_gutsy_updates=${arch_gutsy}
-arch_gutsy_backports=${arch_gutsy}
 arch_hardy=i386 amd64
 arch_hardy_updates=${arch_hardy}
 arch_hardy_backports=${arch_hardy}
@@ -61,6 +58,9 @@ arch_intrepid_backports=${arch_intrepid}
 arch_jaunty=${arch_intrepid}
 arch_jaunty_updates=${arch_jaunty}
 arch_jaunty_backports=${arch_jaunty}
+arch_karmic=${arch_jaunty}
+arch_karmic_updates=${arch_karmic}
+arch_karmic_backports=${arch_karmic}
 
 # Miscellaneous
 #
diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm
index 774c9b5..62aa0b8 100644
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@ -174,7 +174,8 @@ our @SUITES_SORT = qw(  woody
testing testing-proposed-updates
squeeze
sid unstable experimental
-   warty hoary breezy dapper edgy feisty gutsy hardy 
intrepid jaunty);
+   warty hoary breezy dapper edgy feisty gutsy hardy
+   intrepid jaunty karmic);
 our @ARCHIVE_SORT = qw( non-US security updates volatile backports );
 our @PRIORITY_SORT = qw( required important standard optional extra );
 my $i = 1000;
diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index fc238a7..7096417 100644
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -33,7 +33,7 @@ sub do_search_contents {
 #FIXME: that's extremely hacky atm
 if ($params-{values}{suite}{no_replace}[0] eq 'default') {
$params-{values}{suite}{no_replace} =
-   $params-{values}{suite}{final} = $opts-{suite} = [ 'intrepid' ];
+   $params-{values}{suite}{final} = $opts-{suite} = [ 'jaunty' ];
 }
 
 if (@{$opts-{suite}}  1) {
diff --git a/static/index.tmpl b/static/index.tmpl
index b1e7dea..146b562 100644
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -6,15 +6,16 @@
 -%]
 [%-
 all_suites = [ 'dapper', 'dapper-updates', 'dapper-backports',
-  'gutsy', 'gutsy-updates', 'gutsy-backports',
   'hardy', 'hardy-updates', 'hardy-backports',
   'intrepid', 'intrepid-updates', 'intrepid-backports',
-  'jaunty', ]
+  'jaunty', 'jaunty-updates', 'jaunty-backports',
+  'karmic', ]
 version_numbers = { dapper = '6.06LTS',
-   gutsy  = '7.10',
hardy  = '8.04LTS',
-   intrepid = '8.10'}
-current_release = 'intrepid'
+   intrepid = '8.10',
+   jaunty = '9.04',
+ }
+current_release = 'jaunty'
 all_sections = [ 'main', 'multiverse', 'restricted', 'universe' ]
 all_architectures = [ 'i386', 'amd64', 'powerpc' ]
 -%]
@@ -132,6 +133,8 @@ Display:
 hr
 h2News/h2
 dl
+dt2009-04-24/dt
+ddReflect jaunty release, add karmic, remove gutsy/dd
 dt2009-02-21/dt
 ddRemove feisty./dd
 dt2008-11-03/dt

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-707-gdbd8e7a

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit dbd8e7af8c0979c550562a609bd2f7e98c449902
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Fri Apr 24 23:32:38 2009 +0200

Add sponsors for mirror rore.debian.org

diff --git a/static/about/sponsors.tmpl b/static/about/sponsors.tmpl
index 4edc405..312a62f 100644
--- a/static/about/sponsors.tmpl
+++ b/static/about/sponsors.tmpl
@@ -24,6 +24,12 @@ without the help of the following companies and 
organisations:/p
  tda href=http://www.hp.com/;Hewlett-Packard/a/td
  tda href=http://cs.helsinki.fi/index.en.html;University of Helsinki - 
Department of Computer Science/a/td
 /tr
+tr
+ tda 
href=http://db.debian.org/machines.cgi?host=rore;rore.debian.org/a/td
+ tdMirror/td
+ tda href=http://www.hp.com/;Hewlett-Packard/a/td
+ tda href=http://www.csail.mit.edu/;MIT Computer Science amp; Artificial 
Intelligence Lab/a/td
+/tr
 /table
 
 [% PROCESS 'html/foot.tmpl'
diff --git a/templates/config.tmpl b/templates/config.tmpl
index 05045c6..0508f16 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -62,6 +62,10 @@
url = 'http://cs.helsinki.fi/index.en.html',
name = 'University of Helsinki - Department of Computer Science',
},
+   {
+   url = 'http://www.csail.mit.edu/',
+   name = 'MIT Computer Science  Artificial Intelligence Lab',
+   },
]
 -%]
 [%-

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Re: Dealing better with CD releases

[Frank Lichtenheld]

On Wed, Apr 15, 2009 at 08:16:13PM +0200, Luk Claes wrote:
 Steve McIntyre wrote:
  On Wed, Apr 15, 2009 at 07:14:52PM +0200, Luk Claes wrote:
  Steve McIntyre wrote:
  Hi folks,
 
  At the moment we have problems when we do releases including new
  CD/DVD images, as you'll see from mailing list complaints about broken
  links each time. Simon Paillard and I had some discussion about this
  today on #debian-www and I've come up with a workflow that will
  improve things, I think (see 2c below). Please feel free to point out
  what I've missed... :-)
 
  1. The Problem
 
  We generate new CDs and DVDs for each point release. These are
  published in the release area of cdimage.debian.org[1]. The image
  filenames and the top-level directory are versioned for clarity, and
  we add a current symlink in the debian-cd directory that points to
 ^^^
  the most recent version. We move old trees of images into the archive
  area[2] as each new build is published, We then prune most of the old
  ISO images so we don't waste too much space - older images can be
  recreated in the future using jigdo if necessary.
 d. Other ideas?
  Can't we link to the 'current' images on the webpages?
  
  We do, but the image names themselves change from one release to the
  next too.
 
 Well then it should probably use an existing tag (like
 current_release_lenny which contains '5.0.1') that needs to be updated
 for the point release anyway IMHO. Someone added 3 extra tags which is
 not very maintainable IMHO.
 
 Note that it's easy to convert 5.0.1 to 501 in eperl...

In the past there were ocasionally several days between the release and
the CD image release, so you can't use the tag for the former for the
latter. Haven't checked whether that is still the case. Also using the
tag in the URL doesn't give you any advantages, you still have the same
rebuild window...

Gruesse,
-- 
Frank Lichtenheld dj...@debian.org
www: http://www.djpig.de/


-- 
To UNSUBSCRIBE, email to debian-www-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-614-gdf61162

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit b6254d3506843a78a76498be28727d4ecf2c08c5
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Apr 13 01:00:07 2009 +0200

Add some more mirrors

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index b32a900..b161ed6 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -13,20 +13,22 @@ mirrors = {
us = {
mirror_list = 'http://www.debian.org/mirror/list',
north_america = [
-#only amd64,i386   ftp.us.debian.org/debian,
+   ftp.us.debian.org/debian,
http.us.debian.org/debian,
-#only amd64,i386   ftp.debian.org/debian,
+#only amd64,i386   ftp.debian.org/debian,
+   ftp.ca.debian.org/debian,
+   ftp.mx.debian.org/debian,
ftp.egr.msu.edu/debian,
mirrors.kernel.org/debian,
-#not amd64 ftp-mirror.internap.com/pub/debian,
-#only amd64,i386   ftp.cerias.purdue.edu/pub/os/debian,
+   ftp-mirror.internap.com/pub/debian,
+#only some arches  ftp.cerias.purdue.edu/pub/os/debian,
debian.lcs.mit.edu/debian,
debian.oregonstate.edu/debian,
],
europa = [
ftp.de.debian.org/debian,
ftp.at.debian.org/debian,
-#no amd64  ftp.bg.debian.org/debian,
+   ftp.bg.debian.org/debian,
ftp.ch.debian.org/debian,
ftp.cz.debian.org/debian,
ftp.dk.debian.org/debian,
@@ -40,32 +42,49 @@ mirrors = {
ftp.is.debian.org/debian,
ftp.it.debian.org/debian,
ftp.nl.debian.org/debian,
-   ftp.no.debian.org/debian,
+#only some arches  ftp.no.debian.org/debian,
ftp.pl.debian.org/debian,
-#only amd64,i386   ftp.ru.debian.org/debian,
+   ftp.ro.debian.org/debian,
+   ftp.ru.debian.org/debian,
ftp.se.debian.org/debian,
-#only some arches  ftp.si.debian.org/debian,
+#only some arches  ftp.si.debian.org/debian,
ftp.tr.debian.org/debian,
ftp.uk.debian.org/debian,
],
south_america = [
ftp.br.debian.org/debian,
ftp.cl.debian.org/debian,
+   download.unesp.br/linux/debian,
+   sft.if.usp.br/debian,
+#not reachable debian.unesr.edu.ve/debian,
+   debian.torredehanoi.org/debian,
],
australia = [
ftp.au.debian.org/debian,
ftp.wa.au.debian.org/debian,
ftp.nz.debian.org/debian,
+   mirror.pacific.net.au/debian,
+   ftp.iinet.net.au/debian/debian,
+   mirror.optus.net/debian,
],
asia = [
ftp.jp.debian.org/debian,
ftp2.jp.debian.org/debian,
ftp.kr.debian.org/debian,
-#no amd64  ftp.hk.debian.org/debian,
+#only some arches  ftp.hk.debian.org/debian,
ftp.tw.debian.org/debian,
-#only amd64,i386   linux.csie.nctu.edu.tw/debian,
+   debian.nctu.edu.tw/debian,
debian.linux.org.tw/debian,
linux.cdpa.nsysu.edu.tw/debian,
+   ftp.nara.wide.ad.jp/debian,
+   mirrors.geekbone.org/debian,
+   ftp.yz.yamagata-u.ac.jp/debian,
+   debian.thaios.net/debian,
+   www.anheng.com.cn/debian,
+   ftp.daum.net/debian,
+   ],
+   africa = [
+   debian.mirror.ac.za/debian,
],
},
 

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-614-gdf61162

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit df6116203c901f5f4ba071535389bd57eab2ce21
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Apr 13 01:05:14 2009 +0200

Update German translation

diff --git a/po/templates.de.po b/po/templates.de.po
index 5f84f1e..f5a6842 100644
--- a/po/templates.de.po
+++ b/po/templates.de.po
@@ -133,13 +133,11 @@ msgstr 
 neuere Pakete, die an stabile Veröffentlichungen von Debian angepasst wurden
 
 #: templates/config/mirrors.tmpl:160
-#, fuzzy
-#| msgid ports of packages to architectures not yet available in Debian
 msgid 
 ports of packages to architectures not yet or not anymore available in Debian
 msgstr 
-Portierungen von Paketen auf Architekturen, die nicht in Debian verfügbar 
-sind
+Portierungen von Paketen auf Architekturen, die noch nicht oder nicht mehr in
+ Debian verfügbar sind
 
 #: templates/config/mirrors.tmpl:185
 msgid North America

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-704-ge27616d

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit e27616d54218beb6245161f3bc9d14e1d0619927
Merge: 9fd5bf0454aa8c6778fb76b173bd69ff0bf4eb0b 
df6116203c901f5f4ba071535389bd57eab2ce21
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Apr 13 01:10:53 2009 +0200

Merge commit 'alioth/master' into debian-master


-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-703-g644de1b

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 7484a3adc951c00fd18c530bb88007b5d4632808
Merge: 426806714669eb8be697d1f2c1b37e5a820e8647 
df6116203c901f5f4ba071535389bd57eab2ce21
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Apr 13 01:14:32 2009 +0200

Merge commit 'alioth/master' into ubuntu-master

Conflicts:
cron.d/100syncarchive_debports
templates/config.tmpl
templates/config/mirrors.tmpl

diff --combined bin/parse-contents
index 1f4f58d,a72bb71..26f7151
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@@ -85,11 -85,9 +85,11 @@@ for my $suite (@suites) 
  
open CONT, zcat $filename|$what
or die $!;
 -  while (CONT) { last if /^FILE/mo; }
 -  if (eof(CONT)) { # no header found
 +  my $header_found = 0;
 +  while (CONT) { /^FILE/mo  do { $header_found = 1; last };}
 +  if (eof(CONT)) { # no header found or only header found
close CONT; # explicit close to reset $.
 +  next if $header_found;
open CONT, zcat $filename|$what;
}
while (CONT) {
@@@ -144,7 -142,7 +144,7 @@@
  
activate($filelist_db);
#FIXME: hardcoded archs. (debports has no contrib/non-free)
-   if ($arch !~ m/^kfreebsd-.*$/) {
+   if ($arch ne 'm68k') {
system(ln, -sf, basename($filelist_db),
   $DBDIR/filelists_${suite}_all.db) == 0
   or die Oops;
diff --combined templates/config.tmpl
index 3526f5e,77e6db1..91731bb
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -3,61 -3,67 +3,68 @@@
 po_lang = 'en'
 ddtp_lang = 'en'
  
 -   organisation = 'Debian'
 -   project_homepage = 'http://www.debian.org/'
 +   organisation = 'Ubuntu'
 +   project_homepage = 'http://www.ubuntu.com/'
-packages_homepage = 'http://packages.ubuntu.com/'
+packages_homepage = '/'
 -   packages_homepage_abs = 'http://packages.debian.net/'
++   packages_homepage_abs = 'http://packages.ubuntu.com/'
 searchformurl = packages_homepage
 search_url = '/search'
 tags_url = 'http://debtags.alioth.debian.org/'
 bugs_url = 'http://bugs.debian.org/'
 +   launchpad_url = 'https://launchpad.net/distros/ubuntu/+source/'
 pts_url = 'http://packages.qa.debian.org/'
 ddpo_url = 'http://qa.debian.org/developer.php?login='
 src_bugs_url = bugs_url _ 'src:'
 -   mirror_url = 'http://ftp.debian.org/'
 -   security_mirror = 'security.debian.org'
 -   security_mirror_url = security_mirror _ '/debian-security'
 -   security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   mirror_url = 'http://archive.ubuntu.com/'
 +   security_mirror = 'security.ubuntu.com'
 +   security_mirror_url = security_mirror _ '/ubuntu'
 +   security_suite_suffix = '-security'
 +   changelogs_url = 'http://changelogs.ubuntu.com/changelogs/'
 policy_url = 'http://www.debian.org/doc/debian-policy/'
 -   cn_help_url = project_homepage _ 'intro/cn'
 -   patch_tracking_url = 'http://patch-tracking.debian.net/package'
 +#   cn_help_url = project_homepage _ 'intro/cn'
 +#   patch_tracking_url = 'http://patch-tracking.debian.net/package'
 logo = {
url = project_homepage,
  src = '/Pics/openlogo-nd-25.png',
  alt = organisation,
 }
 copyright = {
 -  url = 'http://www.spi-inc.org/',
 -name = 'SPI Inc.',
 -years = '1997 - ' _ timestamp.year,
 +  url = 'http://www.canonical.com/',
 +name = 'Canonical Ltd.',
 +years = timestamp.year,
 }
 license = {
 -  url = project_homepage _ 'license'
 +  url = project_homepage _ 'legal'
 }
 trademark = {
name = copyright.name,
 -  url = project_homepage _ 'trademark'
 +  url = project_homepage _ 'aboutus/trademarkpolicy'
 }
 contact = {
 -  name = g('Debian Web Mailinglist'),
 -  mail = 'debian-...@lists.debian.org',
 -url = project_homepage _ 'contact',
 +  name = 'Frank Lichtenheld',
 +  mail = 'fr...@lichtenheld.de',
 +url = project_homepage _ 'support',
 }
 admin = {
 -  name = g('%s Webmaster', organisation),
 -  mail = 'webmas...@debian.org',
 +  name = 'Frank Lichtenheld',
 +  mail = 'fr...@lichtenheld.de',
 }
 trademarknotes = g('%s is a a href=%strademark/a of %s', 
organisation, trademark.url, trademark.name)
- #   sponsor = {
- # url = 'http://example.invalid/',
- # name = 'Example Sponsor, Inc.',
- #   }
+sponsors = [
+{
+   url = 'http://example.invalid/',
+   name = 'Example Sponsor, Inc.',
+},
+{
+   url = 'http://example2.invalid/',
+   name = 'Example2 Sponsor, Inc.',
+},
+]
  -%]
  [%-
 # possible values for importance: high, normal, low
 -   sitewidemsg = { importance = high

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-703-g644de1b

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 343473c59e548d824e8b9a8d25dd37efa0261d30
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Apr 13 01:15:20 2009 +0200

[UBUNTU] Do not list any sponsors

The service is hosted by Canonical which I assume is a given.

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 91731bb..0cc7848 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -50,16 +50,16 @@
mail = 'fr...@lichtenheld.de',
}
trademarknotes = g('%s is a a href=%strademark/a of %s', 
organisation, trademark.url, trademark.name)
-   sponsors = [
-   {
-   url = 'http://example.invalid/',
-   name = 'Example Sponsor, Inc.',
-   },
-   {
-   url = 'http://example2.invalid/',
-   name = 'Example2 Sponsor, Inc.',
-   },
-   ]
+#   sponsors = [
+#   {
+#  url = 'http://example.invalid/',
+#  name = 'Example Sponsor, Inc.',
+#   },
+#   {
+#  url = 'http://example2.invalid/',
+#  name = 'Example2 Sponsor, Inc.',
+#   },
+#   ]
 -%]
 [%-
# possible values for importance: high, normal, low

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-703-g644de1b

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 644de1b27156a782a8dbc5926d00e0de482916c0
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Apr 13 01:55:09 2009 +0200

[UBUNTU] Update mirror list

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 10df62a..a37f752 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -2,107 +2,58 @@
 
 mirrors = {
us = {
-   mirror_list = 'https://wiki.ubuntu.com/Mirrors',
+   mirror_list = 'https://launchpad.net/ubuntu/+archivemirrors',
north_america = [
mirrors.kernel.org/ubuntu,
-   ftp.cs.umn.edu/pub/ubuntu,
+   ftp.osuosl.org/pub/ubuntu,
lug.mtu.edu/ubuntu,
-   mirror.clarkson.edu/pub/distributions/ubuntu,
ubuntu.mirrors.tds.net/ubuntu,
-   www.opensourcemirrors.org/ubuntu,
-   ftp.ale.org/pub/mirrors/ubuntu,
ubuntu.secs.oakland.edu,
mirror.mcs.anl.gov/pub/ubuntu,
mirrors.cat.pdx.edu/ubuntu,
ubuntu.cs.utah.edu/ubuntu,
ftp.ussg.iu.edu/linux/ubuntu,
mirrors.xmission.com/ubuntu,
-   ftp.osuosl.org/pub/ubuntu,
mirrors.cs.wmich.edu/ubuntu,
-   mirror.cpsc.ucalgary.ca/mirror/ubuntu.com,
-   mirror.arcticnetwork.ca/pub/ubuntu/packages,
gulus.USherbrooke.ca/pub/distro/ubuntu,
],
europa = [
+   cz.archive.ubuntu.com/ubuntu,
+   de.archive.ubuntu.com/ubuntu,
+   dk.archive.ubuntu.com/ubuntu,
+   es.archive.ubuntu.com/ubuntu,
fr.archive.ubuntu.com/ubuntu,
ge.archive.ubuntu.com/ubuntu,
+   gr.archive.ubuntu.com/ubuntu,
+   hr.archive.ubuntu.com/ubuntu,
+   mt.archive.ubuntu.com/ubuntu,
nl.archive.ubuntu.com/ubuntu,
no.archive.ubuntu.com/ubuntu,
+   se.archive.ubuntu.com/ubuntu,
yu.archive.ubuntu.com/ubuntu,
-   ubuntu.inode.at/ubuntu,
-   ubuntu.uni-klu.ac.at/ubuntu,
-   gd.tuwien.ac.at/opsys/linux/ubuntu/archive,
-   ftp.belnet.be/pub/mirror/ubuntu.com,
-   ubuntu.mirrors.skynet.be/pub/ubuntu.com,
-   ubuntu.ipacct.com/ubuntu,
-   ubuntu-hr.org/ubuntu,
-   archive.ubuntu.cz/ubuntu,
-   mirrors.dk.telia.net/ubuntu,
-   mirrors.dotsrc.org/ubuntu,
-   klid.dk/homeftp/ubuntu,
-   ftp.estpak.ee/pub/ubuntu,
-   www.nic.funet.fi/pub/mirrors/archive.ubuntu.com,
-   mir1.ovh.net/ubuntu,
-   ftp.u-picardie.fr/pub/ubuntu/ubuntu,
-   ftp.oleane.net/pub/ubuntu,
-   debian.charite.de/ubuntu,
-   ftp.inf.tu-dresden.de/os/linux/dists/ubuntu,
-   www.artfiles.org/ubuntu.com/archive,
-   ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages,
-   ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu,
-   www.ftp.uni-erlangen.de/pub/mirrors/ubuntu,
-   ftp.ntua.gr/pub/linux/ubuntu,
-   ftp.kfki.hu/linux/ubuntu,
-   ubuntu.odg.cc,
-   ubuntu.lhi.is,
-   ftp.esat.net/mirrors/archive.ubuntu.com,
-   ftp.heanet.ie/pub/ubuntu,
-   ftp.linux.it/ubuntu,
-   na.mirror.garr.it/mirrors/ubuntu-archive,
-   mirrors.linux.edu.lv/ftp.ubuntu.com,
-   ftp.litnet.lt/pub/ubuntu,
-   ubuntu.synssans.nl,
-   ubuntulinux.mainseek.com/ubuntu,
-   ubuntu.task.gda.pl/ubuntu,
-   darkstar.ist.utl.pt/ubuntu/archive,
-   ubuntu.dcc.fc.up.pt,
-   ftp.iasi.roedu.net/mirrors/ubuntulinux.org/ubuntu,
-   ftp.gui.uva.es/sites/ubuntu.com/ubuntu,
-   ftp.acc.umu.se/mirror/ubuntu,
-   mirror.switch.ch/ftp/mirror/ubuntu,
-   www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu,
-   ubuntu.blueyonder.co.uk/archive,
-   ubuntu.snet.uz/ubuntu,
],
south_americas = [
+   br.archive.ubuntu.com/ubuntu,
cl.archive.ubuntu.com/ubuntu,
espelhos.edugraf.ufsc.br/ubuntu,
-   ubuntu.interlegis.gov.br/archive,
ubuntu.c3sl.ufpr.br/ubuntu,
-   ftp.ucr.ac.cr/ubuntu,
-   www.computacion.uni.edu.ni/iso/ubuntu,
],
australia = [
+   nz.archive.ubuntu.com/ubuntu,
+   nz2.archive.ubuntu.com/ubuntu,
ftp.iinet.net.au/pub/ubuntu,
mirror.optus.net/ubuntu,
-   mirror.isp.net.au/ftp/pub/ubuntu,
-   www.planetmirror.com/pub/ubuntu,
ftp.filearena.net/pub/ubuntu,
mirror.pacific.net.au/linux/ubuntu,
],
asia = [
-   archive.ubuntu.org.cn/ubuntu,
-   debian.cn99.com/ubuntu,
+   kr.archive.ubuntu.com/ubuntu,
+   th.archive.ubuntu.com/ubuntu,
mirror.lupaworld.com/ubuntu,
-   komo.vlsm.org/ubuntu,
kambing.vlsm.org/ubuntu,
ubuntu.mithril-linux.org/archives,
-   ubuntu.csie.ntu.edu.tw/ubuntu,
-   mirror.letsopen.com/os/ubuntu,
-   ftp.kaist.ac.kr/pub/ubuntu,
-   apt.ubuntu.org.tw/ubuntu,
-   apt.nc.hcc.edu.tw/pub/ubuntu,
mirror.in.th/ubuntu,
+   mirror.rootguide.org/ubuntu

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-704-g6bbc6e8

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 6bbc6e862c9f705f4466ed927cfd2e320409f47a
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Apr 13 00:58:54 2009 +0100

[UBUNTU] Add link to old-releases.ubuntu.com on front-page

That's a FAQ

diff --git a/static/index.tmpl b/static/index.tmpl
index 23e220f..b1e7dea 100644
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -38,6 +38,8 @@ if you encounter any problems!/em/p
 pThere is also a list of a href=[% all_suites.-1 %]/main/newpkgpackages
 recently added to [% all_suites.-1 %]/a./p
 
+pOld releases can be found at a 
href=http://old-releases.ubuntu.com/;old-releases.ubuntu.com/a/p
+
 h2Search/h2
 
 h3Search package directories/h3

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-705-gba5be70

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit ba5be70ae27ddcb97cae5b9e5ceb9c97c06649f3
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Mon Apr 13 01:03:20 2009 +0100

[UBUNTU] Reflect new mirror numbers

Move australia to right column, since europe hasn't so much
more anymore.

diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index 2b68d38..bfb4a23 100644
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -54,7 +54,7 @@ deb http://em[% mirrors.$archive.europa.0 %]/em [% suite 
%] main [% section
   p[% g('You can download the requested file from the tt%s/tt 
subdirectory at any of these sites:',
filename.directory) %]/p
   div class=cardleft
-  [% FOREACH continent IN [ 'north_america', 'south_america', 'asia', 
'africa', 'australia' ] %]
+  [% FOREACH continent IN [ 'north_america', 'south_america', 'asia', 'africa' 
] %]
 [% IF a.$continent %]
pem[% continents.$continent %]/em/p
ul
@@ -65,7 +65,7 @@ deb http://em[% mirrors.$archive.europa.0 %]/em [% suite 
%] main [% section
 [% END %]
   [% END %]
   /divdiv class=cardright
-  [% FOREACH continent IN [ 'europa' ] %]
+  [% FOREACH continent IN [ 'europa', 'australia' ] %]
 [% IF a.$continent %]
pem[% continents.$continent %]/em/p
ul

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-705-g5f0aad7

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 5f0aad731ce4f90ad0b851a11746e9c0dbb7ee46
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Wed Apr 8 06:42:50 2009 +

apache.conf: Add new mirror carver

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 4457211..7e1b5c1 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -69,7 +69,7 @@
ServerAdmin webmas...@debian.org
DocumentRoot %TOPDIR%/www/
ServerName %SITE%
-   ServerAlias packages-piatti.debian.org packages-powell.debian.org
+   ServerAlias packages-piatti.debian.org packages-powell.debian.org 
packages-carver.debian.org
ErrorLog /var/log/apache2/%SITE%-error.log
CustomLog /var/log/apache2/%SITE%-access.log combined
 

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-610-gd92cc97

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 6219a15b9fb00f7bb89e4997a77aa99afceb6cdc
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Apr 5 16:33:26 2009 +0200

Update debtags.pot

diff --git a/po/debtags.de.po b/po/debtags.de.po
index 18d1224..4275d55 100644
--- a/po/debtags.de.po
+++ b/po/debtags.de.po
@@ -296,7 +296,7 @@ msgstr BibTeX
 msgid BibTeX list of references
 msgstr Quellangaben für BibTeX
 
-#. Tag: science::bibliogaphy, short desc
+#. Tag: science::bibliography, short desc
 #: files/debtags/vocabulary
 msgid Bibliography
 msgstr Bibliographie
@@ -4197,29 +4197,29 @@ msgstr wxWidgets
 msgid xDSL Modem
 msgstr xDSL-Modem
 
-#~ msgid 
-#~ Direct Client to Client protocol used by Internet Relay Chat clients.
-#~ msgstr 
-#~ Direktes Client-zu-Client-Protokoll, verwendet von Clients für Internet 
-#~ Relay Chat
-
-#~ msgid File Transfer
-#~ msgstr Datei-Übertragung
+#~ msgid Source code
+#~ msgstr Quellcode
 
-#~ msgid File Transfer Protocol
-#~ msgstr File Transfer Protocol
+#~ msgid Windows file and printer sharing (SMB)
+#~ msgstr Datei- und Druckerfreigabe von Windows (SMB)
 
-#~ msgid HyperText Transfer Protocol
-#~ msgstr HyperText Transfer Protocol
+#~ msgid Secure File Transfer Protocol
+#~ msgstr Secure File Transfer Protocol
 
 #~ msgid SMB and CIFS
 #~ msgstr SMB und CIFS
 
-#~ msgid Secure File Transfer Protocol
-#~ msgstr Secure File Transfer Protocol
+#~ msgid HyperText Transfer Protocol
+#~ msgstr HyperText Transfer Protocol
 
-#~ msgid Windows file and printer sharing (SMB)
-#~ msgstr Datei- und Druckerfreigabe von Windows (SMB)
+#~ msgid File Transfer Protocol
+#~ msgstr File Transfer Protocol
 
-#~ msgid Source code
-#~ msgstr Quellcode
+#~ msgid File Transfer
+#~ msgstr Datei-Übertragung
+
+#~ msgid 
+#~ Direct Client to Client protocol used by Internet Relay Chat clients.
+#~ msgstr 
+#~ Direktes Client-zu-Client-Protokoll, verwendet von Clients für Internet 
+#~ Relay Chat
diff --git a/po/debtags.fi.po b/po/debtags.fi.po
index aa48fe0..0682813 100644
--- a/po/debtags.fi.po
+++ b/po/debtags.fi.po
@@ -277,7 +277,7 @@ msgstr 
 msgid BibTeX list of references
 msgstr 
 
-#. Tag: science::bibliogaphy, short desc
+#. Tag: science::bibliography, short desc
 #: files/debtags/vocabulary
 msgid Bibliography
 msgstr 
diff --git a/po/debtags.fr.po b/po/debtags.fr.po
index 6751f99..47a9cb3 100644
--- a/po/debtags.fr.po
+++ b/po/debtags.fr.po
@@ -270,7 +270,7 @@ msgstr 
 msgid BibTeX list of references
 msgstr 
 
-#. Tag: science::bibliogaphy, short desc
+#. Tag: science::bibliography, short desc
 #: files/debtags/vocabulary
 msgid Bibliography
 msgstr 
diff --git a/po/debtags.hu.po b/po/debtags.hu.po
index 6751f99..47a9cb3 100644
--- a/po/debtags.hu.po
+++ b/po/debtags.hu.po
@@ -270,7 +270,7 @@ msgstr 
 msgid BibTeX list of references
 msgstr 
 
-#. Tag: science::bibliogaphy, short desc
+#. Tag: science::bibliography, short desc
 #: files/debtags/vocabulary
 msgid Bibliography
 msgstr 
diff --git a/po/debtags.ja.po b/po/debtags.ja.po
index 0ccdfc7..627d61d 100644
--- a/po/debtags.ja.po
+++ b/po/debtags.ja.po
@@ -295,7 +295,7 @@ msgstr BibTeX
 msgid BibTeX list of references
 msgstr BibTeX 参考文献リスト
 
-#. Tag: science::bibliogaphy, short desc
+#. Tag: science::bibliography, short desc
 #: files/debtags/vocabulary
 msgid Bibliography
 msgstr 文献目録
@@ -4055,51 +4055,51 @@ msgstr wxWidgets
 msgid xDSL Modem
 msgstr xDSL モデム
 
-#~ msgid 
-#~ Direct Client to Client protocol used by Internet Relay Chat clients.
-#~ msgstr 
-#~ インターネット・リレー・チャット (IRC) クライアントが使用する Direct 
-#~ Client-to-Client プロトコル。
+#~ msgid Audrio
+#~ msgstr 音声
 
-#~ msgid File Transfer
-#~ msgstr ファイル転送
+#~ msgid ZOPE
+#~ msgstr Zope
 
-#~ msgid File Transfer Protocol
-#~ msgstr ファイル転送プロトコル (File Transfer Protocol)
+# TRANSLATION-FIXME: Why Windowing?
+#~ msgid X Windowing System
+#~ msgstr X ウィンドウシステム
 
-#~ msgid HyperText Transfer Protocol
-#~ msgstr ハイパーテキスト転送プロトコル (HyperText Transfer Protocol)
+#~ msgid SAMBA
+#~ msgstr Samba
 
-#~ msgid SMB and CIFS
-#~ msgstr SMB や CIFS
+#~ msgid GNUStep
+#~ msgstr GNUstep
 
-#~ msgid Secure File Transfer Protocol
-#~ msgstr Secure File Transfer Protocol
+#~ msgid TK
+#~ msgstr TK
 
-#~ msgid Windows file and printer sharing (SMB)
-#~ msgstr Windows ファイル・プリンタ共有 (SMB)
+#~ msgid Source code
+#~ msgstr ソースコード
 
 #~ msgid QT
 #~ msgstr QT
 
-#~ msgid Source code
-#~ msgstr ソースコード
+#~ msgid Windows file and printer sharing (SMB)
+#~ msgstr Windows ファイル・プリンタ共有 (SMB)
 
-#~ msgid TK
-#~ msgstr TK
+#~ msgid Secure File Transfer Protocol
+#~ msgstr Secure File Transfer Protocol
 
-#~ msgid GNUStep
-#~ msgstr GNUstep
+#~ msgid SMB and CIFS
+#~ msgstr SMB や CIFS
 
-#~ msgid SAMBA
-#~ msgstr Samba
+#~ msgid HyperText Transfer Protocol
+#~ msgstr ハイパーテキスト転送プロトコル (HyperText Transfer Protocol)
 
-# TRANSLATION-FIXME: Why Windowing?
-#~ msgid X Windowing System
-#~ msgstr X ウィンドウシステム
+#~ msgid File Transfer Protocol
+#~ msgstr ファイル転送プロトコル (File Transfer Protocol

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-610-gd92cc97

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 24c23c4eebaf4fa86fd27f1c65fa3f220ce30059
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Apr 5 16:37:12 2009 +0200

kfreebsd moves to main archive

While on it, reflect the fact that m68k is from debports in some
places where this was missing.

diff --git a/README b/README
index 944fc32..14d8bfb 100644
--- a/README
+++ b/README
@@ -44,8 +44,7 @@ Cron
 050checkinst   -- check if all needed packages are installed
 100syncarchive -- retrieve data from main Debian archive
 100syncarchive_backports   -- retrieve data from backports.org
-100syncarchive_debports-- retrieve data from debian-ports.org
-  (kfreebsd-*, armel)
+100syncarchive_debports-- retrieve data from debian-ports.org (m68k)
 100syncarchive_installer   -- retrieve d-i data
 100syncarchive_m68k-- retrieve data for etch-m68k
 100syncarchive_maintainers -- retrieve maintainer index
diff --git a/bin/parse-contents b/bin/parse-contents
index 82df0b8..a72bb71 100755
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -142,7 +142,7 @@ for my $suite (@suites) {
 
activate($filelist_db);
#FIXME: hardcoded archs. (debports has no contrib/non-free)
-   if ($arch !~ m/^kfreebsd-.*$/) {
+   if ($arch ne 'm68k') {
system(ln, -sf, basename($filelist_db),
   $DBDIR/filelists_${suite}_all.db) == 0
   or die Oops;
diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 02750b0..d8b9f79 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -21,8 +21,6 @@ then
foo=\$arch_${dist//-/_}
for arch in `eval echo $foo`
do
-   test ! $arch = kfreebsd-i386 || continue
-   test ! $arch = kfreebsd-amd64 || continue
for part in ${parts}
do
echo retrieve Packages $dist/$part/$arch
@@ -57,8 +55,6 @@ else
foo=\$arch_${dist//-/_}
for arch in `eval echo $foo`
do
-   test ! $arch = kfreebsd-i386 || continue
-   test ! $arch = kfreebsd-amd64 || continue
for part in ${parts}
do
echo retrieve Packages $dist/$part/$arch
diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
index c16f4c9..16dae22 100755
--- a/cron.d/100syncarchive_debports
+++ b/cron.d/100syncarchive_debports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # Main archive
 #
-architectures=kfreebsd-i386 kfreebsd-amd64 m68k
+architectures=m68k
 
 for dist in sid experimental
   do
diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index a30d811..f68562c 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -138,16 +138,12 @@ mirrors = {
},
 
debports = {
-   title = g('ports of packages to architectures not yet 
available in Debian'),
+   title = g('ports of packages to architectures not yet or not 
anymore available in Debian'),
mirror_list = 'http://wiki.debian.org/DebianPorts/Mirrors',
unofficial_port = {
-   'kfreebsd-amd64' = {
-   url_name = 'kfreebsd-gnu',
-   name = 'GNU/kFreeBSD',
-   },
-   'kfreebsd-i386' = {
-   url_name = 'kfreebsd-gnu',
-   name = 'GNU/kFreeBSD',
+   m68k = {
+   url_name = 'm68k',
+   name = 'M68K',
},
},
north_america = [
diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index 97ef81e..01dd76a 100644
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -94,7 +94,7 @@ deb http://em[% mirrors.$archive.europa.0 %]/em [% suite 
%] main [% section
 [% IF port.url_name;
SET port.url = ports_url _ port.url_name _ '/';
END -%]
-p style=clear:both[% g('Note that %s is not officially included in the %s 
archive yet, but the %s porter group keeps their archive in sync with the 
official archive as close as possible. See the a href=%s%s ports page/a 
for current information.',
+p style=clear:both[% g('Note that %s is not officially included in the %s 
archive, but the %s porter group keeps their archive in sync with the official 
archive as close as possible. See the a href=%s%s ports page/a for 
current information.',
port.name, organisation, port.name, port.url, port.name) %]/p
 [% END %]
 

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-610-gd92cc97

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit d92cc97e9bc6555a0a39bfa12df32e1a61f1c3f3
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Apr 5 21:56:30 2009 +0200

Update list of debian-ports mirrors

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index f68562c..b32a900 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -148,13 +148,14 @@ mirrors = {
},
north_america = [
www.gtlib.gatech.edu/pub/gnuab/debian,
-   www.superunprivileged.org/debian,
],
europa = [
ftp.debian-ports.org/debian,
ftp.de.debian.org/debian-ports,
ftp.ch.debian.org/debian-ports,
-   ftp.easynet.be/ftp/gnuab/debian,
+   ],
+   asia = [
+   debian.nctu.edu.tw/debian-ports,
],
},
 }

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-699-g9fd5bf0

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 354ed5f98d637371951dd51298e0b104166c1226
Merge: 1ac63b1ac6c696a8dd9f66af1dd91219e153fe3f 
56af0d0d5ab185d52da218f7405632ef5ade9f12
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Tue Feb 17 21:02:29 2009 +

Merge commit 'alioth/master' into debian-master

diff --combined config.sh.sed.in
index b6709c1,f9c1b07..b85a83b
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
 -#localdir=/org/ftp.debian.org/debian
 +localdir=/srv/mirrors/ftp.debian.org
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -51,7 -51,7 +51,7 @@@ dists=$suites
  architectures=alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
  arch_etch=alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
  arch_lenny=${arch_etch} armel
- arch_squeeze=${arch_lenny}
+ arch_squeeze=alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc
  arch_sid=${arch_squeeze} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
  arch_experimental=${arch_sid}
  arch_lenny_proposed_updates=${arch_lenny}

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-699-g9fd5bf0

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 6abb0b5124727c50d2df26e6cdd7899b66ae8aff
Merge: 354ed5f98d637371951dd51298e0b104166c1226 
593370791356c703ea99794487f5b9da68a61a56
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Fri Feb 20 19:56:44 2009 +

Merge commit 'alioth/master' into debian-master


-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-699-g9fd5bf0

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 3587f9f654891f5558d701f141b9de91f0264cb2
Merge: 6abb0b5124727c50d2df26e6cdd7899b66ae8aff 
a895768f651623ee82f7e664f28801b552f45c38
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Mar 15 18:54:58 2009 +

Merge commit 'alioth/debian-master' into debian-master


-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-699-g9fd5bf0

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 9fd5bf0454aa8c6778fb76b173bd69ff0bf4eb0b
Merge: 3587f9f654891f5558d701f141b9de91f0264cb2 
d92cc97e9bc6555a0a39bfa12df32e1a61f1c3f3
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Apr 5 21:33:19 2009 +

Merge commit 'alioth/master' into debian-master


-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-605-g48ae84f

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 4543b43a4cfec4d953edd41570bfbad31f490791
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Mar 15 18:15:10 2009 +0100

Update sections list

diff --git a/lib/Packages/Sections.pm b/lib/Packages/Sections.pm
index a586c17..580f7b1 100644
--- a/lib/Packages/Sections.pm
+++ b/lib/Packages/Sections.pm
@@ -9,76 +9,114 @@ our @ISA = qw( Exporter );
 our @EXPORT = qw( %sections_descs );
 
 our %sections_descs = (
- admin = [ N_(Administration Utilities),
-N_(Utilities to administer system 
resources, manage user accounts, etc.) ],
- base  = [ N_(Base Utilities),
-N_(Basic needed utilities of 
every Debian system.) ],
- comm  = [ N_(Communication Programs),
-N_(Software to use your modem in 
the old fashioned style.) ],
- devel = [ N_(Development),
-N_(Development utilities, 
compilers, development environments, libraries, etc.) ],
- doc   = [ N_(Documentation),
-N_(FAQs, HOWTOs and other 
documents trying to explain everything related to Debian, and software needed 
to browse documentation (man, info, etc).) ],
+ admin = [ N_(Administration Utilities),
+N_(Utilities to administer system 
resources, manage user accounts, etc.) ],
+ base  = [ N_(Base Utilities),
+N_(Basic needed utilities of every Debian 
system.) ],
+ 'cli-mono'= [ N_(Mono/CLI),
+N_(Everything about Mono and the Common 
Language Infrastructure.) ],
+ comm  = [ N_(Communication Programs),
+N_(Software to use your modem in the old 
fashioned style.) ],
+ database  = [ N_(Databases),
+N_(Database Servers and Clients.) ],
+ debug = [ N_(Debug packages),
+N_(Packages providing debugging 
information for executables and shared libraries.) ],
+ devel = [ N_(Development),
+N_(Development utilities, compilers, 
development environments, libraries, etc.) ],
+ doc   = [ N_(Documentation),
+N_(FAQs, HOWTOs and other documents 
trying to explain everything related to Debian, and software needed to browse 
documentation (man, info, etc).) ],
  editors   = [ N_(Editors),
 N_(Software to edit files. Programming 
environments.) ],
  electronics   = [ N_(Electronics),
 N_(Electronics utilities.) ],
  embedded  = [ N_(Embedded software),
-N_(Software suitable for use in 
embedded applications.) ],
- games = [ N_(Games),
-N_(Programs to spend a nice time 
with after all this setting up.) ],
- gnome = [ N_(GNOME),
-N_(The GNOME desktop environment, 
a powerful, easy to use set of integrated applications.) ],
+N_(Software suitable for use in embedded 
applications.) ],
+ games = [ N_(Games),
+N_(Programs to spend a nice time with 
after all this setting up.) ],
+ gnome = [ N_(GNOME),
+N_(The GNOME desktop environment, a 
powerful, easy to use set of integrated applications.) ],
+ 'gnu-r'   = [ N_(GNU R),
+N_(Everything about GNU R, a statistical 
computation and graphics system.) ],
+ gnustep   = [ N_(GNUstep),
+N_(The GNUstep environment.) ],
  graphics  = [ N_(Graphics),
-N_(Editors, viewers, 
converters... Everything to become an artist.) ],
+N_(Editors, viewers, converters... 
Everything to become an artist.) ],
  hamradio  = [ N_(Ham Radio),
-N_(Software for ham radio.) ],
+N_(Software for ham radio.) ],
+ fonts = [ N_(Fonts),
+N_(Font packages.) ],
+ haskell   = [ N_(Haskell

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-605-g48ae84f

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit f41bb0f6d97cb0d00c627e79d42128ccd661c625
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Mar 15 18:49:15 2009 +0100

Deb::Versions: Really only use AptPkg if available

diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm
index 35f0cb5..774c9b5 100644
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@ -70,22 +70,6 @@ our @EXPORT = qw( version_cmp version_sort suites_cmp 
suites_sort );
 
 our $VERSION = v1.0.0;
 
-BEGIN {
-eval {
-   use AptPkg::Config '$_config';
-   use AptPkg::System '$_system';
-   use AptPkg::Version;
-
-   $_config-init;
-   $_system = $_config-system;
-   my $apt_ver = $_system-versioning;
-   *version_cmp = sub { return $apt_ver-compare(@_) };
-};
-unless( *version_cmp ){
-   *version_cmp = \version_cmp_pp;
-}
-}
-
 my $re = qr/^(?:(\d+):)?([\w.+:~-]+?)(?:-([\w+.~]+))?$/;
 sub version_cmp_pp {
 return 0 if $_[0] eq $_[1];
@@ -119,6 +103,18 @@ sub version_cmp_pp {
 return $res;
 }
 
+*version_cmp = \version_cmp_pp;
+eval {
+require AptPkg::Config;
+require AptPkg::System;
+require AptPkg::Version;
+
+$AptPkg::Config::_config-init;
+$AptPkg::System::_system = $AptPkg::Config::_config-system;
+my $apt_ver = $AptPkg::System::_system-versioning;
+*version_cmp = sub { return $apt_ver-compare(@_) };
+};
+
 sub version_sort {
 return sort { version_cmp( $b, $a ) } @_;
 }

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-605-g48ae84f

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 48ae84fffa8366d17383bb1615b989510d988563
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Mar 15 18:53:25 2009 +0100

templates.de.po: Unfuzzy the updated string

diff --git a/po/templates.de.po b/po/templates.de.po
index 4b03db0..7ce39f7 100644
--- a/po/templates.de.po
+++ b/po/templates.de.po
@@ -372,10 +372,8 @@ msgid Learn more about this site
 msgstr Mehr Informationen über diese Site
 
 #: templates/html/foot.tmpl:41
-#, fuzzy
-#| msgid Hosting provided by a href=\%s\%s/a.
 msgid This service is sponsored by a href=\%s\%s/a.
-msgstr Das Hosting wurde bereitgestellt von a href=\%s\%s/a.
+msgstr Dieser Service wird unterstützt von a href=\%s\%s/a.
 
 #: templates/html/head.tmpl:47
 msgid Search

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-606-gd4847b8

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit d4847b84cec9655e66d5faf9e9078c86bec11ecd
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Mar 15 19:44:43 2009 +0100

templates: define packages_homepage and packages_homepage_abs

We don't want to hardcode the full URL everywhere so that you
can use the mirrors directly (e.g. packages-piatti.debian.org),
but we need the full URL at other places (e.g. in the RSS feeds).

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 132db62..77e6db1 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -5,7 +5,8 @@
 
organisation = 'Debian'
project_homepage = 'http://www.debian.org/'
-   packages_homepage = 'http://packages.debian.net/'
+   packages_homepage = '/'
+   packages_homepage_abs = 'http://packages.debian.net/'
searchformurl = packages_homepage
search_url = '/search'
tags_url = 'http://debtags.alioth.debian.org/'
diff --git a/templates/rfc822/search.tmpl b/templates/rfc822/search.tmpl
index 955bf45..a0b4bad 100644
--- a/templates/rfc822/search.tmpl
+++ b/templates/rfc822/search.tmpl
@@ -3,7 +3,7 @@
   [%- FOREACH s IN suites -%]
 [%- FOREACH s.versions %]
 Package: [% pkg %]
-Url: [% packages_homepage _ 
make_url(pkg,'','suite',s.suite,'arch','','section','','format','') %]
+Url: [% packages_homepage_abs _ 
make_url(pkg,'','suite',s.suite,'arch','','section','','format','') %]
 Archive: [% archive %]
 Suite: [% s.suite %]
 Section: [% s.section %]
@@ -22,7 +22,7 @@ Provided-by: [% s.providers.join(', ') %]
   [%- FOREACH origins -%]
  [%- origin = (archive == main_archive) ? suite : $suite/$archive %]
 Package: [% pkg %]
-Url: [% packages_homepage _ 
make_url(pkg,'','source','source','suite',origin,'section','','arch','','format','')
 %]
+Url: [% packages_homepage_abs _ 
make_url(pkg,'','source','source','suite',origin,'section','','arch','','format','')
 %]
 [%- \nArchive: $real_archive IF real_archive %]
 [%- \nSection: $section IF section %]
 Subsection: [% subsection %]
diff --git a/templates/rss/newpkg.tmpl b/templates/rss/newpkg.tmpl
index 378cca3..90533ba 100644
--- a/templates/rss/newpkg.tmpl
+++ b/templates/rss/newpkg.tmpl
@@ -9,7 +9,7 @@
  xmlns:admin=http://webns.net/mvcb/;
 
 
-[%- root_url = $packages_homepage$suite/;
+[%- root_url = $packages_homepage_abs$suite/;
 SET root_url = $root_url$section/ IF section -%]
 
 channel rdf:about=[% root_url %]newpkg

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-691-ga895768

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 1fbeeb0e19b44543525a8a36e7d5a1b5d386c4ec
Merge: 6c216987d1e3085640d6ce511b35d68ea5adc84f 
d4847b84cec9655e66d5faf9e9078c86bec11ecd
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Mar 15 19:49:58 2009 +0100

Merge commit 'alioth/master' into debian-master

Conflicts:
templates/config.tmpl

diff --combined config.sh.sed.in
index b6709c1,f9c1b07..b85a83b
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
 -#localdir=/org/ftp.debian.org/debian
 +localdir=/srv/mirrors/ftp.debian.org
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -51,7 -51,7 +51,7 @@@ dists=$suites
  architectures=alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
  arch_etch=alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
  arch_lenny=${arch_etch} armel
- arch_squeeze=${arch_lenny}
+ arch_squeeze=alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc
  arch_sid=${arch_squeeze} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
  arch_experimental=${arch_sid}
  arch_lenny_proposed_updates=${arch_lenny}
diff --combined templates/config.tmpl
index 68531a8,77e6db1..b1ae799
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -5,7 -5,8 +5,8 @@@
  
 organisation = 'Debian'
 project_homepage = 'http://www.debian.org/'
-packages_homepage = 'http://packages.debian.org/'
+packages_homepage = '/'
 -   packages_homepage_abs = 'http://packages.debian.net/'
++   packages_homepage_abs = 'http://packages.debian.org/'
 searchformurl = packages_homepage
 search_url = '/search'
 tags_url = 'http://debtags.alioth.debian.org/'
@@@ -17,7 -18,7 +18,7 @@@
 security_mirror = 'security.debian.org'
 security_mirror_url = security_mirror _ '/debian-security'
 security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   changelogs_url = '/changelogs/'
 policy_url = 'http://www.debian.org/doc/debian-policy/'
 cn_help_url = project_homepage _ 'intro/cn'
 patch_tracking_url = 'http://patch-tracking.debian.net/package'
@@@ -48,16 -49,21 +49,18 @@@
mail = 'webmas...@debian.org',
 }
 trademarknotes = g('%s is a a href=%strademark/a of %s', 
organisation, trademark.url, trademark.name)
-sponsor = {
+sponsors = [
+{
 -  url = 'http://example.invalid/',
 -  name = 'Example Sponsor, Inc.',
 -   },
 -   {
 -  url = 'http://example2.invalid/',
 -  name = 'Example2 Sponsor, Inc.',
 -   },
 +  url = 'http://1und1.de/',
 +  name = '11 Internet AG',
 +   }
+]
  -%]
  [%-
 # possible values for importance: high, normal, low
 -   sitewidemsg = { importance = high,
 - txt = g('Please note that this is an experimental version 
of a href=http://%s/;%s/a. Errors and obsolete information should be 
expected', 'packages.debian.org', 'packages.debian.org') }
 +#   sitewidemsg = { importance = high,
 +#txt = g('Please note that this is an experimental version 
of a href=http://%s/;%s/a. Errors and obsolete information should be 
expected', 'packages.debian.org', 'packages.debian.org') }
 +#txt = Site maintainance in progress, some temporary 
problems might occour. }
  -%]
  [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
  [%- USE num = Number.Format( decimal_point = g('.'),

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-691-ga895768

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit a895768f651623ee82f7e664f28801b552f45c38
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Mar 15 19:51:59 2009 +0100

config: Add all our sponsors

diff --git a/templates/config.tmpl b/templates/config.tmpl
index b1ae799..05045c6 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -53,7 +53,15 @@
{
url = 'http://1und1.de/',
name = '11 Internet AG',
-   }
+   },
+   {
+   url = 'http://www.hp.com/',
+   name = 'Hewlett-Packard',
+   },
+   {
+   url = 'http://cs.helsinki.fi/index.en.html',
+   name = 'University of Helsinki - Department of Computer Science',
+   },
]
 -%]
 [%-

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-600-gc185991

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit c185991379b2754822262d4fcc6559481cef430c
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Thu Mar 5 00:04:02 2009 +0100

Use AptPkg::Version if available

diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm
index 53da030..35f0cb5 100644
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@ -70,11 +70,28 @@ our @EXPORT = qw( version_cmp version_sort suites_cmp 
suites_sort );
 
 our $VERSION = v1.0.0;
 
-sub version_cmp {
+BEGIN {
+eval {
+   use AptPkg::Config '$_config';
+   use AptPkg::System '$_system';
+   use AptPkg::Version;
+
+   $_config-init;
+   $_system = $_config-system;
+   my $apt_ver = $_system-versioning;
+   *version_cmp = sub { return $apt_ver-compare(@_) };
+};
+unless( *version_cmp ){
+   *version_cmp = \version_cmp_pp;
+}
+}
+
+my $re = qr/^(?:(\d+):)?([\w.+:~-]+?)(?:-([\w+.~]+))?$/;
+sub version_cmp_pp {
+return 0 if $_[0] eq $_[1];
 my ( $ver1, $ver2 ) = @_;
 
 my ( $e1, $e2, $u1, $u2, $d1, $d2 );
-my $re = qr/^(?:(\d+):)?([\w.+:~-]+?)(?:-([\w+.~]+))?$/;
 if ( $ver1 =~ $re ) {
( $e1, $u1, $d1 ) = ( $1, $2, $3 );
$e1 ||= 0;

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-684-g4268067

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 426806714669eb8be697d1f2c1b37e5a820e8647
Merge: 86cbf2e72d428638fa3371afce4d202f8821c660 
7d09da709b630cf597f59f6ccaf51403fd716479
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Feb 21 15:36:25 2009 +0100

Merge commit 'origin/ubuntu-master' into ubuntu-master


-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-598-g5933707

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 593370791356c703ea99794487f5b9da68a61a56
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Fri Feb 20 20:49:18 2009 +0100

Number::Format doesn't like multibyte characters

Fix French po file.

diff --git a/po/templates.fr.po b/po/templates.fr.po
index 9b24aff..5e4a593 100644
--- a/po/templates.fr.po
+++ b/po/templates.fr.po
@@ -43,7 +43,7 @@ msgstr ,
 
 #: templates/config.tmpl:63
 msgid ,
-msgstr  
+msgstr  
 
 #: templates/config/architectures.tmpl:4
 msgid Intel x86

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-597-g56af0d0

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 56af0d0d5ab185d52da218f7405632ef5ade9f12
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Tue Feb 17 21:58:32 2009 +0100

There are now Contents files for experimental

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 35b9361..02750b0 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -31,7 +31,6 @@ then
$wget_cmd -N 
${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
done
#FIXME: no Contents files for p-u
-   test ! $dist = experimental || continue
echo retrieve Contents $dist/$arch
(cd us/${dist} 
$wget_cmd -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz)
@@ -68,7 +67,6 @@ else
us/${dist}/${part}/binary-${arch}/Packages.gz
done
#FIXME: no Contents files for p-u
-   test ! $dist = experimental || continue
echo retrieve Contents $dist/$arch
rsync -t ${localdir}/dists/${dist}/Contents-${arch}.gz \
us/${dist}/Contents-${arch}.gz
diff --git a/cron.d/100syncarchive_m68k b/cron.d/100syncarchive_m68k
index 00b01cf..3dcf954 100755
--- a/cron.d/100syncarchive_m68k
+++ b/cron.d/100syncarchive_m68k
@@ -30,7 +30,6 @@ then
$wget_cmd -N 
${ftpsite}/dists/${dist}-${arch}/${part}/binary-${arch}/Packages.gz)
done
#FIXME: no Contents files for p-u
-   test ! $dist = experimental || continue
echo retrieve Contents $dist/$arch
(cd us/${dist}-${arch} 
$wget_cmd -N 
${ftpsite}/dists/${dist}-${arch}/Contents-${arch}.gz)
@@ -66,7 +65,6 @@ else
us/${dist}-${arch}/${part}/binary-${arch}/Packages.gz
done
#FIXME: no Contents files for p-u
-   test ! $dist = experimental || continue
echo retrieve Contents $dist-${arch}/$arch
rsync -t ${localdir}/dists/${dist}-${arch}/Contents-${arch}.gz \
us/${dist}-${arch}/Contents-${arch}.gz
diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 9d6df68..422ca7a 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -230,8 +230,7 @@ sub do_show {
 
$d{version} = $versions-{$a} if $multiple_versions;
$d{archive} = $archives-{$a};
-   if ( ($suite ne experimental)
- ($subsection ne 'debian-installer')) {
+   if ($subsection ne 'debian-installer') {
$d{contents_avail} = 1;
}
push @downloads, \%d;

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-676-g1ac63b1

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 1ac63b1ac6c696a8dd9f66af1dd91219e153fe3f
Merge: f199862788c8ad81dd559771b539930fdda871a9 
d335139f37934f9128a39ffd0933a163fb71cce7
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Feb 15 06:21:43 2009 +

Merge commit 'alioth/master' into debian-master

diff --combined config.sh.sed.in
index 2dd3417,c9091d2..b6709c1
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
 -#localdir=/org/ftp.debian.org/debian
 +localdir=/srv/mirrors/ftp.debian.org
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -45,13 -45,14 +45,14 @@@ ddtplangs=ca cs da de eo es eu fi fr h
  archives=us security debports backports volatile
  sections=main contrib non-free
  parts=$sections
- suites=etch etch-m68k etch-volatile etch-backports lenny lenny-volatile sid 
experimental
+ suites=etch etch-m68k etch-volatile etch-backports lenny lenny-volatile 
lenny-backports squeeze sid experimental
  priorities=required important standard optional extra
  dists=$suites
  architectures=alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
  arch_etch=alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
  arch_lenny=${arch_etch} armel
- arch_sid=${arch_lenny} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
+ arch_squeeze=${arch_lenny}
+ arch_sid=${arch_squeeze} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
  arch_experimental=${arch_sid}
  arch_lenny_proposed_updates=${arch_lenny}
  arch_etch_proposed_updates=${arch_etch}

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, sourcedeps, updated. switch-to-templates-618-g255f697

[Frank Lichtenheld]

The following commit has been merged in the sourcedeps branch:
commit 509bb47c0c8b030e4bacaab4cde987c8663a7075
Merge: 09458cbe2d59080ada061120ed513fc716f6ca24 
ebf38a5169f3013cf60f9d0bad612e24fe1908e6
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Feb 15 14:50:02 2009 +0100

Merge commit 'alioth/master' into sourcedeps

Conflicts:

conf/apache.conf.sed.in

diff --combined config.sh.sed.in
index 808b898,f9c1b07..da57bbd
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -16,8 -16,6 +16,8 @@@ configdir=${topdir}/con
  templatedir=${topdir}/templates
  cachedir=${topdir}/cache
  
 +sourcedeps_key=ED505694
 +
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
@@@ -47,13 -45,14 +47,14 @@@ ddtplangs=ca cs da de eo es eu fi fr h
  archives=us security debports backports volatile
  sections=main contrib non-free
  parts=$sections
- suites=etch etch-m68k etch-volatile etch-backports lenny lenny-volatile sid 
experimental
+ suites=etch etch-m68k etch-volatile etch-backports lenny lenny-volatile 
lenny-backports squeeze sid experimental
  priorities=required important standard optional extra
  dists=$suites
  architectures=alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
  arch_etch=alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
  arch_lenny=${arch_etch} armel
- arch_sid=${arch_lenny} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
+ arch_squeeze=alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc
+ arch_sid=${arch_squeeze} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
  arch_experimental=${arch_sid}
  arch_lenny_proposed_updates=${arch_lenny}
  arch_etch_proposed_updates=${arch_etch}

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, sourcedeps, updated. switch-to-templates-618-g255f697

[Frank Lichtenheld]

The following commit has been merged in the sourcedeps branch:
commit 255f697ff8e2240b2f6fed26bfaf7d00507e0671
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Feb 15 15:26:24 2009 +0100

[SOURCEDEPS] Update configuration for apt-ftparchive

diff --git a/conf/apt-ftparchive.conf b/conf/apt-ftparchive.conf
index 94201b5..687015a 100644
--- a/conf/apt-ftparchive.conf
+++ b/conf/apt-ftparchive.conf
@@ -52,11 +52,19 @@ Tree lenny-volatile {
  Sections main contrib non-free;
  Architectures alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc 
s390 sparc;
 };
+Tree lenny-backports {
+ Sections main contrib non-free;
+ Architectures alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc 
s390 sparc;
+};
+Tree squeeze {
+ Sections main contrib non-free;
+ Architectures alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 
sparc;
+};
 Tree sid {
  Sections main contrib non-free;
- Architectures alpha amd64 arm armel hppa hurd-i386 i386 ia64 
kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc;
+ Architectures alpha amd64 armel hppa hurd-i386 i386 ia64 kfreebsd-i386 
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc;
 };
 Tree experimental {
  Sections main contrib non-free;
- Architectures alpha amd64 arm armel hppa hurd-i386 i386 ia64 
kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc;
+ Architectures alpha amd64 armel hppa hurd-i386 i386 ia64 kfreebsd-i386 
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc;
 };

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-594-gd335139

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 3e6855ff77bb3e4da4faf8027643bc97fe90b0f5
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Fri Feb 13 23:44:58 2009 +0100

The Lenny Release Commit

diff --git a/bin/parse-packages b/bin/parse-packages
index 97edffc..6f89070 100755
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -115,10 +115,12 @@ for my $suite (@SUITES) {
foreach (@complete_tags) {
my ($facet, $tag) = split( /::/, $_, 2);
if ($tag =~ s/^\{(.+)\}$/$1/) {
+   warn pkg=$data{package} tags=$data{tag}\n unless 
$facet  $tag;
foreach (split( /,/, $tag )) {
push @tags, ${facet}::$_;
}
} else {
+   warn pkg=$data{package} tags=$data{tag}\n unless 
$facet  $tag;
push @tags, ${facet}::$tag;
}
}
diff --git a/config.sh.sed.in b/config.sh.sed.in
index 6637fb2..c9091d2 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -45,13 +45,14 @@ ddtplangs=ca cs da de eo es eu fi fr hu it ja km ko nl pl 
pt pt-br ru sk sv uk
 archives=us security debports backports volatile
 sections=main contrib non-free
 parts=$sections
-suites=etch etch-m68k etch-volatile etch-backports lenny lenny-volatile sid 
experimental
+suites=etch etch-m68k etch-volatile etch-backports lenny lenny-volatile 
lenny-backports squeeze sid experimental
 priorities=required important standard optional extra
 dists=$suites
 architectures=alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
 arch_etch=alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
 arch_lenny=${arch_etch} armel
-arch_sid=${arch_lenny} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
+arch_squeeze=${arch_lenny}
+arch_sid=${arch_squeeze} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k
 arch_experimental=${arch_sid}
 arch_lenny_proposed_updates=${arch_lenny}
 arch_etch_proposed_updates=${arch_etch}
diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports
index e560d85..2be4de7 100755
--- a/cron.d/100syncarchive_backports
+++ b/cron.d/100syncarchive_backports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # backports archive
 #
-for dist in etch
+for dist in etch lenny
 do
   echo retrieve Release(.gpg) $dist-backports
   test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports
diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm
index ba9df21..53da030 100644
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@ -152,10 +152,16 @@ sub _lcmp {
 return length( $v1 ) = length( $v2 );
 }
 
-our @SUITES_SORT = qw( woody oldstable sarge stable stable-proposed-updates
-  etch etch-m68k testing testing-proposed-updates lenny
-  sid unstable experimental
-  warty hoary breezy dapper edgy feisty gutsy hardy 
intrepid jaunty);
+our @SUITES_SORT = qw(  woody
+   sarge
+   oldstable
+   etch etch-m68k
+   stable stable-proposed-updates
+   lenny
+   testing testing-proposed-updates
+   squeeze
+   sid unstable experimental
+   warty hoary breezy dapper edgy feisty gutsy hardy 
intrepid jaunty);
 our @ARCHIVE_SORT = qw( non-US security updates volatile backports );
 our @PRIORITY_SORT = qw( required important standard optional extra );
 my $i = 1000;
diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index e2771b9..484e222 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -64,11 +64,12 @@ sub do_dispatch {
 delete $ENV{'LC_ALL'};
 delete $ENV{'LC_MESSAGES'};
 
-my %SUITES_ALIAS = ( #oldstable = 'sarge',
-stable = 'etch',
-testing = 'lenny',
+my %SUITES_ALIAS = ( oldstable = 'etch',
+stable = 'lenny',
+testing = 'squeeze',
 unstable = 'sid',
-'4.0' = 'etch' );
+'4.0' = 'etch',
+'5.0' = 'lenny' );
 
 # Read in all the variables set by the form
 my $input;
diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 2316706..a51ee8e 100644
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -33,7 +33,7 @@ sub do_search_contents {
 #FIXME: that's extremely hacky atm
 if ($params-{values}{suite}{no_replace}[0] eq 'default') {
$params-{values}{suite}{no_replace} =
-   $params-{values}{suite}{final} = $opts-{suite} = [ 'etch' ];
+   $params-{values}{suite}{final} = $opts-{suite} = [ 'lenny

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-594-gd335139

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit d335139f37934f9128a39ffd0933a163fb71cce7
Merge: 3e6855ff77bb3e4da4faf8027643bc97fe90b0f5 
744b4b7bdcb152104b9912c1930c4d8bd098f496
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Feb 14 12:15:52 2009 +0100

Merge commit 'alioth/master'


-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-663-g86cbf2e

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 0268b155eca8515611f49c029d4046b088435a82
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Jan 31 19:46:00 2009 +

Merge local changes on sulfur

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 9c7430c..4165bb9 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -65,10 +65,11 @@
   AddEncoding x-gzip .gz
 /Directory
 
-VirtualHost *
+VirtualHost 91.189.94.219:80
ServerAdmin fr...@lichtenheld.de
DocumentRoot %TOPDIR%/www/
ServerName %SITE%
+   ServerAlias packages.ubunut.com
ErrorLog /var/log/apache2/%SITE%-error.log
CustomLog /var/log/apache2/%SITE%-access.log combined
 
@@ -140,7 +141,7 @@
 
 /VirtualHost
 
-VirtualHost *
+VirtualHost 91.189.94.219:80
ServerAdmin fr...@lichtenheld.de
DocumentRoot %TOPDIR%/www/
ServerName packages.ubuntu.net
diff --git a/cron.d/110debtags b/cron.d/110debtags
index a2be695..17ee218 100755
--- a/cron.d/110debtags
+++ b/cron.d/110debtags
@@ -7,6 +7,7 @@ debtagsdir=$filesdir/debtags
 test -d ${debtagsdir} || mkdir -p ${debtagsdir}
 cd ${debtagsdir}
 
+export http_proxy=http://squid.external:3128/
 $wget_cmd -N http://debtags.alioth.debian.org/tags/vocabulary.gz 
gunzip -f vocabulary.gz
 

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-663-g86cbf2e

[Frank Lichtenheld]

The following commit has been merged in the ubuntu-master branch:
commit 86cbf2e72d428638fa3371afce4d202f8821c660
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Wed Feb 11 23:26:24 2009 +

[UBUNTU] Fix links to launchpad.net under maintainer list

Fixes LP#327472

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index ec7f2d7..19f5b7e 100644
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -142,8 +142,8 @@
'/ul' IF loop.last;
  END -%]
 p[% g('Please consider a href=%sfiling a bug/a or a href=%sasking 
a question/a via Launchpad before contacting the maintainer directly.',
-https://bugs.launchpad.net/ubuntu/+source/$src.pkg/+filebug;,
-https://answers.launchpad.net/ubuntu/+source/$src.pkg/+addquestion;) 
%]/p
+https://bugs.launchpad.net/ubuntu/+source/; _ (is_source ? pkg : 
src.pkg) _ /+filebug,
+https://answers.launchpad.net/ubuntu/+source/; _ (is_source ? pkg : 
src.pkg) _ /+addquestion) %]/p
 [%- END -%]
 
 [%- IF original_maintainers.size -%]

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-669-g5e22895

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 5e2289543a3358df734ff5235db02c380343a256
Merge: 309fa47de537050d8a5c8a25f37d65f1668b29df 
10a2d2f00a391e3300044d4092467eb1d19ddbd5
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Feb 8 18:12:37 2009 +0100

Merge branch 'master' into debian-master


-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-672-gf199862

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit 6bb33bd0eab35eb41ca7135d0988a6873bf27e01
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Feb 8 17:16:15 2009 +

extract_files: improve error reporting a bit

diff --git a/bin/extract_files b/bin/extract_files
index 3bfc559..1d3ce91 100755
--- a/bin/extract_files
+++ b/bin/extract_files
@@ -557,6 +557,10 @@ sub read_deb {
}
 }
 $cache{$debname} ||= qx/dpkg-deb --info $debname control/;
+unless ( $cache{$debname} ) {
+   do_warning( extracting control information of file $debname failed );
+   return;
+}
 my $control = $cache{$debname};
 
 unless ( $raw_data = $parser-parse_mem( $control,

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-672-gf199862

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit f1deb5744025ae41fc89f90b8dcba2df6f821077
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Feb 8 17:17:08 2009 +

Add password file for statistics page to .gitignore

diff --git a/.gitignore b/.gitignore
index ec46515..5204c11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ tmp
 mirror
 *~
 *.ttc
+www-passwords

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, debian-master, updated. switch-to-templates-672-gf199862

[Frank Lichtenheld]

The following commit has been merged in the debian-master branch:
commit f199862788c8ad81dd559771b539930fdda871a9
Merge: f1deb5744025ae41fc89f90b8dcba2df6f821077 
5e2289543a3358df734ff5235db02c380343a256
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sun Feb 8 17:19:10 2009 +

Merge commit 'alioth/debian-master' into debian-master

diff --combined bin/extract_files
index 1d3ce91,269078c..79b9946
--- a/bin/extract_files
+++ b/bin/extract_files
@@@ -130,6 -130,13 +130,13 @@@ sub add_log 
  $$log .= localtime().: @_\n;
  }
  
+ sub touch {
+ my $filename = shift;
+ sysopen(H, $filename, O_WRONLY|O_NONBLOCK|O_CREAT) or return undef;
+ close(H);
+ return 1;
+ }
+ 
  ##
  # PACKAGE HANDLING (UNPACKING/CLEANUP)
  
@@@ -227,8 -234,8 +234,8 @@@ sub to_update 
  
  if ($config_data-{structure} == PKGPOOL) {
my $dir = $target/.pkg_pool_directory( $pkg_data );
-   if (!$force  -d $dir  -f $dir/log) {
-   (system( touch, $dir/log ) == 0)
+   if (!$force  -f $dir/log) {
+   (utime(undef,undef,$dir/log) == 1)
or do_warning( touch of $dir/log failed );
return 0;
} else {
@@@ -284,7 -291,7 +291,7 @@@ sub extract_copyright_to_pkgpool 
my $pkg2 = $1;
if ($pkg_data-{bin_list}{$pkg2}) {
add_log( $log, symlink points to $pkg2, make symlink to 
copyright file );
-   (system(ln, -s, $pkg2.copyright, $tgt ) == 0)
+   (symlink( $pkg2.copyright, $tgt ) == 1 )
or add_log( $log, symlink creation failed );
} else {
add_log( $log, symlink points to $pkg2, don't know what to 
do with that );
@@@ -298,11 -305,11 +305,11 @@@
add_log( $log, copyright file $tgt still doesn't exist );
if (-e $src_tgt) {
add_log( $log, copyright file of the source package exists, 
make symlink );
-   (system(ln, -s, copyright, $tgt ) == 0)
+   (symlink( copyright, $tgt ) == 1 )
or add_log( $log, symlink generation failed );
} else {
add_log( $log, give up on $bin_pkg );
-   (system( touch, $tgt.ERROR ) == 0)
+   touch($tgt.ERROR)
or add_log( $log, even the touch of $tgt.ERROR failed :( 
);
}
}
@@@ -317,7 -324,7 +324,7 @@@
  keys %{$pkg_data-{bin_list}})) {
if (-e $target_dir/$bin_pkg.copyright) {
add_log( $log, copyright file $target_dir/$bin_pkg.copyright 
seems like a good guess to me, make a symlink );
-   (system(ln, -s, $bin_pkg.copyright, $src_tgt ) == 0)
+   (symlink( $bin_pkg.copyright, $src_tgt ) == 1 )
or do {
add_log( $log, symlink generation failed );
next;
@@@ -327,7 -334,7 +334,7 @@@
}
unless (-e $src_tgt) {
add_log( $log, give up );
-   (system( touch, $src_tgt.ERROR ) == 0) or
+   touch($src_tgt.ERROR) or
add_log( $log, even the touch of $src_tgt.ERROR failed :( );
}
  }
@@@ -371,7 -378,7 +378,7 @@@ sub manage_current_link 
  unless (-l $current_link) {
add_log( $log, create new current link );
(chdir( $parent_dir ) and
-not system( 'ln', '-s', $dirname, 'current' )) or
+(symlink( $dirname, 'current' ) == 1 )) or
 add_log( $log, creating new current link failed: $! );
  } else {
my $old_target = readlink( $current_link );
@@@ -382,7 -389,7 +389,7 @@@
 old_version=$old_version; overwriting current link );
(chdir( $parent_dir ) and
 unlink( 'current' ) and
-not system( 'ln', '-s', $dirname, 'current' )) or
+(symlink( $dirname, 'current' ) == 1 )) or
 add_log( $log, overwriting current link failed: $! );
} else {
add_log( $log,
@@@ -557,10 -564,6 +564,10 @@@ sub read_deb 
}
  }
  $cache{$debname} ||= qx/dpkg-deb --info $debname control/;
 +unless ( $cache{$debname} ) {
 +  do_warning( extracting control information of file $debname failed );
 +  return;
 +}
  my $control = $cache{$debname};
  
  unless ( $raw_data = $parser-parse_mem( $control,

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-583-g9c44c09

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 9c44c0906fe2eb551c8f4e93d78bb23ca13bccca
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Feb 7 14:59:17 2009 +0100

Use the bzip2 compressed Translation-* files instead of the gzip ones

On request of DSA, since they want to only have one variant of these
files in the future.

diff --git a/bin/parse-translations b/bin/parse-translations
index 3146024..21bcaaa 100755
--- a/bin/parse-translations
+++ b/bin/parse-translations
@@ -48,7 +48,7 @@ my $fixja = Text::Iconv-new(EUC-JP, UTF-8);
 foreach my $lang (@DDTP_LANGUAGES) {
 (my $locale = $lang) =~ s/^([a-z]{2})-([a-z]{2})$/$1_.uc($2)/e;
 print Reading Translations for $lang ($locale)...;
-open PKG, zcat $TOPDIR/archive/*/*/*/i18n/Translation-$locale.gz|;
+open PKG, bzcat $TOPDIR/archive/*/*/*/i18n/Translation-$locale.bz2|;
 my $count = 0;
 while (PKG) {
next if /^\s*$/;
diff --git a/cron.d/120synctrans b/cron.d/120synctrans
index a40736f..bd3e31d 100755
--- a/cron.d/120synctrans
+++ b/cron.d/120synctrans
@@ -22,7 +22,7 @@ then
locale=$(echo $lang|perl -p -e 
's/^([a-z]{2})-([a-z]{2})$/$1_.uc($2)/e')
echo retrieve translated Descs $dist/$part/$lang ($locale)
 (cd us/${dist}/${part}/i18n 
-$wget_cmd -N 
${ddtp_ftpsite}/dists/${dist}/${part}/i18n/Translation-$locale.gz)
+$wget_cmd -N 
${ddtp_ftpsite}/dists/${dist}/${part}/i18n/Translation-$locale.bz2)
  done
done
 done
@@ -37,8 +37,8 @@ else
  do
locale=$(echo $lang|perl -p -e 
's/^([a-z]{2})-([a-z]{2})$/$1_.uc($2)/e')
echo retrieve translated Descs $dist/$part/$lang ($locale)
-rsync -t 
${localdir}/dists/${dist}/${part}/i18n/Translation-$locale.gz \
-   us/${dist}/${part}/i18n/Translation-$locale.gz
+rsync -t 
${localdir}/dists/${dist}/${part}/i18n/Translation-$locale.bz2 \
+   us/${dist}/${part}/i18n/Translation-$locale.bz2
  done
done
 done

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-583-g9c44c09

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 155e5556f08559784db427b90d3845aee70d8fed
Author: Frank Lichtenheld fr...@lichtenheld.de
Date:   Sat Feb 7 14:55:19 2009 +0100

Regenerate debtags.pot with a current debtags vocabulary

diff --git a/po/debtags.de.po b/po/debtags.de.po
index c593c54..e2489a8 100644
--- a/po/debtags.de.po
+++ b/po/debtags.de.po
@@ -1272,6 +1272,13 @@ msgstr GPE Palmtop-Umgebung
 msgid GPS
 msgstr GPS
 
+#. Tag: works-with-format::xml:gpx, short desc
+#: files/debtags/vocabulary
+#, fuzzy
+#| msgid GIF, Graphics Interchange Format
+msgid GPX, GPS eXchange Format
+msgstr GIF, Graphics Interchange Format
+
 #. Tag: uitoolkit::gtk, short desc
 #: files/debtags/vocabulary
 msgid GTK
@@ -1573,8 +1580,8 @@ msgid 
 the local computer, as POP3 does.\n
 Link: http://en.wikipedia.org/wiki/Internet_Message_Access_Protocol;
 msgstr 
-»Internet Message Access Protocol«, ein Protokoll, das zum Zugriff auf E-Mail 

-auf einem Server von Clients wie KMail oder Evolution verwandt wird.\n
+»Internet Message Access Protocol«, ein Protokoll, das zum Zugriff auf E-
+Mail auf einem Server von Clients wie KMail oder Evolution verwandt wird.\n
 Beim Einsatz von IMAP verbleiben E-Mails auf dem Server, wo sie kategoriert, 
 bearbeitet, gelöscht usw. werden können, statt wie bei POP3 vom Benutzer 
 komplett auf den lokalen Computer heruntergeladen zu werden.\n
@@ -3201,8 +3208,8 @@ msgid 
 Link: http://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol Link: 
 http://www.ietf.org/rfc/rfc2821.txt;
 msgstr 
-»Simple Mail Transfer Protocol« ist ein Protokoll zur Übertragung von E-Mails 

-über das Internet.\n
+»Simple Mail Transfer Protocol« ist ein Protokoll zur Übertragung von E-
+Mails über das Internet.\n
 Jeder SMTP-Server verwendet SMTP, um E-Mails an den nächsten E-Mail-Server 
 weiterzugeben, bis die E-Mail an ihrem Ziel ankommt, wo sie normalerweise 
 via POP3 oder IMAP abgeholt wird.\n
@@ -4207,29 +4214,29 @@ msgstr wxWidgets
 msgid xDSL Modem
 msgstr xDSL-Modem
 
-#~ msgid Source code
-#~ msgstr Quellcode
-
-#~ msgid Windows file and printer sharing (SMB)
-#~ msgstr Datei- und Druckerfreigabe von Windows (SMB)
+#~ msgid 
+#~ Direct Client to Client protocol used by Internet Relay Chat clients.
+#~ msgstr 
+#~ Direktes Client-zu-Client-Protokoll, verwendet von Clients für Internet 
+#~ Relay Chat
 
-#~ msgid Secure File Transfer Protocol
-#~ msgstr Secure File Transfer Protocol
+#~ msgid File Transfer
+#~ msgstr Datei-Übertragung
 
-#~ msgid SMB and CIFS
-#~ msgstr SMB und CIFS
+#~ msgid File Transfer Protocol
+#~ msgstr File Transfer Protocol
 
 #~ msgid HyperText Transfer Protocol
 #~ msgstr HyperText Transfer Protocol
 
-#~ msgid File Transfer Protocol
-#~ msgstr File Transfer Protocol
+#~ msgid SMB and CIFS
+#~ msgstr SMB und CIFS
 
-#~ msgid File Transfer
-#~ msgstr Datei-Übertragung
+#~ msgid Secure File Transfer Protocol
+#~ msgstr Secure File Transfer Protocol
 
-#~ msgid 
-#~ Direct Client to Client protocol used by Internet Relay Chat clients.
-#~ msgstr 
-#~ Direktes Client-zu-Client-Protokoll, verwendet von Clients für Internet 
-#~ Relay Chat
+#~ msgid Windows file and printer sharing (SMB)
+#~ msgstr Datei- und Druckerfreigabe von Windows (SMB)
+
+#~ msgid Source code
+#~ msgstr Quellcode
diff --git a/po/debtags.fi.po b/po/debtags.fi.po
index b1c4571..aa48fe0 100644
--- a/po/debtags.fi.po
+++ b/po/debtags.fi.po
@@ -1192,6 +1192,11 @@ msgstr 
 msgid GPS
 msgstr 
 
+#. Tag: works-with-format::xml:gpx, short desc
+#: files/debtags/vocabulary
+msgid GPX, GPS eXchange Format
+msgstr 
+
 #. Tag: uitoolkit::gtk, short desc
 #: files/debtags/vocabulary
 msgid GTK
diff --git a/po/debtags.fr.po b/po/debtags.fr.po
index 1b43c11..6751f99 100644
--- a/po/debtags.fr.po
+++ b/po/debtags.fr.po
@@ -1185,6 +1185,11 @@ msgstr 
 msgid GPS
 msgstr 
 
+#. Tag: works-with-format::xml:gpx, short desc
+#: files/debtags/vocabulary
+msgid GPX, GPS eXchange Format
+msgstr 
+
 #. Tag: uitoolkit::gtk, short desc
 #: files/debtags/vocabulary
 msgid GTK
diff --git a/po/debtags.hu.po b/po/debtags.hu.po
index 1b43c11..6751f99 100644
--- a/po/debtags.hu.po
+++ b/po/debtags.hu.po
@@ -1185,6 +1185,11 @@ msgstr 
 msgid GPS
 msgstr 
 
+#. Tag: works-with-format::xml:gpx, short desc
+#: files/debtags/vocabulary
+msgid GPX, GPS eXchange Format
+msgstr 
+
 #. Tag: uitoolkit::gtk, short desc
 #: files/debtags/vocabulary
 msgid GTK
diff --git a/po/debtags.ja.po b/po/debtags.ja.po
index 811792a..5ca9e16 100644
--- a/po/debtags.ja.po
+++ b/po/debtags.ja.po
@@ -1220,6 +1220,13 @@ msgstr GPE Palmtop Environment
 msgid GPS
 msgstr GPS
 
+#. Tag: works-with-format::xml:gpx, short desc
+#: files/debtags/vocabulary
+#, fuzzy
+#| msgid GIF, Graphics Interchange Format
+msgid GPX, GPS eXchange Format
+msgstr Graphics Interchange Format (GIF)
+
 #. Tag: uitoolkit::gtk, short desc
 #: files/debtags/vocabulary
 msgid GTK
@@ -4013,51 +4020,51 @@ msgstr wxWidgets
 msgid xDSL Modem
 msgstr xDSL モデム
 
-#~ msgid Audrio

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-588-gebc03a5

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit fbabf0288a7d185712310b6748e93ed8beb9e71f
Author: Peter Palfrader pe...@palfrader.org
Date:   Sat Feb 7 22:15:55 2009 +

Do not fork out for touch(1) anymore

Signed-off-by: Frank Lichtenheld fr...@lichtenheld.de

diff --git a/bin/extract_files b/bin/extract_files
index 3bfc559..b5753b2 100755
--- a/bin/extract_files
+++ b/bin/extract_files
@@ -130,6 +130,13 @@ sub add_log {
 $$log .= localtime().: @_\n;
 }
 
+sub touch {
+my $filename = shift;
+sysopen(H, $filename, O_WRONLY|O_NONBLOCK|O_CREAT) or return undef;
+close(H);
+return 1;
+}
+
 ##
 # PACKAGE HANDLING (UNPACKING/CLEANUP)
 
@@ -228,7 +235,7 @@ sub to_update {
 if ($config_data-{structure} == PKGPOOL) {
my $dir = $target/.pkg_pool_directory( $pkg_data );
if (!$force  -d $dir  -f $dir/log) {
-   (system( touch, $dir/log ) == 0)
+   touch($dir/log)
or do_warning( touch of $dir/log failed );
return 0;
} else {
@@ -302,7 +309,7 @@ sub extract_copyright_to_pkgpool {
or add_log( $log, symlink generation failed );
} else {
add_log( $log, give up on $bin_pkg );
-   (system( touch, $tgt.ERROR ) == 0)
+   touch($tgt.ERROR)
or add_log( $log, even the touch of $tgt.ERROR failed :( 
);
}
}
@@ -327,7 +334,7 @@ sub extract_copyright_to_pkgpool {
}
unless (-e $src_tgt) {
add_log( $log, give up );
-   (system( touch, $src_tgt.ERROR ) == 0) or
+   touch($src_tgt.ERROR) or
add_log( $log, even the touch of $src_tgt.ERROR failed :( );
}
 }

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-588-gebc03a5

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit 818c6a459764b613fbff5fb9d72b64db5de6f262
Author: Peter Palfrader pe...@palfrader.org
Date:   Sat Feb 7 22:18:15 2009 +

Do not shell out for ln -s anymore

Signed-off-by: Frank Lichtenheld fr...@lichtenheld.de

diff --git a/bin/extract_files b/bin/extract_files
index b5753b2..49b489f 100755
--- a/bin/extract_files
+++ b/bin/extract_files
@@ -291,7 +291,7 @@ sub extract_copyright_to_pkgpool {
my $pkg2 = $1;
if ($pkg_data-{bin_list}{$pkg2}) {
add_log( $log, symlink points to $pkg2, make symlink to 
copyright file );
-   (system(ln, -s, $pkg2.copyright, $tgt ) == 0)
+   (symlink( $pkg2.copyright, $tgt ) == 1 )
or add_log( $log, symlink creation failed );
} else {
add_log( $log, symlink points to $pkg2, don't know what to 
do with that );
@@ -305,7 +305,7 @@ sub extract_copyright_to_pkgpool {
add_log( $log, copyright file $tgt still doesn't exist );
if (-e $src_tgt) {
add_log( $log, copyright file of the source package exists, 
make symlink );
-   (system(ln, -s, copyright, $tgt ) == 0)
+   (symlink( copyright, $tgt ) == 1 )
or add_log( $log, symlink generation failed );
} else {
add_log( $log, give up on $bin_pkg );
@@ -324,7 +324,7 @@ sub extract_copyright_to_pkgpool {
  keys %{$pkg_data-{bin_list}})) {
if (-e $target_dir/$bin_pkg.copyright) {
add_log( $log, copyright file $target_dir/$bin_pkg.copyright 
seems like a good guess to me, make a symlink );
-   (system(ln, -s, $bin_pkg.copyright, $src_tgt ) == 0)
+   (symlink( $bin_pkg.copyright, $src_tgt ) == 1 )
or do {
add_log( $log, symlink generation failed );
next;
@@ -378,7 +378,7 @@ sub manage_current_link {
 unless (-l $current_link) {
add_log( $log, create new current link );
(chdir( $parent_dir ) and
-not system( 'ln', '-s', $dirname, 'current' )) or
+(symlink( $dirname, 'current' ) == 1 )) or
 add_log( $log, creating new current link failed: $! );
 } else {
my $old_target = readlink( $current_link );
@@ -389,7 +389,7 @@ sub manage_current_link {
 old_version=$old_version; overwriting current link );
(chdir( $parent_dir ) and
 unlink( 'current' ) and
-not system( 'ln', '-s', $dirname, 'current' )) or
+(symlink( $dirname, 'current' ) == 1 )) or
 add_log( $log, overwriting current link failed: $! );
} else {
add_log( $log,

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-588-gebc03a5

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit fa0e80560d8fc055c1d88997ce47ae01cfe3e8f6
Author: Peter Palfrader pe...@palfrader.org
Date:   Sat Feb 7 22:38:35 2009 +

In the one instance where we touch() and know that the file exists, use 
utime() to update the timestamp

Signed-off-by: Frank Lichtenheld fr...@lichtenheld.de

diff --git a/bin/extract_files b/bin/extract_files
index 49b489f..875b7de 100755
--- a/bin/extract_files
+++ b/bin/extract_files
@@ -235,7 +235,7 @@ sub to_update {
 if ($config_data-{structure} == PKGPOOL) {
my $dir = $target/.pkg_pool_directory( $pkg_data );
if (!$force  -d $dir  -f $dir/log) {
-   touch($dir/log)
+   (utime(undef,undef,$dir/log) == 1)
or do_warning( touch of $dir/log failed );
return 0;
} else {

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

[SCM] APT Archive Web-Frontend (Alioth repository) branch, master, updated. switch-to-templates-588-gebc03a5

[Frank Lichtenheld]

The following commit has been merged in the master branch:
commit ebc03a591841ada03ff121608e8437c193fa8cfd
Author: Peter Palfrader pe...@palfrader.org
Date:   Sat Feb 7 22:39:13 2009 +

No point in checking if $dir exists and is a dir if we check if $dir/log is 
a file in the next clause

Signed-off-by: Frank Lichtenheld fr...@lichtenheld.de

diff --git a/bin/extract_files b/bin/extract_files
index 875b7de..269078c 100755
--- a/bin/extract_files
+++ b/bin/extract_files
@@ -234,7 +234,7 @@ sub to_update {
 
 if ($config_data-{structure} == PKGPOOL) {
my $dir = $target/.pkg_pool_directory( $pkg_data );
-   if (!$force  -d $dir  -f $dir/log) {
+   if (!$force  -f $dir/log) {
(utime(undef,undef,$dir/log) == 1)
or do_warning( touch of $dir/log failed );
return 0;

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org