From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Nov 2011 20:06:58 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111107~56
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d36d4c4ce5acc44780a4dbcc95a1d2bceee8caa2?hp=7cd083dc66f80a3c27e8717aa0da1465b4e9b9ef

Merge branch 'master' of ssh://git.ikiwiki.info
---

diff --git a/debian/control b/debian/control
index 03b3ea8b3..ee59c8515 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends},
   libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-perl, libjson-perl
 Recommends: gcc | c-compiler, 
   libc6-dev | libc-dev,
-  subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
+  git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
   libxml-simple-perl, libnet-openid-consumer-perl, libcrypt-ssleay-perl,
   liblwpx-paranoidagent-perl, libtimedate-perl,
   libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),