From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 7 Oct 2014 07:42:01 +0000 (+0200)
Subject: Adjust for debian-pdns/ to debian/ move
X-Git-Tag: rec-3.7.0-rc1~215^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18bc21aa206ab4132e127bf0ef87dc97f12aca17;p=thirdparty%2Fpdns.git

Adjust for debian-pdns/ to debian/ move
---

diff --git a/Makefile.am b/Makefile.am
index 1fd06aa2c0..fb6e263788 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=modules codedocs @programdescend@
 DIST_SUBDIRS=modules codedocs pdns
-EXTRA_DIST=README INSTALL NOTICE debian-pdns pdns.spec  \
+EXTRA_DIST=README INSTALL NOTICE debian pdns.spec \
 codedocs/doxygen.conf contrib/powerdns.solaris.init.d \
 contrib/systemd-pdns.service contrib/systemd-pdns-recursor.service \
 bootstrap build-scripts/semistaticg++ pdns/docs/dnstcpbench.1 \
diff --git a/build-scripts/set-version-auth b/build-scripts/set-version-auth
index 25f9cd03e0..4c21836344 100755
--- a/build-scripts/set-version-auth
+++ b/build-scripts/set-version-auth
@@ -9,6 +9,6 @@ DIST_HOST="$(id -u -n)@$(hostname -f)"
 sed -r "s/Version: (.*)/Version: $RPM_VERSION/" -i pdns.spec
 sed -r "s/AC_INIT\(\[pdns\],(.*)/AC_INIT([pdns], [$VERSION])/" -i configure.ac
 sed -r "s/^(.*)AC_SUBST\(\[DIST_HOST\],(.*)/AC_SUBST([DIST_HOST], [$DIST_HOST])/" -i configure.ac
-sed -r "1 s/^pdns \\(([^)]*)-([0-9.])\\)/pdns \\($DEB_VERSION-\\2\\)/" -i debian-pdns/changelog
+sed -r "1 s/^pdns \\(([^)]*)-([0-9.])\\)/pdns \\($DEB_VERSION-\\2\\)/" -i debian/changelog
 
 sed -r "s/#VERSION#/$VERSION/" -i build-scripts/redhat/pdns-server-test.spec