releasing version 1.0

diff --git a/README b/README
index 454aa843b03ec02fc072d5caec719aa0040b54e8..f5b128d8a51984e15ebc300856cffd1295e2aa04 100644 (file)
--- 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.
 
 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 <http://ikiwiki.kitenet.net/>

diff --git a/debian/README.Debian b/debian/README.Debian
index 3bdeb2a3aa15244dd48163153e08de987e3994fb..8094c1b7e680cf83d7a3f0697e4fd69e2ae57d20 100644 (file)
--- 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
 
 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 460b260d0dfbcc2ebd4a7954a333b436ac664e6a..e1eb577100c8abb1cb08e3b8a412ed6098cdd71a 100644 (file)
--- 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 <joeyh@debian.org>  Tue, 14 Mar 2006 22:44:16 -0500
+ -- Joey Hess <joeyh@debian.org>  Tue, 25 Apr 2006 02:08:17 -0400

diff --git a/debian/control b/debian/control
index 66c21e8a575f0a3fb106145196c0bf1cce80a33c..e55c1ff3c0e2b3c6211cc8ee0f6498f1fbe7be75 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ikiwiki
 Section: web
 Priority: optional
 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 <joeyh@debian.org>
 Standards-Version: 3.6.2
 
 Maintainer: Joey Hess <joeyh@debian.org>
 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.
  .
  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 74206370b1c65ee107adfe4f2c85b881fc099788..ca65e3d5d4f83a3618ca2392cc12845e2a8bbb01 100755 (executable)
--- 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_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
        dh_installchangelogs
        dh_compress -X html
        dh_fixperms