Adjust for debian-pdns/ to debian/ move

diff --git a/Makefile.am b/Makefile.am
index 1fd06aa2c0358e9798e9a6566f1c004cc62e1178..fb6e2637883376e4703534398a04a0d07e2980ac 100644 (file)
--- 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 25f9cd03e07ef6ed0d303059671c441707890906..4c21836344a76aa6dbdd866b130ad219f9d6b264 100755 (executable)
--- 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