From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 9 Dec 2007 18:26:46 +0000 (+0100)
Subject: Merge commit 'alioth/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=8290599bd43de836a8a02b547a1b1b41f9f25871;hp=c38147cababd110747a260727ba28a4c4f2463e1;p=deb%2Fpackages.git

Merge commit 'alioth/master' into debian-master

Conflicts:

	config.sh.sed.in
	debian/control
	lib/Packages/Dispatcher.pm
---

diff --git a/cgi-bin/index.php b/cgi-bin/index.php
deleted file mode 100644
index 006db80..0000000
--- a/cgi-bin/index.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?
-
-function go($script)
-{
-	$pipes = null;
-	$proc = proc_open("./$script php", array(
-		0 => array('pipe', 'r'),
-		1 => array('pipe', 'w'),
-		2 => array('pipe', 'w')
-		), $pipes);
-	foreach ($_GET as $k => $v) {
-		fwrite($pipes[0], urlencode($k)."=".urlencode($v)."\n");
-	}
-	fclose($pipes[0]);
-	fpassthru($pipes[1]);
-	$stderr = fread($pipes[2], 4096);
-	$exit = proc_close($proc);
-	if ($exit) {
-		echo "<h1>Error happened, code $exit</h1>\n";
-	}
-	echo "<pre>".htmlspecialchars($stderr);
-	echo "</pre>";
-}
-
-$SUITES = array('oldstable', 'stable', 'testing', 'unstable', 'experimental');
-$pi = substr($_SERVER["PATH_INFO"], 1);
-$elems = explode('/', $pi);
-if ($pi == "") {
-	readfile("index.html");
-	exit;
-} elseif ($pi == 'search') {
-	go("search_packages.pl");
-} elseif ($elems[0] == 'package' && count($elems) == 2) {
-	$_GET['searchon'] = 'names';
-	$_GET['keywords'] = $elems[1];
-	$_GET['suite'] = 'all';
-	$_GET['exact'] = 1;
-	go("search_packages.pl");
-} elseif ($elems[0] == 'source' && count($elems) == 2) {
-	$_GET['searchon'] = 'sourcenames';
-	$_GET['keywords'] = $elems[1];
-	$_GET['suite'] = 'all';
-	$_GET['exact'] = 1;
-	go("search_packages.pl");
-} elseif (in_array($elems[0], $SUITES) && count($elems) == 2) {
-	$_GET['package'] = $elems[1];
-	$_GET['suite'] = $elems[0];
-	go("show_package.pl");
-} elseif (in_array($elems[0], $SUITES) && count($elems) == 3) {
-	header("Location: http://merkel.debian.org/~jeroen/pdo/$elems[0]/".urlencode($elems[2]));
-	exit;
-} elseif (substr($pi, 0, 4) == 'src:') {
-	header("Location: http://merkel.debian.org/~jeroen/pdo/source/".urlencode(substr($pi,4)));
-	exit;
-} elseif (!eregi('[^a-z0-9+.-]', $pi)) {
-	header("Location: http://merkel.debian.org/~jeroen/pdo/package/".urlencode($pi));
-	exit;
-} else {
-	echo "404 not found";
-}
diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 5ed7453..5f316e2 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -110,8 +110,8 @@
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
 
-#   RewriteRule ^/$ http://www.debian.org/distrib/packages
-   RewriteRule ^/$ /index.html [L]
+   RewriteRule ^/$ http://www.debian.org/distrib/packages
+#   RewriteRule ^/$ /index.html [L]
    RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
    RewriteRule ^/changelog:(.+)$  http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
    RewriteRule ^/src:([^/]+)$ /source/$1 [R,L,NE]
diff --git a/config.sh.sed.in b/config.sh.sed.in
index 7481446..d5072d7 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -19,7 +19,7 @@ cachedir=${topdir}/cache
 # unset this if %SITE% moves somewhere where the packages files
 # cannot be obtained locally
 #
-#localdir=/org/ftp.debian.org/debian
+localdir=/org/ftp.root/debian
 
 # path to private ftp directory
 #ftproot=/org/ftp.root
diff --git a/debian/control b/debian/control
index 03c841a..840b4f7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: packages
-Build-Depends: git-core, rsync, dpkg-dev, procmail,
+Build-Depends: rsync, dpkg-dev, procmail,
  liblocale-maketext-lexicon-perl, libi18n-acceptlanguage-perl, libnumber-format-perl,
  libcompress-zlib-perl, libhtml-parser-perl, libio-stringy-perl,
  libmldbm-perl, libtext-iconv-perl, libhtml-template-perl,
diff --git a/templates/config.tmpl b/templates/config.tmpl
index 1fee16b..26827e4 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -4,7 +4,7 @@
 
    organisation = 'Debian'
    homepage = 'http://www.debian.org/'
-   packages_homepage = 'http://packages.debian.net/'
+   packages_homepage = 'http://packages.debian.org/'
    searchformurl = packages_homepage
    search_url = '/'
    tags_url = 'http://debtags.alioth.debian.org/'
@@ -49,8 +49,9 @@
 -%]
 [%-
    # possible values for importance: high, normal, low
-   sitewidemsg = { importance => "high",
-		   txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
+#   sitewidemsg = { importance => "high",
+#		   txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
+#		   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('.'),