From: Frank Lichtenheld 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;p=deb%2Fpackages.git Merge commit 'alioth/master' into debian-master Conflicts: config.sh.sed.in debian/control lib/Packages/Dispatcher.pm --- 8290599bd43de836a8a02b547a1b1b41f9f25871 diff --cc debian/control index 3cc7ffb,03c841a..840b4f7 --- a/debian/control +++ b/debian/control @@@ -1,6 -1,6 +1,6 @@@ 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, + 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, libclass-accessor-perl, liburi-perl, libxml-rss-perl, libtemplate-perl, diff --cc templates/config.tmpl index 86e7cc9,1fee16b..26827e4 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -49,7 -49,10 +49,11 @@@ -%] [%- # possible values for importance: high, normal, low - sitewidemsg = { importance => "high", - txt => g('Please note that this is an experimental version of packages.debian.org. Errors and obsolete information should be expected') } +# sitewidemsg = { importance => "high", +# txt => g('Please note that this is an experimental version of packages.debian.org. 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('.'), + thousands_sep => g(','), + decimal_fill => 1 ) -%]