r7: php5-cn (5.2.0-2) stable; urgency=low

  * control datoteka, dodano:  Conflicts: php4-cn

diff --git a/debian/changelog b/debian/changelog
index bbfbfb2..2dbcc17 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+php5-cn (5.2.0-2) stable; urgency=low
+
+  * control datoteka, dodano:  Conflicts: php4-cn
+
+ -- Dragan Dosen <ddosen@ffzg.hr>  Thu, 27 Dec 2007 16:59:15 +0100
+
 php5-cn (5.2.0-1) stable; urgency=low
 
   * Inicijalni paket za Debian etch distribuciju

diff --git a/debian/control b/debian/control
index e41dd48..9d9ac19 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Package: php5-cn
 Architecture: all
 Pre-Depends: apache2-cn, apache2.2-common
 Depends: libapache2-mod-php5, php5-cgi, php5-cli, php5-gd, php5-ldap, php5-mysql, libpcre3, carnet-tools-cn (>= 2.4)
+Conflicts: php4-cn
 Description: server-side, HTML-embedded scripting language (CARNet configuration)
  This package is a meta-package that, when installed, guarantees that you
  have at least one of the four server-side versions of the PHP5 interpreter