diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/NEWS | 14 | ||||
| -rw-r--r-- | debian/README.Debian | 7 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | debian/postinst | 25 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/wikilist | 5 |
6 files changed, 22 insertions, 36 deletions
diff --git a/debian/NEWS b/debian/NEWS index 5bb107519..565ca21fc 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,5 +1,7 @@ ikiwiki (1.1) unstable; urgency=low + There have been several configuration changes in this release of ikiwiki: + The --svn and --no-svn switches are removed, instead you should use --rcs=svn or --no-rcs. ikiwiki setup files that set svn => 1 should be changed to set rcs => "svn"; if your setup file sets svn => 0 @@ -7,15 +9,21 @@ ikiwiki (1.1) unstable; urgency=low The --hyperestraier switch is gone too. To enable searching, turn on the search plugin, by passing --plugin=search or through the plugin setting in - the config file. + the setup file. The --sanitize and --no-sanitize switches are also gone, replaced with the htmlscrubber plugin. This plugin is enabled by default, to disable it, use --disable-plugin=htmlscrubber, or modify the plugin setting in the - config file. + setup file. + + If your wiki is configured with a setup file, you will need to add a line + to enable Discussion links at the top of pages: + discussion => 1, + Discussion pages are enabled by default, but old setup files won't enable + them unless you add tat line. You will need to rebuild your wiki when upgrading to this version. If you listed your wiki in /etc/ikiwiki/wikilist this will be done - automatically. + automatically when the Debian package is upgraded. -- Joey Hess <joeyh@debian.org> Tue, 2 May 2006 14:13:59 -0400 diff --git a/debian/README.Debian b/debian/README.Debian index 8094c1b7e..7791b9a7f 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -3,7 +3,8 @@ when upgrading to a new version of ikiwiki. If you have a lot of different wikis on a system, this can be a pain to do by hand, and it's a good idea 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. Edit this file and add any wikis you +This Debian package of ikiwiki supports rebuilding wikis on upgrade. It +will run ikiwiki-mass-rebuild if necessary when upgraded. The file +/etc/ikiwiki/wikilist lists the setup files of wikis to rebuild, as wel +l 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 0d86597fc..b3d70190c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,8 +46,11 @@ ikiwiki (1.1) UNRELEASED; urgency=low * Removed --sanitize and --no-sanitize, replaced with --plugin htmlscrubber and --disable-plugin htmlscrubber. * Allow discussion links on pages to be turned off with --no-discussion. + * Add ikiwiki-mass-rebuild script, ripped out of the postinst. + * Add some new config items to the estseek.conf template, which are needed + by hyperestraier 1.2.3. - -- Joey Hess <joeyh@debian.org> Fri, 5 May 2006 14:03:54 -0400 + -- Joey Hess <joeyh@debian.org> Fri, 5 May 2006 16:23:03 -0400 ikiwiki (1.0) unstable; urgency=low diff --git a/debian/postinst b/debian/postinst index b9630b525..76d826357 100755 --- a/debian/postinst +++ b/debian/postinst @@ -6,28 +6,7 @@ set -e # rebuilding all wikis. firstcompat=1.1 -wikilist=/etc/ikiwiki/wikilist - -processline () { - user="$1" - setup="$2" - - if [ -z "$user" ] || [ -z "$setup" ]; then - echo "parse failure in /etc/ikiwiki/wikilist, line: '$user $setup'" >&2 - exit 1 - fi - - if [ ! -f "$setup" ]; then - echo "warning: $setup specified in /etc/ikiwiki/wikilist does not exist, skipping" >&2 - else - echo "Rebuilding $setup as user $user ..." - su "$user" -c "ikiwiki -setup $setup" - fi -} - -if [ "$1" = configure ] && [ -e $wikilist ] && \ +if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then - grep -v '^#' $wikilist | grep -v '^$' | while read line; do - processline $line - done + ikiwiki-mass-rebuild fi diff --git a/debian/rules b/debian/rules index df8390f94..6b5a0377e 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ binary-indep: build dh_clean -k $(MAKE) pure_install INSTALLDIRS=vendor \ PREFIX=$(shell pwd)/debian/ikiwiki/$(shell perl -MConfig -e 'print $$Config{prefix}') - dh_install debian/wikilist etc/ikiwiki + dh_install wikilist etc dh_installdocs html dh_link usr/share/common-licenses/GPL usr/share/doc/ikiwiki/html/GPL dh_installchangelogs diff --git a/debian/wikilist b/debian/wikilist deleted file mode 100644 index 4e7c81fd7..000000000 --- a/debian/wikilist +++ /dev/null @@ -1,5 +0,0 @@ -# This file is used by the Debian package of ikiwiki to rebuild the listed -# wikis when it is upgraded. The postinst script su's to the listed user -# and then runs ikiwiki -setup on the specified ikiwiki setup file. - -#joey /home/joey/.ikiwiki/ikiwiki.setup |