Cope with moved changelogs.

diff --git a/configure.in b/configure.in
index 4eb36c08855ec9ded3ae6b8f6c5d6f13c58a9189..a97feaef3e4aafe8f69f0a15d22a2f8bc530256e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -147,7 +147,7 @@ fi
 [CFLAGS="`echo $CFLAGS $CWARNS | sed -e 's/-O[0-9]*/$(OPTIMISE)/'`"]
 
 AC_SUBST(VERSION)
-VERSION="`sed -n '/^userv (.*)/!d; s/^userv (//; s/).*//; p; q' Changelog`"
+VERSION="`sed -n '/^userv (.*)/!d; s/^userv (//; s/).*//; p; q' debian/changelog`"
 echo will build version $VERSION
 
 AC_OUTPUT(Makefile)

diff --git a/debian/rules b/debian/rules
index 225bcfc90bcdd379f9741c04ae4f061cab88bc49..465d2a73c0541f56ae466453253654384435e92e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,11 +38,11 @@ binary-arch:        checkroot build
                VEREXT=$(verext) \
                prefix=debian/tmp/usr etcdir=debian/tmp/etc install
        cp debian/copyright debian/tmp/usr/doc/$(package)/.
-       cp debian/changelog debian/tmp/usr/doc/$(package)/changelog.Debian
+       cp debian/changelog debian/tmp/usr/doc/$(package)/changelog
        cp README debian/tmp/usr/doc/$(package)/README.upstream
-       cp Changelog debian/tmp/usr/doc/$(package)/changelog
        cp system.default system.override debian/tmp/usr/doc/$(package)/examples
-       gzip -9v debian/tmp/usr/doc/$(package)/changelog{,.Debian}
+       gzip -9v debian/tmp/usr/doc/$(package)/changelog
+       ln -s changelog.gz debian/tmp/usr/doc/$(package)/changelog.Debian.gz
        cp -a spec.html debian/tmp/usr/doc/$(package)/
        dpkg-shlibdeps daemon client
        dpkg-gencontrol