From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 16 Jun 2015 11:02:17 +0000 (+0200)
Subject: Remove Geo Backend from debian auth build
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~78^2~1^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7c90cffb56e40041918cdad7dcfa9641c659e10;p=thirdparty%2Fpdns.git

Remove Geo Backend from debian auth build
---

diff --git a/build-scripts/debian-authoritative/config/pdns.local.geo.conf b/build-scripts/debian-authoritative/config/pdns.local.geo.conf
deleted file mode 100644
index 3eb85b53ea..0000000000
--- a/build-scripts/debian-authoritative/config/pdns.local.geo.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# geo Configuration
-#
-# See for more information /usr/share/doc/pdns-backend-geo/README
-#
-# geo-zone=
-# geo-soa-values=
-# geo-ns-records=
-# geo-ttl=
-# geo-ns-ttl=
-# geo-ip-map-zonefile=
-# geo-maps=
diff --git a/build-scripts/debian-authoritative/control b/build-scripts/debian-authoritative/control
index 7afa70ec72..6d87215c27 100644
--- a/build-scripts/debian-authoritative/control
+++ b/build-scripts/debian-authoritative/control
@@ -86,20 +86,6 @@ Description: LDAP backend for PowerDNS
  .
  This package contains an LDAP backend for the PowerDNS nameserver.
 
-Package: pdns-backend-geo
-Architecture: any
-Depends: pdns-server (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: pdns-backend
-Description: geo backend for PowerDNS
- PowerDNS is a versatile nameserver which supports a large number
- of different backends ranging from simple zonefiles to relational
- databases and load balancing/failover algorithms.
- PowerDNS tries to emphasize speed and security.
- .
- This package contains a geobackend for the PowerDNS nameserver. This backend
- balances the load throughout the world so that people access the
- geographically nearest available server.
-
 Package: pdns-backend-geoip
 Architecture: any
 Depends: pdns-server (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
diff --git a/build-scripts/debian-authoritative/pdns-backend-geo.docs b/build-scripts/debian-authoritative/pdns-backend-geo.docs
deleted file mode 100644
index b00a925d6a..0000000000
--- a/build-scripts/debian-authoritative/pdns-backend-geo.docs
+++ /dev/null
@@ -1 +0,0 @@
-modules/geobackend/README
diff --git a/build-scripts/debian-authoritative/pdns-backend-geo.examples b/build-scripts/debian-authoritative/pdns-backend-geo.examples
deleted file mode 100644
index ed419f855f..0000000000
--- a/build-scripts/debian-authoritative/pdns-backend-geo.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/config/pdns.local.geo.conf
diff --git a/build-scripts/debian-authoritative/pdns-backend-geo.install b/build-scripts/debian-authoritative/pdns-backend-geo.install
deleted file mode 100644
index 9d07378669..0000000000
--- a/build-scripts/debian-authoritative/pdns-backend-geo.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/pdns/libgeobackend.so*
diff --git a/build-scripts/debian-authoritative/pdns-backend-geo.postinst b/build-scripts/debian-authoritative/pdns-backend-geo.postinst
deleted file mode 100644
index 6511fad39f..0000000000
--- a/build-scripts/debian-authoritative/pdns-backend-geo.postinst
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# postinst script for pdns-backend-geo
-
-set -e
-
-if [ -n "$PDNSDEBUG" ]; then
-  echo "now debugging $0 $@"
-  set -x
-fi
-
-# Activate trigger
-dpkg-trigger pdns-server
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/build-scripts/debian-authoritative/pdns-backend-geo.prerm b/build-scripts/debian-authoritative/pdns-backend-geo.prerm
deleted file mode 100644
index 3298654dde..0000000000
--- a/build-scripts/debian-authoritative/pdns-backend-geo.prerm
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# Add call to init script to actually stop pdns.
-
-set -e
-
-if [ -x "/etc/init.d/pdns" ]; then
-	invoke-rc.d pdns stop || exit $?
-fi
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules
index 97d3ad8cf4..fd01f7c1a0 100755
--- a/build-scripts/debian-authoritative/rules
+++ b/build-scripts/debian-authoritative/rules
@@ -5,7 +5,7 @@ version := $(shell dpkg-parsechangelog -SVersion).$(shell dpkg-vendor --query Ve
 CXXFLAGS += -DPACKAGEVERSION='"$(version)"'
 
 # Backends
-backends := bind ldap pipe gmysql gpgsql gsqlite3 geo geoip lua lmdb mydns remote
+backends := bind ldap pipe gmysql gpgsql gsqlite3 geoip lua lmdb mydns remote
 
 DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)