mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-05 09:08:09 +01:00
b2116c37d8
- No need to be root to run script - create git tag of version - debian package do not use the deprecated dpatch command - debian package is a quilt package (not native) - debian package was missing file watch - clean exclusion for zip and tgz package (exclusion must be done into makepack-dolibarr.pl, not into specific package code) - can publish files to sourceforge
51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
Description: Enable /etc/dolibarr/conf.php so that we use packaged libraries
|
|
Update some PHP include files to refer to /etc/dolibarr/conf.php
|
|
instead of the in-tree conf/conf.php.
|
|
.
|
|
/etc/dolibarr/conf.php configures Dolibarr to use packaged libraries
|
|
instead of the embedded ones.
|
|
Author: Laurent Destailleur <eldy@users.sourceforge.net>
|
|
Forwarded: not-needed
|
|
Last-Update: 2013-07-29
|
|
---
|
|
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
|
--- a/htdocs/filefunc.inc.php
|
|
+++ b/htdocs/filefunc.inc.php
|
|
@@ -63,8 +63,8 @@ $conffiletoshowshort = "conf.php";
|
|
$conffile = "conf/conf.php";
|
|
$conffiletoshow = "htdocs/conf/conf.php";
|
|
// For debian/redhat like systems
|
|
-//$conffile = "/etc/dolibarr/conf.php";
|
|
-//$conffiletoshow = "/etc/dolibarr/conf.php";
|
|
+$conffile = "/etc/dolibarr/conf.php";
|
|
+$conffiletoshow = "/etc/dolibarr/conf.php";
|
|
|
|
|
|
// Include configuration
|
|
--- a/htdocs/install/inc.php
|
|
+++ b/htdocs/install/inc.php
|
|
@@ -73,8 +73,8 @@ $conffiletoshowshort = "conf.php";
|
|
$conffile = "../conf/conf.php";
|
|
$conffiletoshow = "htdocs/conf/conf.php";
|
|
// For debian/redhat like systems
|
|
-//$conffile = "/etc/dolibarr/conf.php";
|
|
-//$conffiletoshow = "/etc/dolibarr/conf.php";
|
|
+$conffile = "/etc/dolibarr/conf.php";
|
|
+$conffiletoshow = "/etc/dolibarr/conf.php";
|
|
|
|
|
|
if (! defined('DONOTLOADCONF') && file_exists($conffile))
|
|
--- a/htdocs/support/inc.php
|
|
+++ b/htdocs/support/inc.php
|
|
@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
|
|
$conffile = "../conf/conf.php";
|
|
$conffiletoshow = "htdocs/conf/conf.php";
|
|
// For debian/redhat like systems
|
|
-//$conffile = "/etc/dolibarr/conf.php";
|
|
-//$conffiletoshow = "/etc/dolibarr/conf.php";
|
|
+$conffile = "/etc/dolibarr/conf.php";
|
|
+$conffiletoshow = "/etc/dolibarr/conf.php";
|
|
|
|
|
|
if (! defined('DONOTLOADCONF') && file_exists($conffile))
|