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/debian/changelog b/debian/changelog
index ca3a030..7e2566b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,8 @@
-bind9-cn (2:9.5.1-3) stable; urgency=low
+bind9-cn (2:9.3.4-1) stable; urgency=low
 
-  * ispravan epoch depend (ispravlja bug #6848)
+  * ispravni dependancyji za Etch (verzija, epoch)
 
- -- Dinko Korunic <kreator@carnet.hr>  Fri,  8 May 2009 15:19:02 +0200
-
-bind9-cn (2:9.5.1-2) stable; urgency=low
-
-  * minimalni zahvat na primjerima da ne sadrzavaju "1 PTR" za lokalnu domenu
-    sto je u principu neispravno
-
- -- Dinko Korunic <kreator@carnet.hr>  Fri,  1 May 2009 12:39:55 +0200
-
-bind9-cn (2:9.5.1-1) stable; urgency=low
-
-  * novi paket za Debian Lenny
-
- -- Dinko Korunic <kreator@carnet.hr>  Sun, 12 Apr 2009 15:30:35 +0200
+ -- Dinko Korunic <kreator@carnet.hr>  Sat,  9 May 2009 12:22:12 +0200
 
 bind9-cn (2:9.2.4-3) stable; urgency=low
 

diff --git a/debian/control b/debian/control
index 3376d24..ec104bd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Standards-Version: 3.7.2
 
 Package: bind9-cn
 Architecture: all
-Depends: bind9 (>= 1:9.5.1.dfsg.P1-2), carnet-tools-cn (>= 2.8.1)
-Recommends: bind9-doc (>= 1:9.5.1.dfsg.P1-2), bind9-host (>= 1:9.5.1.dfsg.P1-2), dnsutils, dnswalk, nslint
+Depends: bind9 (>= 1:9.3.4-2etch4), carnet-tools-cn (>= 2.1.8)
+Recommends: bind9-doc (>= 1:9.3.4-2etch4), bind9-host (>= 1:9.3.4-2etch4), dnsutils, dnswalk
 Description: Internet Domain Name Server
  The Berkeley Internet Name Domain (BIND) implements an Internet domain
  name server. BIND is the most widely-used name server software on the