[SCM] APT Archive Web-Frontend (Alioth repository) branch, ubuntu-master, updated. switch-to-templates-684-g4268067
The following commit has been merged in the ubuntu-master branch: commit 426806714669eb8be697d1f2c1b37e5a820e8647 Merge: 86cbf2e72d428638fa3371afce4d202f8821c660 7d09da709b630cf597f59f6ccaf51403fd716479 Author: Frank Lichtenheld 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, ubuntu-master, updated. switch-to-templates-684-g4268067
The following commit has been merged in the ubuntu-master branch:
commit 7d09da709b630cf597f59f6ccaf51403fd716479
Author: Frank Lichtenheld
Date: Sat Feb 21 15:26:36 2009 +0100
[UBUNTU] Remove feisty
diff --git a/config.sh.sed.in b/config.sh.sed.in
index bd04596..36e2452 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -42,17 +42,14 @@ 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 feisty feisty-updates
feisty-backports gutsy gutsy-updates gutsy-backports hardy hardy-updates
hardy-backports intrepid intrepid-updates intrepid-backports jaunty"
+suites="dapper dapper-updates dapper-backports gutsy gutsy-updates
gutsy-backports hardy hardy-updates hardy-backports intrepid intrepid-updates
intrepid-backports jaunty"
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_feisty="${arch_dapper}"
-arch_feisty_updates="${arch_feisty}"
-arch_feisty_backports="${arch_feisty}"
-arch_gutsy="${arch_feisty}"
+arch_gutsy="${arch_dapper}"
arch_gutsy_updates="${arch_gutsy}"
arch_gutsy_backports="${arch_gutsy}"
arch_hardy="i386 amd64"
diff --git a/static/index.tmpl b/static/index.tmpl
index 60bb1fe..23e220f 100644
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -6,13 +6,11 @@
-%]
[%-
all_suites = [ 'dapper', 'dapper-updates', 'dapper-backports',
- 'feisty', 'feisty-updates', 'feisty-backports',
'gutsy', 'gutsy-updates', 'gutsy-backports',
'hardy', 'hardy-updates', 'hardy-backports',
'intrepid', 'intrepid-updates', 'intrepid-backports',
'jaunty', ]
version_numbers = { dapper => '6.06LTS',
- feisty => '7.04',
gutsy => '7.10',
hardy => '8.04LTS',
intrepid => '8.10'}
@@ -132,6 +130,8 @@ Display:
News
+2009-02-21
+Remove feisty.
2008-11-03
Add jaunty.
2008-10-30
--
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
The following commit has been merged in the ubuntu-master branch:
commit 655b2eb3a319370039897127a65666b536af901e
Merge: 9786e970292c154845a5f5dbc3086191ea59a6f0
593370791356c703ea99794487f5b9da68a61a56
Author: Frank Lichtenheld
Date: Sat Feb 21 15:23:28 2009 +0100
Merge commit 'origin/master'
Conflicts:
config.sh.sed.in
cron.d/100syncarchive
cron.d/100syncarchive_backports
cron.d/100syncarchive_m68k
lib/Packages/DoSearchContents.pm
lib/Packages/Search.pm
static/index.tmpl
templates/config/archive_layout.tmpl
diff --combined bin/parse-packages
index 15eae16,6f89070..e069024
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@@ -68,12 -68,11 +68,12 @@@ for my $suite (@SUITES)
for my $archive (@ARCHIVES) {
print "Reading $archive/$suite...\n";
- if (!-d "$TOPDIR/archive/$archive/$suite/") {
+ my $suite_dir = "$TOPDIR/archive/$archive/$suite";
+ if (!-d $suite_dir) {
print "\tseems not to exist, skipping...\n";
next;
}
- open PKG, "zcat
$TOPDIR/archive/$archive/$suite/$what/{,debian-installer/}binary-*/Packages.gz|";
+ open PKG, "zcat $suite_dir/$what/binary-*/Packages.gz
$suite_dir/$what/debian-installer/binary-*/Packages.gz|";
while () {
next if /^\s*$/;
my $data = "";
@@@ -116,10 -115,12 +116,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 lib/Packages/DoShow.pm
index fb65b2e,422ca7a..11c8db7
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@@ -230,8 -230,7 +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;
@@@ -385,16 -384,12 +384,16 @@@ sub moreinfo
if ($info{maintainers}) {
my $uploaders = $page->get_src( 'uploaders' );
+ my $orig_uploaders = $page->get_src( 'orig_uploaders' );
if ($uploaders && @$uploaders) {
my @maintainers = map { { name => $_->[0], mail => $_->[1] } }
@$uploaders;
$contents->{maintainers} = \...@maintainers;
}
+ if ($orig_uploaders && @$orig_uploaders) {
+ my @orig_maintainers = map { { name => $_->[0], mail => $_->[1] } }
@$orig_uploaders;
+ $contents->{original_maintainers} = \...@orig_maintainers;
+ }
}
-
}
sub providers {
--
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
Debian WWW CVS commit by mondo: webwml/italian/Bugs Reporting.wml
CVSROOT:/cvs/webwml Module name:webwml Changes by: mondo 09/02/21 13:07:30 Modified files: italian/Bugs : Reporting.wml Log message: Document spamfighting and mail that matches FROM_DAEMON -- To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Debian WWW CVS commit by mondo: webwml/italian/releases/lenny errata.wml
CVSROOT:/cvs/webwml Module name:webwml Changes by: mondo 09/02/21 12:31:59 Modified files: italian/releases/lenny: errata.wml Log message: HTML Fix -- To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Debian WWW CVS commit by mondo: webwml/english/releases/lenny errata.wml
CVSROOT:/cvs/webwml Module name:webwml Changes by: mondo 09/02/21 12:31:58 Modified files: english/releases/lenny: errata.wml Log message: HTML Fix -- To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Debian WWW CVS commit by adn: webwml/persian/News/2009 20090214.wml Makefile
CVSROOT:/cvs/webwml Module name:webwml Changes by: adn 09/02/21 11:04:25 Added files: persian/News/2009: 20090214.wml Makefile Log message: Initial translation (Abbas Esmaeeli) -- To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Debian WWW CVS commit by adn: webwml/persian/News Makefile
CVSROOT:/cvs/webwml Module name:webwml Changes by: adn 09/02/21 11:04:20 Added files: persian/News : Makefile Log message: Initial translation (Abbas Esmaeeli) -- To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Debian WWW CVS commit by adn: webwml/persian/News/2009
CVSROOT:/cvs/webwml Module name:webwml Changes by: adn 09/02/21 11:03:14 webwml/persian/News/2009 Update of /cvs/webwml/webwml/persian/News/2009 In directory gluck:/home/adn/public_html/webwml/persian/News/2009 Log Message: Directory /cvs/webwml/webwml/persian/News/2009 added to the repository -- To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Debian WWW CVS commit by adn: webwml/persian/News
CVSROOT:/cvs/webwml Module name:webwml Changes by: adn 09/02/21 11:03:07 webwml/persian/News Update of /cvs/webwml/webwml/persian/News In directory gluck:/home/adn/public_html/webwml/persian/News Log Message: Directory /cvs/webwml/webwml/persian/News added to the repository -- To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Debian WWW CVS commit by mondo: webwml/italian/releases/lenny errata.wml
CVSROOT:/cvs/webwml Module name:webwml Changes by: mondo 09/02/21 10:50:10 Modified files: italian/releases/lenny: errata.wml Log message: -- To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Debian WWW CVS commit by mondo: webwml/english/releases/lenny errata.wml
CVSROOT:/cvs/webwml Module name:webwml Changes by: mondo 09/02/21 10:50:03 Modified files: english/releases/lenny: errata.wml Log message: HTML fix -- To UNSUBSCRIBE, email to debian-www-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
