]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b689b79 a03f400)
Merge branch 'master' into debian-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Fri, 20 Jun 2008 23:25:14 +0000 (01:25 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Fri, 20 Jun 2008 23:25:14 +0000 (01:25 +0200)
Conflicts:

debian/control

1  2 
debian/control patch | diff1 | diff2 | blob | history

diff --cc debian/control
index 840b4f73567d129b3c936eeb394aad003cbed156,3af54e020d187d0622dc790cc11fef08415b7168..5ca566ae37baafa43b75ae3cda4dbc2e6357e404
--- 1/debian/control
--- 2/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,