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

[git.ikiwiki.info.git] / debian / control

diff --git a/debian/control b/debian/control
index 97d060505f803b12b4b14723f8fb472ea34680dd..69cef567112153a0c3b77f231f11640a6b36b53c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Uploaders: Josh Triplett <josh@freedesktop.org>
 Standards-Version: 3.9.2
 Homepage: http://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/
 Standards-Version: 3.9.2
 Homepage: http://ikiwiki.info/
 Vcs-Git: git://git.ikiwiki.info/

-Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki

 
 Package: ikiwiki
 Architecture: all
 
 Package: ikiwiki
 Architecture: all


@@ -23,7 +22,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,
   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),
   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),


@@ -55,6 +54,6 @@ Description: a wiki compiler
  resolution, and page locking.
  .
  Ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
  resolution, and page locking.
  .
  Ikiwiki also supports generating news feeds (RSS and Atom) and blogging.

- ikiwiki provides a plugin system which allows many other features to be
+ Ikiwiki provides a plugin system which allows many other features to be

  added. Some of the plugins have additional dependencies, found among the
  Recommends and Suggests of this package.
  added. Some of the plugins have additional dependencies, found among the
  Recommends and Suggests of this package.