releasing version 1.2

diff --git a/debian/changelog b/debian/changelog
index a636a45f87f04f247413881252103bea2c6f3125..63f62e7ce9a3bb633d805357e754cfdbd6c1531e 100644 (file)
--- 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.
 
   * 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
 
 
 ikiwiki (1.1) unstable; urgency=low
 

diff --git a/debian/preinst b/debian/preinst
new file mode 100755 (executable)
index 0000000..e566939
--- /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 6b5a0377e85b7e7fb2d5e50eb90698aeb8264ecb..48ce274db6e1908eb5bf9ae11955140a218c336e 100755 (executable)
--- 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_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
        dh_installdocs html
        dh_link usr/share/common-licenses/GPL usr/share/doc/ikiwiki/html/GPL
        dh_installchangelogs