diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | debian/preinst | 13 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index a636a45f8..63f62e7ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -ikiwiki (1.2) UNRELEASED; urgency=low +ikiwiki (1.2) unstable; urgency=low * Remove dups from the brokenlinks list. * Add libc6-dev to dependencies, needed to build wrappers. + * Install wikilist in correct location. Closes: #367371 - -- Joey Hess <joeyh@debian.org> Mon, 8 May 2006 19:00:16 -0400 + -- Joey Hess <joeyh@debian.org> Mon, 15 May 2006 10:53:49 -0500 ikiwiki (1.1) unstable; urgency=low diff --git a/debian/preinst b/debian/preinst new file mode 100755 index 000000000..e566939f6 --- /dev/null +++ b/debian/preinst @@ -0,0 +1,13 @@ +#!/bin/sh + +#DEBHELPER# + +if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 1.2; then + if [ -e /etc/wikilist ]; then + if [ ! -e /etc/ikiwiki/wikilist ]; then + mv -f /etc/wikilist /etc/ikiwiki/wikilist + else + rm -f /etc/wikilist + fi + fi +fi diff --git a/debian/rules b/debian/rules index 6b5a0377e..48ce274db 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 wikilist etc + dh_install wikilist etc/ikiwiki dh_installdocs html dh_link usr/share/common-licenses/GPL usr/share/doc/ikiwiki/html/GPL dh_installchangelogs |