Browse Source

Prepare 3.8

Laurent Destailleur 10 years ago
parent
commit
66ae756c72

+ 1 - 1
build/makepack-dolibarr.pl

@@ -715,7 +715,7 @@ if ($nboftargetok) {
 			$ret=`$cmd`;
 			print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
 			$cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
-			$ret=`$cmd`;
+			#$ret=`$cmd`;
 			next;
 		}
 

+ 1 - 0
build/rpm/dolibarr_fedora.spec

@@ -159,6 +159,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks

+ 1 - 0
build/rpm/dolibarr_generic.spec

@@ -239,6 +239,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks

+ 1 - 0
build/rpm/dolibarr_mandriva.spec

@@ -156,6 +156,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks

+ 1 - 0
build/rpm/dolibarr_opensuse.spec

@@ -167,6 +167,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/accountancy
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
+%_datadir/dolibarr/htdocs/api
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks

+ 5 - 1
htdocs/filefunc.inc.php

@@ -30,7 +30,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.0-alpha');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.0-beta');
 
 if (! defined('EURO')) define('EURO',chr(128));
 
@@ -57,12 +57,16 @@ if (defined('DOL_INC_FOR_VERSION_ERROR')) return;
 // Define vars
 $conffiletoshowshort = "conf.php";
 // Define localization of conf file
+// --- Start of part replaced by Dolibarr packager makepack-dolibarr
 $conffile = "conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
 //$conffile = "/etc/dolibarr/conf.php";
 //$conffiletoshow = "/etc/dolibarr/conf.php";
 
+
+// Include configuration
+// --- End of part replaced by Dolibarr packager makepack-dolibarr
 // Replace conf filename with "conf" parameter on url by GET
 if (! empty($_GET['conf']))
 {

File diff suppressed because it is too large
+ 236 - 235
htdocs/install/filelist.xml


Some files were not shown because too many files changed in this diff