Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Qual: A lot of fixes to enhance package quality

Browse Source
This commit is contained in:
Laurent Destailleur
2011-07-09 15:48:19 +00:00
parent e08e1524e7
commit 4d9db8209a
7 changed files with 66 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/deb/apache.conf
View File

@@ -13,6 +13,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
# CustomLog logs/ldap.example.com-access.log common
# </VirtualHost>
# Directory for web pages
<Directory /usr/share/dolibarr/htdocs>
DirectoryIndex index.php
Options +FollowSymLinks +Indexes
@@ -55,12 +56,19 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
</Directory>
# Directory for public pages
<Directory /usr/share/dolibarr/htdocs/public/>
AllowOverride All
Order deny,allow
Allow from all
</Directory>
# Directory for data files
<Directory /usr/share/dolibarr/documents>
AllowOverride All
Order deny,allow
Allow from all
</Directory>
<Directory /var/lib/dolibarr>
AllowOverride All
Order deny,allow

2
build/deb/changelog
View File

@@ -1,4 +1,4 @@
dolibarr 3.1.0 unstable; urgency=low
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

20
build/deb/control
View File

@@ -7,31 +7,32 @@ Installed-Size: 31200
Depends: apache2, libapache2-mod-php5, php5, php5-cli, php5-cgi, php5-curl, php5-gd, php5-ldap, php5-mysql, mysql-server, perl
Section: web
Priority: optional
Recommends: mozilla | netscape
Recommends: firefox
Homepage: http://www.dolibarr.org
Description: ERP & CRM software to manage your activity.
Description: Easy to use 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
Management (CRM) but also other features for different activities.
Management (CRM) but also for different other activities.
.
Dolibarr features are activated by modules. Most common modules are:
Only features you need are visible, depending on which module were activated.
Most common used modules are:
.
* Products and services catalog
* Stock management
* Bank accounts management
* 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
* Foundations members management
* Donations management
* Bookmarks management
* Mass Emailings
@@ -39,4 +40,5 @@ Description: ERP & CRM software to manage your activity.
* Data export and import tools
* LDAP connectivity
* PDF exports
* And a lot of other modules
* And a lot of more modules...
You can also add third parties external modules or develop yours.

7
build/deb/install.forced.php.install
View File

@@ -4,12 +4,13 @@
// This file must be present into htdocs/install directory
// during install process to be used.
//
// $Id: install.forced.php.install,v 1.6 2011/07/09 14:11:40 eldy Exp $
// $Id: install.forced.php.install,v 1.7 2011/07/09 15:48:19 eldy Exp $
//
$force_install_noedit=1;
$force_install_message='KeepDefaultValuesDeb';
#$force_install_main_data_root='/usr/share/dolibarr/documents';
$force_install_main_data_root='/var/lib/dolibarr';
$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';

16
build/deb/postinst
View File

@@ -49,19 +49,21 @@ case "$1" in
cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
fi
# Create /var/lib/dolibarr/documents
mkdir -p /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;
# Create document directory
#docdir='/var/lib/dolibarr/documents'
docdir='/usr/share/dolibarr/documents'
mkdir -p $docdir
chown -R www-data:www-data $docdir
chmod -R 775 $docdir
chmod -R g+s $docdir
# Create an empty conf.php with permission to web server
if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
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;
chmod -R 750 /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
#db_reset "dolibarr/webserver"

15
build/deb/templates
View File

@@ -15,7 +15,7 @@ Description: Package configuration note
Template: dolibarr/webserver
Type: select
Choices: Apache, Apache-ssl, Both, None
Description: Which Web Server are you running?
Description: Which Web Server are you running ?
Dolibarr supports any web server with PHP capabilities, but this
configuration process only supports Apache and Apache-SSL.
@@ -91,6 +91,15 @@ Template: dolibarr/postrm
Type: boolean
Default: true
Description: Delete database ?
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
Delete the Dolibarr MySQL database and all its datas (datas related
to this quetion are the Dolibarr DBMS account and all
Dolibarr tables) ?
Template: dolibarr/postrmfile
Type: boolean
Default: true
Description: Delete attached files ?
Delete also all uploaded and generated files (datas related
to this quetion are all files found into /usr/share/dolibarr/documents,
uploaded or generated when using Dolibarr) ?

37
build/makepack-dolibarr.pl
View File

@@ -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.106 2011/07/09 02:41:37 eldy Exp $
# \version $Id: makepack-dolibarr.pl,v 1.107 2011/07/09 15:48:19 eldy Exp $
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
#----------------------------------------------------------------------------
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
use vars qw/ $REVISION $VERSION /;
$REVISION='$Revision: 1.106 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$REVISION='$Revision: 1.107 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
$VERSION="1.0 (build $REVISION)";
@@ -98,7 +98,7 @@ if (! $TEMP || ! -d $TEMP) {
$BUILDROOT="$TEMP/buildroot";
my $copyalreadydone=0;
my $copyalreadydone=0; # Use - before number of choice to avoid copy
my $batch=0;
for (0..@ARGV-1) {
@@ -457,7 +457,6 @@ if ($nboftargetok) {
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\n";
$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT\"";
$ret=`$cmd`;
print "Create directory $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
print "Copy $SOURCE/build/deb/* to $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
@@ -498,13 +497,11 @@ if ($nboftargetok) {
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/applications"`;
print "Copy desktop file into $BUILDROOT/$PROJECT.tmp/usr/share/applications/dolibarr.desktop\n";
$ret=`cp "$SOURCE/build/deb/dolibarr.desktop" "$BUILDROOT/$PROJECT.tmp/usr/share/applications/dolibarr.desktop"`;
$ret=`chmod 444 $BUILDROOT/$PROJECT.tmp/usr/share/applications/dolibarr.desktop`;
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/pixmaps\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/pixmaps"`;
print "Copy pixmap file into $BUILDROOT/$PROJECT.tmp/usr/share/pixmaps/dolibarr.xpm\n";
$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$PROJECT.tmp/usr/share/pixmaps/dolibarr.xpm"`;
$ret=`chmod 444 $BUILDROOT/$PROJECT.tmp/usr/share/pixmaps/dolibarr.xpm`;
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
@@ -516,20 +513,28 @@ if ($nboftargetok) {
print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
$ret=`cp "$BUILDROOT/$PROJECT.tmp/DEBIAN/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
$ret=`gzip -c $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/ChangeLog > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
#$ret=`gzip -9 -c $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/ChangeLog > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
$ret=`gzip -9 -c $BUILDROOT/$PROJECT.tmp/DEBIAN/changelog > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/documents\n";
$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/documents"`;
print "Set permissions/owners on files/dir\n";
print "Set owners on files/dir\n";
$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
$ret=`chown -R www-data.www-data $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/documents`;
$ret=`chmod -R 555 $BUILDROOT/$PROJECT.tmp`;
$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp`;
$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/documents`;
$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/DEBIAN`;
print "Set permissions on files/dir\n";
$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`;
$cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; ";
$ret=`$cmd`;
$cmd="find $BUILDROOT/$PROJECT.tmp/DEBIAN -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
$ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/control`;
$ret=`chmod 644 $BUILDROOT/$PROJECT.tmp/DEBIAN/templates`;
$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name *.php -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build -name *.pl -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev -name *.php -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
$cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/scripts -name *.php -type f -exec chmod 755 {} \\; ";
$ret=`$cmd`;
print "Go to directory $BUILDROOT\n";
$olddir=getcwd();