From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 2 May 2008 15:14:38 +0000 (+0200)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=62b2941b9f0ff5ed647ecbba800f1c671577c2bd;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master

Conflicts:

	cron.d/100syncarchive_amd64
	cron.d/100syncarchive_backports
	cron.d/100syncarchive_debports
	cron.d/100syncarchive_m68k
	cron.d/100syncarchive_volatile
	templates/html/head.tmpl
	templates/html/show.tmpl
---

62b2941b9f0ff5ed647ecbba800f1c671577c2bd
diff --cc config.sh.sed.in
index edfbc3e,9fddcb8..2eb47b7
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -24,13 -24,20 +24,16 @@@ 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
 -amd64_ftpsite=http://amd64.debian.net/debian
 -debports_ftpsite=http://ftp.debian-ports.org/debian
 -ddtp_ftpsite=http://ddtp.debian.net/debian
 +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" 
+ wget_cmd="wget --no-verbose --tries=2 --timeout=60"
+ check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg"
  
+ # URLs that need to be known in the code (as opposed to the templates)
  root=""
+ search_url="/search"
  
  # Architectures
  #
diff --cc cron.d/100syncarchive
index f71f816,cb6f18c..3f2008a
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@@ -99,6 -111,8 +103,8 @@@ d
          echo retrieve Sources $dist/$part/security
          test -d security/${dist}/${part}/source || mkdir -p security/${dist}/${part}/source
          (cd security/${dist}/${part}/source &&
 -            $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/source/Sources.gz)
 +            $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/${part}/source/Sources.gz)
      done
+ 
+     $check_release_cmd $archivedir/security/${dist}/Release
  done
diff --cc templates/config.tmpl
index 11d0404,3e91e26..6a24629
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -3,14 -3,13 +3,14 @@@
     po_lang = 'en'
     ddtp_lang = 'en'
  
 -   organisation = 'Debian'
 -   project_homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   organisation = 'Ubuntu'
 +   project_homepage = 'http://www.ubuntu.com/'
 +   packages_homepage = 'http://packages.ubuntu.com/'
     searchformurl = packages_homepage
-    search_url = '/'
+    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:'
diff --cc templates/html/head.tmpl
index 8fbe1b7,1cc5d1f..3d48771
--- a/templates/html/head.tmpl
+++ b/templates/html/head.tmpl
@@@ -39,8 -36,7 +39,8 @@@
  [%- IF print_search_field %]
  [% checked = 'checked="checked"'
     selected = 'selected="selected"' %]
 +<div id="search">
- <form method="GET" action="/search">
+ <form method="GET" action="[% search_url %]">
  <div id="hpacketsearch">
  [% IF search_field_values.mode %]<input type="hidden" name="mode" value="[% search_field_values.mode %]">[% END %]
  [% IF search_field_values.sort_by %]<input type="hidden" name="sort_by" value="[% search_field_values.sort_by %]">[% END %]