From: Aki Tuomi <cmouse@cmouse.fi>
Date: Tue, 14 May 2013 19:44:57 +0000 (+0300)
Subject: Removed some debian specifics
X-Git-Tag: auth-3.3-rc1~29^2~5^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4749ecb1ab0223c4c8ca2ef1ba8936659a9d4716;p=thirdparty%2Fpdns.git

Removed some debian specifics
---

diff --git a/debian/pdns-server.install b/debian/pdns-server.install
index a8c9b4f1cb..ed942c7340 100644
--- a/debian/pdns-server.install
+++ b/debian/pdns-server.install
@@ -1,7 +1,9 @@
 debian/tmp/usr/bin/pdns_control usr/bin/
 debian/tmp/usr/bin/zone2sql usr/bin/
 debian/tmp/usr/bin/zone2json usr/bin/
+debian/tmp/usr/bin/zone2ldap usr/bin/
 debian/tmp/usr/bin/pdnssec usr/bin/
+debian/tmp/usr/bin/dnsreplay usr/bin/
 debian/tmp/usr/sbin/pdns_server usr/sbin/
 debian/config/pdns.conf usr/share/pdns-server/
 debian/default/pdns usr/share/pdns-server/
diff --git a/debian/pdns-server.manpages b/debian/pdns-server.manpages
index 0715169e28..c3510f8823 100644
--- a/debian/pdns-server.manpages
+++ b/debian/pdns-server.manpages
@@ -1,6 +1,4 @@
 debian/tmp/usr/share/man/man8/dnsreplay.8
-debian/tmp/usr/share/man/man8/dnsscope.8
-debian/tmp/usr/share/man/man8/dnswasher.8
 debian/tmp/usr/share/man/man8/pdns_control.8
 debian/tmp/usr/share/man/man8/pdnssec.8
 debian/tmp/usr/share/man/man8/pdns_server.8
diff --git a/debian/pdns-server.postinst b/debian/pdns-server.postinst
index 41c904271d..9d770101f5 100644
--- a/debian/pdns-server.postinst
+++ b/debian/pdns-server.postinst
@@ -15,11 +15,9 @@ fi
 if [ -z "$PDNSDIR" ]; then
   PDNSDIR=/etc/powerdns/pdns.d
 fi
-PDNSLOCAL=$PDNSDIR/pdns.local
 
 # Temporary files
 PDNSCONFTEMP=`mktemp`
-PDNSLOCALTEMP=`mktemp`
 PDNSDEFAULTTEMP=`mktemp`
 
 case "$1" in
@@ -35,7 +33,6 @@ case "$1" in
 
     # Fill the temporary files with config items.
     cat /usr/share/pdns-server/pdns.conf > $PDNSCONFTEMP
-    cat /usr/share/pdns-server/pdns.local > $PDNSLOCALTEMP
     cat /usr/share/pdns-server/pdns > $PDNSDEFAULTTEMP
 
     # Do we listen on a specified address
@@ -60,19 +57,17 @@ case "$1" in
     # Install the new configuration files if the user wants it.
     ucf --debconf-ok $PDNSCONFTEMP $PDNSCONF
     ucf --debconf-ok $PDNSDEFAULTTEMP $PDNSDEFAULT
-    ucf --debconf-ok $PDNSLOCALTEMP $PDNSLOCAL
 
     # Stop the debconf stuff
     db_stop || true
 
     # Clean up temporary files.
-    rm -f $PDNSCONFTEMP $PDNSDEFAULTTEMP $PDNSLOCALTEMP
+    rm -f $PDNSCONFTEMP $PDNSDEFAULTTEMP 
 
     # There could be passwords in these files. PowerDNS first reads the
     # configuration files and then drop root privileges.
     if [ -z "$2" ]; then
-      chmod 0600 $PDNSCONF $PDNSLOCAL
-      chmod 0700 $PDNSDIR
+      chmod 0600 $PDNSCONF 
     fi
   ;;
 
diff --git a/debian/pdns-server.postrm b/debian/pdns-server.postrm
index f16428f04b..640e5f0ffc 100644
--- a/debian/pdns-server.postrm
+++ b/debian/pdns-server.postrm
@@ -14,15 +14,12 @@ case "$1" in
     for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist; do
       rm -f /etc/powerdns/pdns.conf$ext
       rm -f /etc/default/pdns$ext
-      rm -f /etc/powerdns/pdns.d/pdns.local$ext
     done
     rm -f /etc/powerdns/pdns.conf
     rm -f /etc/default/pdns
-    rm -f /etc/powerdns/pdns.d/pdns.local
     if [ -x /usr/bin/ucf ]; then
       ucf --purge /etc/powerdns/pdns.conf
       ucf --purge /etc/default/pdns
-      ucf --purge /etc/powerdns/pdns.d/pdns.local
     fi
   ;;