diff --git a/build/.cvsignore b/build/.cvsignore
index 53dd6ee2abd..830b8b91924 100644
--- a/build/.cvsignore
+++ b/build/.cvsignore
@@ -14,6 +14,3 @@ version-phpsane.txt
 makepack-phpsane.conf
 html
 *.deb
-*.dsc
-*.tar.gz
-*.changes
diff --git a/build/deb/README b/build/deb/README
index edb46ffd5a3..76be8f1596c 100644
--- a/build/deb/README
+++ b/build/deb/README
@@ -49,5 +49,5 @@ For first ITP submission of Dolibarr, bug id was 634783.
 - Call for a mentor on ML debian-mentors to upload packages
 
 - Once package is uploaded, following URL are available:
-http://packages.qa.debian.org/package.html
+http://packages.qa.debian.org/package
 http://bugs.debian.org/package
diff --git a/build/deb/changelog b/build/deb/changelog
index b035f18ae1d..420975c16ec 100644
--- a/build/deb/changelog
+++ b/build/deb/changelog
@@ -1,9 +1,8 @@
-dolibarr (3.1.0-1.1) unstable; urgency=low
+dolibarr (3.1.0) unstable; urgency=low
 
-  * Non-maintainer upload
   * New upstream release.
     closes: bug#634783
     
- -- Laurent Destailleur <eldy@users.sourceforge.net>  Mon, 30 Jul 2011 12:00:00 +0100     
+ -- Laurent Destailleur <eldy@users.sourceforge.net>  Mon, 18 Jul 2011 12:00:00 +0100     
 
-# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. 
\ No newline at end of file
+# More information into /usr/share/dolibarr/ChangeLog file. 
\ No newline at end of file
diff --git a/build/deb/control b/build/deb/control
deleted file mode 100644
index 0c35d38d224..00000000000
--- a/build/deb/control
+++ /dev/null
@@ -1,48 +0,0 @@
-Package: dolibarr
-Version: __VERSION__
-Architecture: all
-Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
-Installed-Size: 61200
-Depends: debconf, apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, php-pear, php-mail-mime, mysql-server, perl
-Section: web
-Priority: optional
-Recommends: firefox
-Homepage: http://www.dolibarr.org
-Description: Easy to use web based ERP & CRM software
- 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.
- It's a web software you can install as a standalone program or on any web
- hosting provider to use it from anywhere with any web browser.
- Dolibarr was designed to provide only features you need and be easy to use.
- .
- Only features you need are visible, depending on which module were activated.
- Most common used modules are:
- .
- Customers, Suppliers or Prospects directory
- Contacts directory
- Orders management
- Commercial proposals management
- Invoices management
- Products and services catalog
- Stock management
- Foundations members management
- Bank accounts management
- Point of Sale
- Payments management
- Commercial actions management
- Contracts management
- Standing orders management
- Shipping management
- Donations management
- Bookmarks management
- Mass Emailings
- Reports
- Data export and import tools
- LDAP connectivity
- PDF exports
- And a lot of more modules...
- .
- You can also add third parties external modules or develop yours.
- 
\ No newline at end of file
diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop
index ec209a86deb..a48e5048dff 100644
--- a/build/deb/dolibarr.desktop
+++ b/build/deb/dolibarr.desktop
@@ -9,9 +9,9 @@ Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or
 Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
 # Command to open an URL
 # For Fedora: xdg-open 
-# For Debian/Ubuntu: x-www-browser
+# For Debian/Ubuntu: xdg-open or x-www-browser
 # (exo-open for xfde, gnome-open for gnome, ...)
-Exec=x-www-browser http://localhost/dolibarr
+Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
diff --git a/build/deb/postrm b/build/deb/postrm
index 9eae81b022b..95f27de27dd 100644
--- a/build/deb/postrm
+++ b/build/deb/postrm
@@ -30,7 +30,6 @@ apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
 apacheconfig="/etc/dolibarr/apache.conf"
 #config="/usr/share/dolibarr/htdocs/conf/conf.php"
 config="/etc/dolibarr/conf.php"
-lockfile="/usr/share/dolibarr/install.lock"
 
 
 export webserver=""
@@ -44,32 +43,6 @@ esac
 
 
 case "$1" in
-
-    # Call when we upgrade
-	upgrade)
-	;;
-
-    # Call when we uninstall
-	remove)
-		rm -f $lockfile
-
-		# Remove include files
-		export restart=""
-		for server in $webservers ; do
-			export conffile="/etc/$server/conf.d/dolibarr.conf"
-            if [ -f $conffile ] ;
-            then
-               echo Delete link $conffile
-	           rm -f $conffile
-	           status=purge
-		    fi
-			
-			if [ "x$status" = "xpurge" ] ;
-				then restart="$restart $server"
-			fi
-		done
-	;;
-
     # Call when we uninstall and purge
 	purge)
 		echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
@@ -225,6 +198,30 @@ case "$1" in
 		#db_purge
 	;;
 
+    # Call when we uninstall
+	remove)
+		rm -f /usr/share/dolibarr/install.lock
+
+		# Remove include files
+		export restart=""
+		for server in $webservers ; do
+			export conffile="/etc/$server/conf.d/dolibarr.conf"
+            if [ -f $conffile ] ;
+            then
+               echo Delete link $conffile
+	           rm -f $conffile
+	           status=purge
+		    fi
+			
+			if [ "x$status" = "xpurge" ] ;
+				then restart="$restart $server"
+			fi
+		done
+	;;
+
+	upgrade)
+	;;
+
 	failed-upgrade|abort-install|abort-upgrade|disappear)
 	;;
 
diff --git a/build/deb/templates b/build/deb/templates
index 1903003a9f4..5c06afd8ccd 100644
--- a/build/deb/templates
+++ b/build/deb/templates
@@ -1,7 +1,7 @@
 Template: dolibarr/postrm
 Type: boolean
 Default: true
-Description: Delete database ?
- Answer if you want to removed the Dolibarr MySQL database and all
- its datas (datas related to this quetion are the Dolibarr DBMS account
- and all Dolibarr tables).
+_Description: Delete database and uploaded files ?
+ Answer if you want to removed the Dolibarr MySQL database and all other
+ datas (datas related to this question are the Dolibarr DBMS account, all
+ Dolibarr tables, and all uploaded files).
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index d3c47e6b28d..a791fd3f828 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \version      $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.123 2011/07/30 14:56:12 eldy Exp $
 # \author       (c)2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------
 
@@ -11,7 +11,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="3";
 $MINOR="1";
-$BUILD="0-beta";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="0-dev";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="auto";	# auto use value found into BUILD
 
 @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
 
 
 use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.123 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";
 
 
@@ -254,11 +254,9 @@ if ($nboftargetok) {
 
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliW*-*`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliM*-*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.changes`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
@@ -276,10 +274,6 @@ if ($nboftargetok) {
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`;
 	    
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
-
         $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
@@ -416,19 +410,14 @@ if ($nboftargetok) {
     	}
     
     	if ($target eq 'RPM') {                 # Linux only
-    		#$ARCH='i386';
-    		$ARCH='noarch';
+    		$ARCH='i386';
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
            	$newbuild = $BUILD;
-           	# For fedora
-            $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev
-            $newbuild =~ s/beta/0.2.beta1/gi;				# beta
-            $newbuild =~ s/rc./0.3.rc1/gi;					# rc
+            $newbuild =~ s/(dev|alpha)/0/gi;				# dev
+            $newbuild =~ s/beta/1/gi;						# beta
+            $newbuild =~ s/rc./2/gi;						# rc
             if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
-            #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
-            #$newbuild =~ s/beta/1/gi;						# beta
-            #$newbuild =~ s/rc./2/gi;						# rc
-            #if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
+            # now newbuild is 0-0 or 0-3 for example
             $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
             if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
             print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
@@ -446,93 +435,16 @@ if ($nboftargetok) {
 
  			print "Remove other files\n";
             $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
 
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
-            # To remove once stable
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
-
-			# Apache conf files
-    		#print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`;
-    		#$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`;
-
-			# Dolibarr conf files
-			# TODO
-
-			# dolibarr.desktop
-	   		#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`;
-    		#print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n";
-    		#$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`;
-            
-            # pixmap
-	   		#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`;
-    		#print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n";
-    		#$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`;
-
-			# Set owners
-            print "Set owners on files/dir\n";
-		    $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;
-
-            print "Set permissions on files/dir\n";
-		    $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
-		    $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-
-			# Build tgz
     		print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
     		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
 
@@ -560,10 +472,6 @@ if ($nboftargetok) {
    		    print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
    		    $cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
     		$ret=`$cmd`;
-   		    print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n";
-   		    $cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
-    		$ret=`$cmd`;
-
     		next;
     	}
     	
@@ -700,7 +608,17 @@ if ($nboftargetok) {
             print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
             $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
             
-			# Set owners
+    		#print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
+            #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
+
+			# copyright (to build binary package directly without sources. Useless if we build from sources)
+    		#print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
+            #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
+
+            # changelog (to build binary package directly without sources. Useless if we build from sources)
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
+
             print "Set owners on files/dir\n";
 		    $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
 
@@ -757,7 +675,7 @@ if ($nboftargetok) {
             $ret=`cp -f  "$SOURCE/build/deb/compat"         "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
             $ret=`cp -f  "$SOURCE/build/deb/format"         "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
             $ret=`cp -fr "$SOURCE/build/deb/po"             "$BUILDROOT/$PROJECT.tmp/debian/po"`;
-			$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`;
+			$ret=`rm -fr "$SOURCE/build/deb/po/CVS"`;
             # Add files also required to build binary package with dpkg-buildpackages
             $ret=`cp -f  "$SOURCE/build/deb/config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
             $ret=`cp -f  "$SOURCE/build/deb/postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
@@ -778,18 +696,12 @@ if ($nboftargetok) {
             if ($OS =~ /windows/i)
             {
                 print "Move *_all.deb to $DESTI\n";
-                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
+                $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
             }
             else
             {
                 print "Move *_all.deb to $DESTI\n";
-                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
+                $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
             }
         	next;
         }
diff --git a/build/rpm/README b/build/rpm/README
index 99a1bb3552c..c157a195c03 100644
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -10,8 +10,6 @@ with format RPM (for Redhat, Mandriva, ...).
 
 # This is standard command to work on Debian packaging:
 #
-# rpmlint file.rpm				    Test a package
-#
 # On Fedora
 # rpm -i --test dolibarr-...rpm     To list dependencies of RPM   
 # yum install dolibarr-...rpm       To install package and dependencies   
@@ -42,9 +40,7 @@ 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
-- Check bug is into database by searching with id on https://bugzilla.redhat.com/
-- Install fedora packager tools: yum install fedora-packager
-- Setup fedora packagers tools: fedora-packager-setup
-- Send your package: koji build --scratch f16 path_to_source_RPM
-- Check if package is available: http://koji.fedoraproject.org/koji/  
\ No newline at end of file
+
+- Check bug is into database by searching with id on https://bugzilla.redhat.com/  
\ No newline at end of file
diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop
index 4b4fb60dadb..33fadf7624f 100755
--- a/build/rpm/dolibarr.desktop
+++ b/build/rpm/dolibarr.desktop
@@ -19,7 +19,7 @@ Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
-Categories=Office;
+Categories=Office
 StartupNotify=true
 InitialPreference=5
 #NoDisplay=true
diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec
index 708546cf263..1754220c6c7 100644
--- a/build/rpm/dolibarr.spec
+++ b/build/rpm/dolibarr.spec
@@ -48,7 +48,7 @@ AutoReqProv: no
 
 
 %description
-An easy to use CRM & ERP open source/free software for small  
+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.
@@ -56,7 +56,7 @@ Dolibarr was designed to provide only features you need and be easy to
 use.
 
 %description -l es
-Un software ERP y CRM open source/gratis para pequeñas y
+Dolibarr ERP y CRM es un software open source/gratis para pequeñas y
 medianas empresas, asociaciones o autónomos. Incluye diferentes
 funcionalidades para la Planificación de Recursos Empresariales (ERP) y
 Gestión de la Relación con los Clientes (CRM) así como para para otras
@@ -65,13 +65,13 @@ solamente las funcionalidades que necesita y haciendo hincapié en su
 facilidad de uso.
     
 %description -l fr
-Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, 
+Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, 
 artisans ou associations. Il permet de gérer vos clients, prospect, 
 fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings
 et bien d'autres choses dans une interface pensée pour la simplicité.
 
 %description -l it
-Un programma gestionale open source e gratuito per piccole e medie
+Dolibarr è un programma gestionale open source e gratuito per piccole e medie
 imprese, fondazioni e liberi professionisti. Include varie funzionalità per
 Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori
 attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno 
@@ -101,7 +101,6 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
 mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
 mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts
 
-# %{_datadir} = /usr/share
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -154,8 +153,6 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install"
 export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
 export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
 export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
-export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr"
-export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr"
 #config="/usr/share/dolibarr/htdocs/conf/conf.php"
 config="%{_sysconfdir}/dolibarr/conf.php"
 lockfile="/usr/share/dolibarr/install.lock"
@@ -221,7 +218,7 @@ then
 	chmod -R 660 $config
 fi
 
-# Create config file for apache $apacheconfig
+# Create a config file $apacheconfig
 if [ ! -f $apacheconfig ]; then
   	 echo Create dolibarr web server config file $apacheconfig
      cp $apachefileorig $apacheconfig
@@ -229,15 +226,7 @@ if [ ! -f $apacheconfig ]; then
      chmod go-w $apacheconfig
 fi
 
-# Create config file for se $seconfig
-if [ ! -f $seconfig ]; then
-  	 echo Create se config file $seconfig
-     cp $sefileorig $seconfig
-#     chmod a-x $apacheconfig
-#     chmod go-w $apacheconfig
-fi
-
-# Create a config link dolibarr.conf
+# Create a config link dolibarr.conf for Fedora or Redhat
 if [ ! -f $apachelink ]; then
     echo Create dolibarr web server config link $apachelink
     ln -fs $apacheconfig $apachelink
@@ -370,5 +359,5 @@ rmdir $targetdir/doc >/dev/null 2>&1
 #rmdir $targetdir/htdocs >/dev/null 2>&1	# Already removed by rpm
 
 %changelog
-* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
-- Initial version (#723326)
+* Wed Jul 31 2011 Laurent Destailleur 3.1.0
+- Initial upstream (#723326)
diff --git a/build/rpm/install.forced.php.install b/build/rpm/install.forced.php.install
index f01e5303ce0..5f390270b51 100755
--- a/build/rpm/install.forced.php.install
+++ b/build/rpm/install.forced.php.install
@@ -3,11 +3,10 @@ $force_install_noedit=2;
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/usr/share/dolibarr/documents';
 $force_install_type='mysqli';
-$force_install_dbserver='localhost';
 $force_install_port='3306';
-$force_install_database='dolibarrrpm';
+$force_install_database='dolibarr';
 $force_install_createdatabase='1';
-$force_install_databaselogin='dolibarrrpm';
+$force_install_databaselogin='dolibarrmysql';
 $force_install_databasepass='';
 $force_install_createuser='1';
 $force_install_databaserootlogin='__SUPERUSERLOGIN__';
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 0037190af06..5e826a0f9f7 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -24,7 +24,7 @@
  *       \file      htdocs/install/etape5.php
  *	 	 \ingroup	install
  *       \brief     Last page of upgrade or install process
- *       \version   $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $
+ *       \version   $Id: etape5.php,v 1.104 2011/07/30 14:56:43 eldy Exp $
  */
 
 include_once("./inc.php");
@@ -315,6 +315,7 @@ if ($action == "set")
 		if (! empty($force_install_lockinstall))
 		{
 			// Install is finished, we create the lock file
+			$lockfile="../../install.lock";
 			$fp = @fopen($lockfile, "w");
 			if ($fp)
 			{
@@ -364,6 +365,7 @@ elseif (preg_match('/upgrade/i',$action))
 		if (! empty($force_install_lockinstall))
 		{
 			// Upgrade is finished, we create the lock file
+			$lockfile="../../install.lock";
 			$fp = @fopen($lockfile, "w");
 			if ($fp)
 			{
diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index 1f046a29bc4..1c43326d70f 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -21,7 +21,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $
+-- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $
 --
 
 --
@@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act
 insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001,  70, 7001, '', 0, 'Colombie', 1);
 
 -- Regions Chile (id country=67)
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1);
 
 -- Regions San Salvador (id country=86)
 INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1);
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 9a109ab3fdc..e3963e8e68f 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -21,7 +21,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $
+-- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $
 --
 
 --
@@ -566,6 +566,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1);