* Add an additional note to README.Debian: iodine's versions on the server

  and the client have to match.
* debian/rules: separate DESTDIR and prefix on make install.

diff --git a/debian/README.Debian b/debian/README.Debian
index e299adad6f31b5248e1720f52366447f97896745..8fb6c7525af0b36c15655429efb9199f1c4158c9 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,6 +2,7 @@ iodine for Debian
 -----------------
 
 * Please note that iodine(d) needs the tun kernel module.
+* Please note that iodine expects the same version on the server and the client.
 * Instruction for setting up the infrastructure (including delegating a new
   subdomain) are included in /usr/share/doc/iodine/README and in iodined(8).
 * /usr/share/doc/iodine/examples contains an example script for setting up a

diff --git a/debian/changelog b/debian/changelog
index 55fb5dbd4b0ba6a8374eb1d2573c41bdc3446dbd..b34d6dc8b6546005317456c3c2204f15aa89e7f7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ iodine (0.4.2-1) UNRELEASED; urgency=low
       (closes: #477692)
     - drop patches 01_mandir.patch and 02_make.patch included upstream
     - refresh patches 03_cflags.patch  and 04_base64.patch
+  * Add an additional note to README.Debian: iodine's versions on the server
+    and the client have to match.
+  * debian/rules: separate DESTDIR and prefix on make install.
 
  -- gregor herrmann <gregoa@debian.org>  Fri, 08 Aug 2008 15:22:19 -0300
 

diff --git a/debian/rules b/debian/rules
index 1191b902cfaa8d3aa61c8355fa97d98f5de9d620..7fb5d28ad44731ab8fa661c5f17ce9e257e45d48 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ install: install-stamp
 install-stamp: build-stamp
        dh_testdir
        dh_testroot
-       $(MAKE) install prefix=debian/iodine/usr
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/iodine prefix=/usr
        touch $@