summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-05-15 16:00:34 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-05-15 16:00:34 +0000
commit5f280af23ce105beba10fe5d5e9699269f8b531a (patch)
tree2ae8a1166bac00f56354b7b73f6c002b66d9399b /debian
parent694eb98d3e186ff2db26415e80e71651a7cb571e (diff)
releasing version 1.2
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rwxr-xr-xdebian/preinst13
-rwxr-xr-xdebian/rules2
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