From: Ivan Rako <Ivan.Rako@CARNet.hr>
Date: Mon, 28 Mar 2005 03:22:51 +0000 (+0000)
Subject: r25:
X-Git-Tag: debian/3.0.0~81
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=commitdiff_plain;h=f1a33ea121eeb71934cf3d6ed1c524841de6f995

r25:
---

diff --git a/README.CARNet b/README.CARNet
index 1490ecf..0beb926 100644
--- a/README.CARNet
+++ b/README.CARNet
@@ -85,5 +85,9 @@ $CP_SCRIPT_DEBUG
 $CP_ECHO_RETURN
 
 	Vracanje rezultata na stdout i u varijabli $RET.
+	Ako se cp_ funkcija koja vraca string poziva unutar neke druge cp_
+	funkcije, treba iskljucivo koristiti $RET konvenciju, i sacuvati
+	prethodno stanje varijable CP_ECHO_RETURN.
+
 
 -- Ivan 'ico' Rako <irako@srce.hr>  Wed, 16 Mar 2005 14:25:14 +0100
diff --git a/debian/control b/debian/control
index 4b8f96b..9726265 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,10 @@ Standards-Version: 3.6.1
 
 Package: carnet-tools-cn
 Architecture: all
-Depends: perl, coreutils, debianutils, awk | mawk | gawk, ipcalc, net-tools
+Depends: perl, coreutils, debianutils, awk, ipcalc, net-tools
+Conflicts: carnet-tools
+Provides: carnet-tools
+Replaces: carnet-tools
 Description: CARNet tools for Debian packaging
  CARNet tools for Debian packaging. Include:
   - functions.sh