cvsimport

build/deb/README

@@ -7,6 +7,7 @@ This directory contains files used by makepack-dolibarr.pl
 script to build a package, ready to be distributed,
 with format .DEB (for Debian, Ubuntu, ...).
 
+
 # This is standard command to work on Debian packaging:
 #
 # lintian package       To test a package   
@@ -19,3 +20,17 @@ with format .DEB (for Debian, Ubuntu, ...).
 #
 # dpkg -L packagename   List content of installed package 
 # dpkg --purge          Remove config files and interactive saved answers
+
+
+To submit a package to Debian:
+
+- Post an ITP with reportbugs :
+> reportbug -B debian --email username@domain.tld wnpp
+See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.
+
+- Wait until you received bug number.
+For first ITP submission of Dolibarr, bug id was 634783.
+ 
+- Add a line for upstream into file changelog with bug number
+
+- Call for a mentor on ML debian-mentors to upload packages

build/deb/apache.conf

@@ -71,7 +71,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
     Order deny,allow
     Allow from all
 </DirectoryMatch>
-<DirectoryMatch /var/lib/dolibarr>
+<DirectoryMatch /var/lib/dolibarr/documents>
     AllowOverride All
     Order deny,allow
     Allow from all

build/deb/changelog

@@ -1,4 +1,9 @@
-dolibarr 3.1.0 unstable; urgency=low
+dolibarr (3.1.0-1) unstable; urgency=low
-  * New 3.1.0 release
+
-    More information into /usr/share/dolibarr/ChangeLog file.
+  [ Laurent Destailleur ]
- -- maintainer Laurent Destailleur <eldy@users.sourceforge.net>  2011-07-09
+  * New upstream release.
+    closes: bug#634783
+    
+ -- Laurent Destailleur <eldy@destailleur.fr>  Mon, 18 Jul 2011 12:00:00 +0100     
+
+# More information into /usr/share/dolibarr/ChangeLog file. 

build/deb/postinst

@@ -39,8 +39,8 @@ case "$1" in
 		superuserpassword=''
 		if [ -f /etc/mysql/debian.cnf ] ; then
 			# Load superuser login and pass
-			superuserlogin=$(/bin/grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
+			superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
-			superuserpassword=$(/bin/grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
+			superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
 		fi
 		echo Mysql superuser found to use is $superuserlogin
 		if [ -z "$superuserlogin" ] ; then
@@ -62,8 +62,8 @@ 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 root:www-data /usr/share/dolibarr/htdocs/conf/conf.php
-	    	chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php
+	    	chmod -R 660 /usr/share/dolibarr/htdocs/conf/conf.php
 		fi
 
 		#db_reset "dolibarr/webserver"
@@ -101,6 +101,7 @@ case "$1" in
 			# not have the same user/group.
 			#
 			chown -R $webuser:$webgroup /usr/share/dolibarr
+            chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php
 
 			# Add link to config file
             echo Setup web server $server to add dolibarr config file

build/deb/postrm

@@ -59,15 +59,15 @@ case "$1" in
 			echo postrm Mysql database deletion
 			# Get database configuration
 			dbserver="localhost"
-			dbname="dolibarr"
+			dbname="dolibarrmysql"
 			#db_get "dolibarr/db/name"
 			#dbname="$RET"
 			superuserlogin=''
 			superuserpassword=''
 			if [ -f /etc/mysql/debian.cnf ] ; then
 				# Load superuser login and pass
-				superuserlogin=$(/bin/grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
+				superuserlogin=$(grep --max-count=1 "user" /etc/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
-				superuserpassword=$(/bin/grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
+				superuserpassword=$(grep --max-count=1 "password" /etc/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
 			fi
 			echo postrm Mysql superuser found to use is $superuserlogin
 			dbadmin="$superuserlogin"

build/rpm/README

@@ -22,3 +22,21 @@ with format RPM (for Redhat, Mandriva, ...).
 # On Mageia (after su - root)
 # urpmi dolibarr-...rpm             To install package and dependencies
 # urpme dolibarr                    To remove package
+
+
+To submit a package to Fedora:
+
+- Create a bug with form https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review
+This is example of content of review field (used for Bug 723326):
+Spec URL: http://www.dolibarr.org/files/fedora/dolibarr.spec
+SRPM URL: http://www.dolibarr.org/files/fedora/dolibarr-3.1.0-0.src.rpm
+Description:  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 Management (CRM) but also for different other activities.
+I am author of other already packaged OpenSources packages (awstats) but this
+is my first package to maintain myself. So i'm seeking a sponsor.
+
+- Edit field "Block" and add FE-NEEDSPONSOR
+
+  

htdocs/langs/ca_ES/admin.lang

@@ -308,6 +308,7 @@ ResponseTimeout=Timeout de resposta
 SmsTestMessage=Missatge de prova de __PHONEFROM__ per __PHONETO__
 ModuleMustBeEnabledFirst=Per utilitzar aquesta funció ha d'estar activat el mòdul <b>%s</b>.
 SecurityToken=Clau per encriptar urls
+NoSmsEngine=No hi ha cap gestor d'enviament de SMS. Els gestors d'enviament de SMS no s'instal·len en estàndard (ja que depenen d'un proveïdor), però pot trobar a la plataforma http://www.dolistore.com
 # Modules
 Module0Name=Usuaris y grups
 Module0Desc=Gestió d'usuaris i grups

htdocs/langs/ca_ES/compta.lang

@@ -139,3 +139,4 @@ COMPTA_ACCOUNT_CUSTOMER=Codi comptable per defecte de clients (si no està defin
 COMPTA_ACCOUNT_SUPPLIER=Codi comptable per defecte de proveïdors (si no està definit a la pestanya tercers)
 AddRemind=Desglossar import disponible
 RemainToDivide=Resta a repartir :
+WarningDepositsNotIncluded=Les factures de bestreta encara no estan incloses en aquesta versió en el mòdul de comptabilitat.

htdocs/langs/es_ES/admin.lang

@@ -308,6 +308,7 @@ ResponseTimeout=Timeout de respuesta
 SmsTestMessage=Mensaje de prueba de __PHONEFROM__ para __PHONETO__
 ModuleMustBeEnabledFirst=Para usar esta función debe estar activado el módulo <b>%s</b>.
 SecurityToken=Clave para encriptar urls
+NoSmsEngine=No hay disponible ningún gestor de envío de SMS. Los gestores de envío de SMS no se instalan en estándar (ya que dependen de un proveedor), pero puede encontrar en la plataforma http://www.dolistore.com
 # Modules
 Module0Name=Usuarios y grupos
 Module0Desc=Gestión de usuarios y grupos

htdocs/langs/es_ES/compta.lang

@@ -139,3 +139,4 @@ COMPTA_ACCOUNT_CUSTOMER=Código contable por defecto de clientes (si no está de
 COMPTA_ACCOUNT_SUPPLIER=Código contable por defecto de proveedores (si no está definido en la pestaña terceros)
 AddRemind=Desglosar importe disponible
 RemainToDivide=Resto a repartir :
+WarningDepositsNotIncluded=Las facturas de anticipo aún no están incluidas en esta versión en el módulo de contabilidad.

htdocs/societe/soc.php

@@ -26,7 +26,7 @@
  *  \file       htdocs/societe/soc.php
  *  \ingroup    societe
  *  \brief      Third party card page
- *  \version    $Id: soc.php,v 1.123 2011/07/18 16:48:26 simnandez Exp $
+ *  \version    $Id: soc.php,v 1.124 2011/07/19 07:33:23 simnandez Exp $
  */
 
 require("../main.inc.php");
@@ -702,14 +702,14 @@ else
                                jQuery(".individualline").hide();
                                jQuery("#typent_id").val(0);
                                jQuery("#effectif_id").val(0);
-                               document.getElementById("TypeName").innerHTML=document.formsoc.ThirdPartyName.value;
+                               jQuery("#TypeName").html(document.formsoc.ThirdPartyName.value);
                                document.formsoc.private.value=0;
                          });
                           jQuery("#radioprivate").click(function() {
                                jQuery(".individualline").show();
                                jQuery("#typent_id").val(id_te_private);
                                jQuery("#effectif_id").val(id_ef15);
-                               document.getElementById("TypeName").innerHTML=document.formsoc.LastName.value;
+                               jQuery("#TypeName").html(document.formsoc.LastName.value);
                                document.formsoc.private.value=1;
                          });
                          jQuery("#selectpays_id").change(function() {
@@ -1968,5 +1968,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/18 16:48:26 $ - $Revision: 1.123 $');
+llxFooter('$Date: 2011/07/19 07:33:23 $ - $Revision: 1.124 $');
 ?>