From: Joey Hess Date: Thu, 8 Apr 2010 20:09:31 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/5daed5c65a8ad2578ab0df37d59c6bde04c384ab?hp=ce9cf967d01eb8e112c19d9f7b1c9a727717ef30 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- diff --git a/debian/changelog b/debian/changelog index 9acd11e60..e14cc91f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ ikiwiki (3.20100406) UNRELEASED; urgency=low them last name first. * sortnaturally: New plugin; the title_natural sort method has moved here. + [ Joey Hess ] + * Update dependency for git-core to git transition. + -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 ikiwiki (3.20100403) unstable; urgency=low diff --git a/debian/control b/debian/control index d7ce9a178..b8fe81914 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, libhtml-parser-perl, liburi-perl Recommends: gcc | c-compiler, libc6-dev | libc-dev, - subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs, + subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs, libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),