Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/bind9-cn into...

- resolve master/etch conflikte..
Conflicts:

	debian/changelog
	debian/control

diff --git a/README.CARNet b/README.CARNet
index 05f48ec..00ee3ef 100644 (file)
--- a/README.CARNet
+++ b/README.CARNet
@@ -9,4 +9,4 @@ razloga jer je to neprakticno i uglavnom nemoguce, vec se sistemci upucuju
 na iscitavanje primjera izgeneriranih konfiguracijskih datoteka koji se
 nalaze u examples/ direktoriju.
 
- -- Dinko Korunic <kreator@carnet.hr>  Sat,  8 Sep 2007 17:28:46 +0200
+ -- Dinko Korunic <kreator@CARNet.hr>  Sun, 12 Apr 2009 16:00:33 +0200

diff --git a/README.examples b/README.examples
index b8000ac..701e3ee 100644 (file)
--- a/README.examples
+++ b/README.examples
@@ -39,4 +39,4 @@ Bind9 posluzitelja i njihova znacenja:
   zaduzeno za sebe - pa to unosimo sa 127.0.0.1 adresom), kao i lokalnu
   domenu u kojem se racunalo nalazi.
 
- -- Dinko Korunic <kreator@carnet.hr>  Sat,  8 Sep 2007 18:06:23 +0200
+ -- Dinko Korunic <kreator@CARNet.hr>  Sun, 12 Apr 2009 16:00:46 +0200

diff --git a/debian/control b/debian/control
index c0d036a..ec104bd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: bind9-cn
 Section: net
 Priority: optional
-Maintainer: Dinko Korunic <kreator@carnet.hr>
+Maintainer: Dinko Korunic <kreator@CARNet.hr>
 Build-Depends: debhelper (>= 4)
 Standards-Version: 3.7.2
 

diff --git a/debian/postinst b/debian/postinst
index 4b0b4c8..7eee7e4 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -31,7 +31,7 @@ esac
 . /usr/share/carnet-tools/functions.sh
 
 echo "CN: Making sample configurations in /usr/share/doc/bind9-cn/examples"
-echo "CN: Make sure you read them and apply *before* running Bind9 service!"
+echo "CN: Make sure you change them appropriately *before* running Bind9 service!"
 
 #variables
 cp_get_ifaddr
@@ -130,7 +130,6 @@ cat > /usr/share/doc/bind9-cn/examples/hosts.rev <<EOF
     NS  $CARNET_HOSTNAME.$CARNET_DOMAINNAME.
     NS  bjesomar.srce.hr.
 
-1   PTR localhost.$CARNET_DOMAINNAME.
 $BROJ   PTR   $CARNET_HOSTNAME.$CARNET_DOMAINNAME.
 EOF