The following commit has been merged in the debian-master branch:
commit 4016d6838e985b347884a49807d0c7cb97041cad
Merge: b689b79b3a6d8cf48f1207286efeeb28b168cd01
a03f40020435a3fc1bca19e8cc4d3613ff6e882f
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Sat Jun 21 01:25:14 2008 +0200
Merge branch 'master' into debian-master
Conflicts:
debian/control
diff --combined 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,
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
