From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 20 Jun 2008 23:25:14 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=4016d6838e985b347884a49807d0c7cb97041cad;p=deb%2Fpackages.git

Merge branch 'master' into debian-master

Conflicts:

	debian/control
---

4016d6838e985b347884a49807d0c7cb97041cad
diff --cc debian/control
index 840b4f7,3af54e0..5ca566a
--- a/debian/control
+++ b/debian/control
@@@ -1,5 -1,5 +1,5 @@@
  Source: packages
- Build-Depends: rsync, dpkg-dev, procmail,
 -Build-Depends: git-core, rsync, dpkg-dev, procmail, gettext,
++Build-Depends: rsync, dpkg-dev, procmail, gettext,
   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,