From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sat, 31 Jan 2009 18:54:53 +0000 (+0000)
Subject: Merge commit 'alioth/debian-master' into debian-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=7225f204a603002f4c3bc70b1a1eb94cbf638701;hp=c735c12490fbb7684bf186c31235a3ebdc25f617;p=deb%2Fpackages.git

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

diff --git a/bin/create_mirror b/bin/create_mirror
index da17e90..e9cdf05 100755
--- a/bin/create_mirror
+++ b/bin/create_mirror
@@ -44,8 +44,8 @@ do
       --exclude '*.new' --exclude '*.sed.in' \
       --exclude '*.slices' --exclude '*~' \
       --exclude '*.lock' --exclude '*.ttc' --exclude 'logs/' \
-      --exclude 'packages/*/' --exclude 'changelogs.*' \
-      --exclude 'changelogs/**/log' \
+      --exclude 'packages/*/' --exclude 'changelogs.*.dump' \
+      --exclude 'changelogs.cache' --exclude 'changelogs/**/log' \
       --exclude "/auto" --exclude "/Search" --exclude "/perl" \
       --delete-excluded --delete-after \
       "$topdir/$d/" "$new/$d/"
diff --git a/bin/daily.sed.in b/bin/daily.sed.in
index 7207bfb..fe220b5 100755
--- a/bin/daily.sed.in
+++ b/bin/daily.sed.in
@@ -55,4 +55,5 @@ fi
 date
 
 $topdir/bin/create_mirror $topdir
+sudo -H -u archvsync /home/archvsync/bin/pushpdo &
 date
diff --git a/static/about/index.tmpl b/static/about/index.tmpl
index 78eb26a..5d25ca0 100644
--- a/static/about/index.tmpl
+++ b/static/about/index.tmpl
@@ -93,6 +93,10 @@ Copyright (C) 2006 Jeroen van Wolffelaar &lt;jeroen@wolffelaar.nl&gt;
 Copyright (C) 2006, 2007 Frank Lichtenheld &lt;frank@lichtenheld.de&gt;
 </pre>
 
+<h3>Sponsors</h3>
+
+<p><a href="sponsors.html">See our separate Sponsors page</a></p>
+
 [% PROCESS 'html/foot.tmpl'
 	langs.size = 0
 	footer.doNotDisplayCopyright = 1 %]
diff --git a/static/about/sponsors.tmpl b/static/about/sponsors.tmpl
new file mode 100644
index 0000000..4edc405
--- /dev/null
+++ b/static/about/sponsors.tmpl
@@ -0,0 +1,30 @@
+[% PROCESS 'html/head.tmpl' 
+	title_tag = "$organisation Packages - Sponsors"
+	page_title = "$organisation Packages - Sponsors"
+	keywords = "$organisation, Sponsoring, Hardware, Hosting"
+%]
+
+<h2>Sponsors of <tt>packages.debian.org</tt></h2>
+
+<p>Providing this popular service wouldn't be possible
+without the help of the following companies and organisations:</p> 
+
+<table id="sponsorslist">
+<tr>
+ <th>Machine</th> <th>Purpose</th> <th>Sponsor Hardware</th> <th>Sponsor Hosting</th>
+</tr>
+<tr>
+ <td><a href="http://db.debian.org/machines.cgi?host=powell">powell.debian.org</a></td>
+ <td>Main Web/Data Server, Mail Handling</td>
+ <td colspan="2"><a href="http://1und1.de/">1&amp;1 Internet AG</a></td>
+</tr>
+<tr>
+ <td><a href="http://db.debian.org/machines.cgi?host=piatti">piatti.debian.org</a></td>
+ <td>Mirror</td>
+ <td><a href="http://www.hp.com/">Hewlett-Packard</a></td>
+ <td><a href="http://cs.helsinki.fi/index.en.html">University of Helsinki - Department of Computer Science</a></td>
+</tr>
+</table>
+
+[% PROCESS 'html/foot.tmpl'
+	langs.size = 0 %]
diff --git a/static/packages-site.css b/static/packages-site.css
index 420506e..7254f37 100644
--- a/static/packages-site.css
+++ b/static/packages-site.css
@@ -2,3 +2,16 @@
 .lenny-volatile, .lenny-backports {
 	font-size: smaller;
 }
+
+table#sponsorslist {
+	text-align: center;
+	border: 1px solid black;
+	padding: 1em;
+	border-collapse: collapse;
+	empty-cells: show;
+}
+
+#sponsorslist th, #sponsorslist td {
+	border: 1px solid black;
+	padding: .5em;
+}