aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-06-02 05:32:20 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-06-02 05:32:20 +0000
commit30afedcfe2799bb6cc4bf329bd273ad9d8dd6da3 (patch)
tree900d3e110a304973171b47d40977b29db24d5e7c /debian
parentc0f8126143852a2b1e47e2b8a7310ef6bd43bf18 (diff)
downloadikiwiki-30afedcfe2799bb6cc4bf329bd273ad9d8dd6da3.tar
ikiwiki-30afedcfe2799bb6cc4bf329bd273ad9d8dd6da3.tar.gz
* Add support for using git instead of subversion as the RCS backend,
tremendous thanks to Recai Oktaş for this. * Doc updates for git.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/control6
2 files changed, 7 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index e60eb9a3e..1f1f2a83a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,11 @@ ikiwiki (1.5) UNRELEASED; urgency=low
can be useful when using link-based globbing for page categorisation.
* Remove preprocessor directives from inlined pages.
* Allow simple preprocessor directive values to be specified w/o quotes.
+ * Add support for using git instead of subversion as the RCS backend,
+ tremendous thanks to Recai Oktaş for this.
+ * Doc updates for git.
- -- Joey Hess <joeyh@debian.org> Thu, 1 Jun 2006 23:47:43 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 2 Jun 2006 01:13:18 -0400
ikiwiki (1.4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index bd3921549..a475f69e3 100644
--- a/debian/control
+++ b/debian/control
@@ -9,17 +9,17 @@ Standards-Version: 3.7.2
Package: ikiwiki
Architecture: all
Depends: ${perl:Depends}, markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, libcgi-formbuilder-perl (>= 3.02.02), libtime-duration-perl, libcgi-session-perl, libmail-sendmail-perl, gcc | c-compiler, libc6-dev | libc-dev
-Recommends: subversion, hyperestraier
+Recommends: subversion | git-core, hyperestraier
Suggests: viewcvs
Description: a wiki compiler
ikiwiki converts a directory full of wiki pages into html pages suitable
for publishing on a website. Unlike many wikis, ikiwiki does not have its
own means of storing page history or its own markup language. Instead it
- uses subversion and markdown.
+ uses subversion (or git) and markdown.
.
ikiwiki implements all of the other standard features of a wiki, including
web-based page editing, user registration and logins, a RecentChanges
- page, BackLinks, search, Discussion pages, smart merging and conflict
+ page, BackLinks, search, Discussion pages, tags, smart merging and conflict
resolution, page locking, and commit emails.
.
It also supports generating RSS feeds and blogging.