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

Merge commit 'origin/master' into debian-master

Conflicts:

	config.sh.sed.in
---

0d85baeffdbee362e50be7df7d5910be85a81191
diff --cc config.sh.sed.in
index f0ee0c7,e1ac8c7..a6d9b78
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -37,9 -37,8 +37,9 @@@ root="
  
  # Architectures
  #
- polangs="de fi fr hu nl uk"
 -polangs="de fi fr hu ja nl 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"
++polangs="de fi fr ja hu nl 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"
 +#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"