Qual: A lot of fixes to enhance package quality

build/deb/apache.conf

@@ -60,3 +60,9 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
     Order deny,allow
     Allow from all
 </Directory>
+
+<Directory /var/lib/dolibarr>
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+</Directory>

build/deb/changelog

+ dolibarr 3.1.0 unstable; urgency=low
+  * New 3.1.0 release
+    More information into /usr/share/dolibarr/ChangeLog file.
+ -- maintainer Laurent Destailleur <eldy@users.sourceforge.net>  2011-07-09
\ No newline at end of file

build/deb/control

@@ -9,7 +9,7 @@ Section: web
 Priority: optional
 Recommends: mozilla | netscape
 Homepage: http://www.dolibarr.org
-Description: An ERP & CRM software to manage your activity.
+Description: ERP & CRM software to manage your activity.
  Dolibarr ERP & CRM is an easy to use open source/free software for small 
  and medium companies, foundations or freelances. It includes different 
  features for Enterprise Resource Planning (ERP) and Customer Relationship

build/deb/copyright

+Copyright 2011 Laurent Destailleur <eldy@users.sourceforge.net>
+
+This software is distributed under GPL v2 licence.
 See file /usr/share/common-licenses/GPL-2
\ No newline at end of file

build/deb/install.forced.php.install

@@ -4,11 +4,12 @@
 // This file must be present into htdocs/install directory
 // during install process to be used.
 //
-// $Id: install.forced.php.install,v 1.5 2011/06/26 11:41:50 eldy Exp $
+// $Id: install.forced.php.install,v 1.6 2011/07/09 14:11:40 eldy Exp $
 //
 $force_install_noedit=1;
 $force_install_message='KeepDefaultValuesDeb';
-$force_install_main_data_root='/usr/share/dolibarr/documents';
+#$force_install_main_data_root='/usr/share/dolibarr/documents';
+$force_install_main_data_root='/var/lib/dolibarr';
 $force_install_type='mysqli';
 $force_install_dbserver='localhost';
 $force_install_port='3306';

build/deb/postinst

@@ -51,7 +51,7 @@ case "$1" in
 		
         # Create /var/lib/dolibarr/documents
         mkdir -p /var/lib/dolibarr/documents
-        chown -R www-data.www-data /var/lib/dolibarr/documents;
+        chown -R www-data:www-data /var/lib/dolibarr/documents;
         chmod -R 775 /var/lib/dolibarr/documents;
         chmod -R g+s /var/lib/dolibarr/documents;
 
@@ -60,7 +60,7 @@ case "$1" in
 		then 
 			echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php		
 			touch /usr/share/dolibarr/htdocs/conf/conf.php
-			chown -R www-data.www-data /usr/share/dolibarr/htdocs/conf/conf.php;
+			chown -R www-data:www-data /usr/share/dolibarr/htdocs/conf/conf.php;
 	    	chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php;
 		fi
 
@@ -81,23 +81,10 @@ case "$1" in
 		for server in $webservers ; do
 			echo Complete config of server $server
 			
-			# Add info for PHP (obsolete)
-			#typestr='application/x-httpd-php'
-			#extension='.php'
-			#. /usr/share/wwwconfig-common/apache-addtype_all.sh
-			
-			# Enable PHP module (obsolete)
-			#. /usr/share/wwwconfig-common/apache-php.sh
-			#echo Result of enabling PHP modules: $status
-			
 			# Detect webuser and webgroup
 			webuser=
 			webgroup=
 
-			# Search in httpd.conf (obsolete)
-			#. /usr/share/wwwconfig-common/apache-run.get
-			#echo Web user.group found is $webuser.$webgroup
-
 			if [ -z "$webuser" ] ; then
 				webuser=www-data
 			fi
@@ -111,22 +98,12 @@ case "$1" in
 			# That may lead to problems if apache & apache-ssl do
 			# not have the same user/group.
 			#
-			chown -R $webuser.$webgroup /usr/share/dolibarr
-
-            # Put content of conf file into apache httpd.conf main file (/etc/apache2/httpd.conf)
-			#includefile="/etc/dolibarr/apache.conf"
-			#. /usr/share/dolibarr/build/deb/apache-include_all.sh
-			#test "$status" = "uncomment" -o "$status" = "include" && restart="$server $restart"
+			chown -R $webuser:$webgroup /usr/share/dolibarr
 
 			# Add link to config file
             echo Setup web server $server to add dolibarr config file
-			ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d
+			ln -fs /etc/dolibarr/apache.conf /etc/apache2/conf.d/dolibarr.conf
 			
-			# (useless)
-			#for index in index.php; do
-			#	. /usr/share/wwwconfig-common/apache-index_all.sh
-			#	test "$status" = "added" && restart="$server $restart"
-			#done
 		done
 
 		# Copy icon file
@@ -157,22 +134,17 @@ case "$1" in
 
 		# Restart servers
 		servers="apache2-ssl apache2 mysql"
-		if [ -f /usr/share/wwwconfig-common/restart.sh ] ;
-		then
-            echo Restart web servers running /usr/share/wwwconfig-common/restart.sh
-			. /usr/share/wwwconfig-common/restart.sh
-		else
 		# Another way to restart
 		for server in $servers ; do
-			    echo Restart web server $server
     		if [ -x /usr/sbin/invoke-rc.d ]; then
-        		    # This on works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
+                echo Restart web server $server using invoke-rc.d
+    		    # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
     	    	invoke-rc.d $server reload || true
     		else
+                echo Restart web server $server using $server reload
     	    	/etc/init.d/$server reload || true
     		fi
 		done
-		fi
 		
 		echo ----------
 		echo "Call Dolibarr page http://localhost/dolibarr/ to complete the installation and use Dolibarr."

build/deb/postrm

@@ -72,10 +72,6 @@ case "$1" in
 			echo postrm Mysql superuser found to use is $superuserlogin
 			dbadmin="$superuserlogin"
 			dbadmpass="$superuserpassword"
-			#db_get "dolibarr/db/admin/name"
-			#dbadmin="$RET"
-			#db_get "dolibarr/db/admin/password"
-			#dbadmpass="$RET"
 			dbtype="mysql"
 			
 			# To delete a mysql user (disabled)
@@ -149,30 +145,6 @@ case "$1" in
 	
 		# Remove include files
 		for server in $webservers ; do
-            
-            # Old usage
-			#export conffile="/etc/$server/httpd.conf"
-            #export error=""     
-			#echo "postrm conffile=$conffile" 
-			#if [ -f $conffile ] ;
-			#then
-			#	if [ -s $conffile ] ;
-			#	then
-            #        echo postrm remove dolibarr include from /etc/dolibarr/apache.conf
-			#		# We disable set -e to avoid premature end of script if error
-			#		set +e
-			#	    GREP="Include[[:space:]]\+$includefile\b"
-			#	    if grep -e "$GREP" $conffile > /dev/null 2>&1; then
-			#		log="${log}Include of $includefile found in $conffile file, purging."
-			#		status=purge
-			#		grep -v -e "$GREP" < $conffile > $conffile.purg
-			#		mv $conffile.purg $conffile
-			#		fi
-			#		# We restore blocking errors
-			#		set -e
-			#	fi
-			#fi
-			
 			# New usage
 			export conffile="/etc/$server/conf.d/dolibarr.conf"
             if [ -f $conffile ] ;
@@ -189,12 +161,6 @@ case "$1" in
 		rm -rf /etc/dolibarr
 
 		# Restart servers
-		servers="apache2-ssl apache2 mysql"
-		if [ -f /usr/share/wwwconfig-common/restart.sh ] ;
-		then
-			. /usr/share/wwwconfig-common/restart.sh
-		else
-			# Another way to restart
 		for server in $servers ; do
             # We disable blocking errors
             set +e
@@ -207,7 +173,6 @@ case "$1" in
     		# We restore blocking errors
     		set -e
 		done
-		fi
 		
 		# Remove file and conf file
 		for dir in /usr/share/dolibarr ; do

build/deb/templates

@@ -91,6 +91,6 @@ Template: dolibarr/postrm
 Type: boolean
 Default: true
 Description: Delete database ?
- Do I have to delete also the Dolibarr MySQL database and all its datas
- (datas subjected to this quetion are the Dolibarr DBMS account and all
+ Answer yes if you want to delete also the Dolibarr MySQL database and all 
+ its datas (datas subjected to this quetion are the Dolibarr DBMS account and all
  Dolibarr tables) ?

dev/initdata/generate-commande.php

+#!/usr/bin/php
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
@@ -22,7 +23,7 @@
 /**
 	    \file       htdocs/dev/generate-commande.php
 		\brief      Script de generation de donnees aleatoires pour les commandes
-		\version    $Id$
+		\version    $Id: generate-commande.php,v 1.17 2011/07/09 14:11:40 eldy Exp $
 */
 
 // Test si mode batch

dev/initdata/generate-facture.php

-<?PHP
+#!/usr/bin/php
+<?php
 /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +22,7 @@
 /**
  *	    \file       htdocs/dev/generate-facture.php
  *		\brief      Script de generation de donnees aleatoires pour les factures
- *		\version    $Id$
+ *		\version    $Id: generate-facture.php,v 1.14 2011/07/09 14:11:40 eldy Exp $
  */
 
 // Test si mode batch

dev/initdata/generate-produit.php

+#!/usr/bin/php
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
@@ -22,7 +23,7 @@
 /**
  *      \file       htdocs/dev/generate-produit.php
  *		\brief      Script de generation de donnees aleatoires pour les produits
- *		\version    $Id$
+ *		\version    $Id: generate-produit.php,v 1.16 2011/07/09 14:11:40 eldy Exp $
  */
 
 // Test si mode batch

dev/initdata/generate-propale.php

-<?PHP
+#!/usr/bin/php
+<?php
 /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
@@ -22,7 +23,7 @@
 /**
  *	    \file       htdocs/dev/generate-propale.php
  *		\brief      Script de generation de donnees aleatoires pour les propales
- *		\version    $Id$
+ *		\version    $Id: generate-propale.php,v 1.15 2011/07/09 14:11:40 eldy Exp $
  */
 
 // Test si mode batch

dev/initdata/generate-societe.php

+#!/usr/bin/php
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
@@ -22,7 +23,7 @@
 /**
  *      \file       htdocs/dev/generate-societe.php
  *		\brief      Script de generation de donnees aleatoires pour les societes
- *		\version    $Id$
+ *		\version    $Id: generate-societe.php,v 1.16 2011/07/09 14:11:40 eldy Exp $
  */
 
 // Test si mode batch

dev/samples/create_invoice.php

-<?PHP
+#!/usr/bin/php
+<?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,7 +20,7 @@
 /**
  *      \file       dev/samples/manage_order.php
  *      \brief      This file is an example for a command line script
- *      \version    $Id$
+ *      \version    $Id: create_invoice.php,v 1.5 2011/07/09 14:11:41 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -35,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision$';
+$version='$Revision: 1.5 $';
 $error=0;
 
 

dev/samples/create_order.php

-<?PHP
+#!/usr/bin/php
+<?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,7 +20,7 @@
 /**
  *      \file       dev/samples/manage_order.php
  *      \brief      This file is an example for a command line script
- *      \version    $Id$
+ *      \version    $Id: create_order.php,v 1.9 2011/07/09 14:11:41 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -35,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision$';
+$version='$Revision: 1.9 $';
 $error=0;
 
 

dev/samples/create_product.php

-<?PHP
+#!/usr/bin/php
+<?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,7 +20,7 @@
 /**
  *      \file       dev/samples/create_product.php
  *      \brief      This file is an example for a command line script
- *      \version    $Id$
+ *      \version    $Id: create_product.php,v 1.8 2011/07/09 14:11:41 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -35,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision$';
+$version='$Revision: 1.8 $';
 $error=0;
 
 

dev/skeletons/build_class_from_table.php

+#!/usr/bin/php
 <?php
 /* Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
@@ -20,7 +21,7 @@
  *	\file       dev/skeletons/build_class_from_table.php
  *  \ingroup    core
  *  \brief      Create a complete class file from a table in database
- *  \version    $Id$
+ *  \version    $Id: build_class_from_table.php,v 1.32 2011/07/09 14:11:40 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -38,7 +39,7 @@ require_once($path."../../htdocs/master.inc.php");
 // After this $db is a defined handler to database.
 
 // Main
-$version='$Revision$';
+$version='$Revision: 1.32 $';
 @set_time_limit(0);
 $error=0;
 

dev/skeletons/build_webservice_from_class.php

+#!/usr/bin/php
 <?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
@@ -20,7 +21,7 @@
  *	\file       dev/skeletons/build_webservice_from_class.php
  *  \ingroup    core
  *  \brief      Create a complete webservice file from CRUD functions of a PHP class
- *  \version    $Id$
+ *  \version    $Id: build_webservice_from_class.php,v 1.6 2011/07/09 14:11:40 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -38,7 +39,7 @@ require_once($path."../../htdocs/master.inc.php");
 // After this $db is a defined handler to database.
 
 // Main
-$version='$Revision$';
+$version='$Revision: 1.6 $';
 @set_time_limit(0);
 $error=0;
 

dev/skeletons/skeleton_script.php

+#!/usr/bin/php
 <?php
-/* Copyright (C) 2007-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +22,7 @@
  *      \file       dev/skeletons/skeleton_script.php
  *		\ingroup    mymodule othermodule1 othermodule2
  *      \brief      This file is an example for a command line script
- *      \version    $Id$
+ *      \version    $Id: skeleton_script.php,v 1.27 2011/07/09 14:11:41 eldy Exp $
  *		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -37,7 +38,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='$Revision$';
+$version='$Revision: 1.27 $';
 $error=0;
 
 

dev/translation/autotranslator.php

-<?PHP
+#!/usr/bin/php
+<?php
 /* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +21,7 @@
  *      \file       dev/translation/autotranslator.php
  *		\ingroup    mymodule othermodule1 othermodule2
  *      \brief      This file is an example for a command line script
- *      \version    $Id: autotranslator.php,v 1.11 2011/06/26 18:52:49 eldy Exp $
+ *      \version    $Id: autotranslator.php,v 1.12 2011/07/09 14:11:41 eldy Exp $
  * 		\author		Put author name here
  *		\remarks	Put here some comments
  */
@@ -44,7 +45,7 @@ require_once($path.'../../htdocs/lib/files.lib.php');
 $langs->load("main");
 
 // Global variables
-$version='$Revision: 1.11 $';
+$version='$Revision: 1.12 $';
 $error=0;