Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu...

Conflicts:

	conf/apache.conf.sed.in
	config.sh.sed.in
	lib/Packages/Search.pm

diff --cc conf/apache.conf.sed.in
index 6384605b1666e4f3102a20c4ee5aa4b28f3bdb14,c71ef22956aedbf805635024cdc7dd6b9adbb541..bbb24d943fef27941504174d673a0248bba05ee7
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -83,20 -86,21 +86,21 @@@
     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
 -   PerlSwitches -T
 +#   PerlModule ModPerl::Registry
 +#   PerlTaintCheck On
 +#   PerlRequire %TOPDIR%/bin/mod_perl-startup
++#   PerlSwitches -T
     <Location /cgi-bin/>
 -      SetHandler perl-script
 +#      SetHandler perl-script
        # mod-perl etch
 -      PerlInitHandler Apache2::Reload
 +#      PerlInitHandler Apache2::Reload
        # mod-perl sarge
        #PerlInitHandler Apache::Reload
 -      PerlHandler ModPerl::Registry
 +#      PerlHandler ModPerl::Registry
        Options +ExecCGI
 -      PerlSendHeader On
 +#      PerlSendHeader On
        allow from all
     </Location>
  

diff --cc config.sh.sed.in
index 155e8b8ea140b6cee4f19d13c03d0506491f2e46,08ecd6189d9620979305765154b0e610d7f37202..1be02c86ae55de54a5b0f92ebb303ea5e6827bda
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -20,42 -20,39 +20,42 @@@ cachedir=${topdir}/cach
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
--localdir=/org/ftp.debian.org/debian
++#localdir=/org/ftp.debian.org/debian
  
  # 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
 -gnuab_ftpsite=http://kfreebsd-gnu.debian.net/debian
 +ftpsite=http://archive.ubuntu.com/ubuntu
 +security_ftpsite=$ftpsite
+ ddtp_ftpsite=http://ddtp.debian.net/debian
  
  root=""
  
  # Architectures
  #
  polangs="de fi nl fr uk"
- ddtplangs="de cs da eo es fi fr hu it ja nl pl pt_BR pt_PT ru sk sv_SE uk"
+ ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk zh zh_CN zh_TW"
 -archives="us security amd64 gnuab backports volatile"
 -sections="main contrib non-free"
 -parts="$sections"
 -suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental"
 +archives="us security"
 +sections="main multiverse restricted universe"
 +parts="${sections}"
 +suites="warty hoary hoary-backports breezy breezy-backports dapper dapper-backports edgy edgy-backports feisty"
  priorities="required important standard optional extra"
- dists="${suites}"
 -dists="$suites"
 -architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
 -arch_sarge="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
 -arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
 -arch_lenny="${arch_etch}"
 -arch_sid="${arch_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64"
 -arch_experimental="${arch_sid}"
 -arch_lenny_proposed_updates="${arch_lenny}"
 -arch_etch_proposed_updates="${arch_etch}"
 +architectures="i386 amd64 powerpc"
 +arch_warty="i386 amd64 powerpc"
 +arch_warty_updates="${arch_warty}"
 +arch_hoary="${arch_warty}"
 +arch_hoary_backports="${arch_hoary}"
 +arch_hoary_updates="${arch_hoary}"
 +arch_breezy="${arch_hoary}"
 +arch_breezy_updates="${arch_breezy}"
 +arch_breezy_backports="${arch_breezy}"
 +arch_dapper="${arch_breezy}"
 +arch_dapper_updates="${arch_dapper}"
 +arch_dapper_backports="${arch_dapper}"
 +arch_edgy="${arch_dapper}"
 +arch_edgy_updates="${arch_edgy}"
 +arch_edgy_backports="${arch_edgy}"
 +arch_feisty="${arch_edgy}"
  
  # Miscellaneous
  #

diff --cc lib/Packages/Search.pm
Simple merge

diff --cc templates/html/foot.tmpl
Simple merge

diff --cc templates/html/head.tmpl
Simple merge