diff --git a/README b/README index 454aa843b..f5b128d8a 100644 --- a/README +++ b/README @@ -1,4 +1,5 @@ Use ./Makefile.PL to generate a Makefile, "make" will build the documentation wiki and a man page, and "make install" will install ikiwiki. -All other documentation is in the ikiwiki documentation wiki. +All other documentation is in the ikiwiki documentation wiki, which is also +available online at diff --git a/debian/README.Debian b/debian/README.Debian index 3bdeb2a3a..8094c1b7e 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -5,4 +5,5 @@ to automate it anyway. This Debian package of ikiwiki supports rebuilding wikis on upgrade. The file /etc/ikiwiki/wikilist lists the setup files of wikis to rebuild, as -well as the user who owns the wiki. +well as the user who owns the wiki. Edit this file and add any wikis you +set up. diff --git a/debian/changelog b/debian/changelog index 460b260d0..e1eb57710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -ikiwiki (0.2) unstable; urgency=low +ikiwiki (1.0) unstable; urgency=low - * Initial release. + * First official release. - -- Joey Hess Tue, 14 Mar 2006 22:44:16 -0500 + -- Joey Hess Tue, 25 Apr 2006 02:08:17 -0400 diff --git a/debian/control b/debian/control index 66c21e8a5..e55c1ff3c 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: ikiwiki Section: web Priority: optional -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0), markdown, libhtml-template-perl, libhtml-scrubber-perl +Build-Depends: debhelper (>= 5) +Build-Depends-Indep: dpkg-dev (>= 1.9.0), markdown, libhtml-template-perl, libhtml-scrubber-perl Maintainer: Joey Hess Standards-Version: 3.6.2 @@ -16,6 +17,9 @@ Description: a wiki compiler own means of storing page history or its own markup language. Instead it uses subversion and markdown. . - ikiwiki implements most of the other standard features of a wiki, including - web-based page editing, user registration and logins, and a RecentChanges - page. It also supports generating weblogs. + 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 + resolution, page locking, and commit emails. + . + It also supports generating RSS feeds and blogging. diff --git a/debian/rules b/debian/rules index 74206370b..ca65e3d5d 100755 --- a/debian/rules +++ b/debian/rules @@ -26,8 +26,6 @@ binary-indep: build dh_install debian/wikilist etc/ikiwiki dh_installdocs html dh_link usr/share/common-licenses/GPL usr/share/doc/ikiwiki/html/GPL - dh_link usr/share/ikiwiki/basewiki \ - usr/share/doc/ikiwiki/examples/basewiki dh_installchangelogs dh_compress -X html dh_fixperms