From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 28 Oct 2007 21:22:28 +0000 (+0100)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=a1687e009279c235d322b8929f9d31dd947b8c14;p=deb%2Fpackages.git

Merge commit 'origin/master' into debian-master

Conflicts:

	bin/create_index_pages
	config.sh.sed.in
	cron.d/050checkinst
---

a1687e009279c235d322b8929f9d31dd947b8c14
diff --cc config.sh.sed.in
index a6d9b78,42978b7..49ed5f7
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -37,9 -37,8 +37,9 @@@ root="
  
  # Architectures
  #
- polangs="de fi fr ja hu nl uk"
+ polangs="de fi fr hu ja nl sv 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"
 +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"
 +#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"
diff --cc debian/control
index 0000000,4a4d48a..3cc7ffb
mode 000000,100644..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,0 -1,9 +1,9 @@@
+ Source: packages
 -Build-Depends: git-core, rsync, dpkg-dev, procmail,
++Build-Depends: rsync, dpkg-dev, procmail,
+  gettext, liblocale-gettext-perl, locales | locales-all, libi18n-acceptlanguage-perl,
+  libcompress-zlib-perl, libhtml-parser-perl, libio-stringy-perl,
+  libmldbm-perl, libtext-iconv-perl, libhtml-template-perl,
+  libclass-accessor-perl, liburi-perl, libxml-rss-perl, libtemplate-perl,
+  liblingua-stem-perl
+ 
+ Package: packages