# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1296835603 -3600
# Node ID 93d0091756cf5f2cea6ca00599d496a1ff0ba533
# Parent  d49009465257f3f597a1607a4a803a8c6fc1c10b
Up: ocsinventory ocsinventory-server ocsreports(1.3.3)

diff -r d49009465257 -r 93d0091756cf ocsinventory-server/receipt
--- a/ocsinventory-server/receipt	Fri Feb 04 05:30:52 2011 +0000
+++ b/ocsinventory-server/receipt	Fri Feb 04 17:06:43 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="ocsinventory-server"
-VERSION="1.02.1"
+VERSION="1.3.3"
 CATEGORY="network"
 SHORT_DESC="Iventory and package deployment system"
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -27,13 +27,13 @@
 	install -o root -g www -m 0775 -d $fs/var/lib/ocsinventory-server/download
 	
 	mkdir -p $fs/etc/logrotate.d
-	cp -f $src/Apache/etc/logrotate.d/ocsinventory-server \
+	cp -f $src/etc/logrotate.d/ocsinventory-server \
 		$fs/etc/logrotate.d/ocsinventory-server
 	sed -i "s#PATH_TO_LOG_DIRECTORY#/var/log/ocsinventory-server#g" \
 		$fs/etc/logrotate.d/ocsinventory-server 
 	
 	mkdir -p $fs/etc/apache/conf.d
-	cp $src/Apache/etc/ocsinventory/ocsinventory-server.conf \
+	cp $src/etc/ocsinventory/ocsinventory-server.conf \
 		$fs/etc/apache/conf.d/ocsinventory-server.conf
 	sed -i  -e "s#DATABASE_SERVER#localhost#g" \
 		-e "s#DATABASE_PORT#3306#g" \
diff -r d49009465257 -r 93d0091756cf ocsinventory/receipt
--- a/ocsinventory/receipt	Fri Feb 04 05:30:52 2011 +0000
+++ b/ocsinventory/receipt	Fri Feb 04 17:06:43 2011 +0100
@@ -2,14 +2,14 @@
 # SliTaz package receipt.
 
 PACKAGE="ocsinventory"
-VERSION="1.02.1"
+VERSION="1.3.3"
 CATEGORY="meta"
 SHORT_DESC="Automated inventory and deployement system."
 MAINTAINER="pascal.bellard@slitaz.org"
 SOURCE="OCSNG_UNIX_SERVER"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.ocsinventory-ng.org/"
-WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+WGET_URL="http://launchpad.net/ocsinventory-server/stable-1.3/$VERSION/+download/$TARBALL"
 DEPENDS="ocsinventory-server ocsinventory-agent ocsreports"
 BUILD_DEPENDS="perl perl-dbd-mysql perl-apache-dbi perl-net-ip"
 TAGS="system administration"
diff -r d49009465257 -r 93d0091756cf ocsreports/receipt
--- a/ocsreports/receipt	Fri Feb 04 05:30:52 2011 +0000
+++ b/ocsreports/receipt	Fri Feb 04 17:06:43 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="ocsreports"
-VERSION="1.02.1"
+VERSION="1.3.3"
 CATEGORY="network"
 SHORT_DESC="Inventory and package deployement system"
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -29,9 +29,9 @@
 ?>
 EOT
 
-	install -o root -g www -m 0755 $src/Apache/binutils/ipdiscover-util.pl \
-		$fs/usr/share/ocsreports/ipdiscover-util.pl
-
+	install -o root -g www -m 0755 $src/binutils/*.pl \
+		$fs/usr/share/ocsreports/
+		
 	rm -f $fs/usr/share/${PACKAGE}/dbconfig.inc.php
 	cd $fs/usr/share/${PACKAGE} ; ln -s /etc/ocsreports/dbconfig.inc.php ; cd -