Skip to content
Snippets Groups Projects
Commit b2116c37 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Enhance packager:

- 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
parent c082d7c8
Branches
Tags
No related merge requests found
...@@ -2,10 +2,10 @@ Source: dolibarr ...@@ -2,10 +2,10 @@ Source: dolibarr
Section: web Section: web
Priority: optional Priority: optional
Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net> # Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net> # Only if differs from Maintainer
Standards-Version: 3.9.4 Standards-Version: 3.9.4
Homepage: http://www.dolibarr.org Homepage: http://www.dolibarr.org
Build-Depends: debhelper (>= 9), po-debconf, dpatch Build-Depends: debhelper (>= 9), po-debconf
Comments: This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version Comments: This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
Package: dolibarr Package: dolibarr
...@@ -30,7 +30,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | ...@@ -30,7 +30,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
${perl:Depends} ${perl:Depends}
Recommends: mysql-client, apache2 | lighttpd | httpd Recommends: mysql-client, apache2 | lighttpd | httpd
Suggests: www-browser Suggests: www-browser
Description: Web based software to manage a small company or foundation Description: Web based software to manage a company or foundation
Dolibarr ERP & CRM is an easy to use 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 and medium companies, foundations or freelances. It includes different
features for Enterprise Resource Planning (ERP) and Customer Relationship features for Enterprise Resource Planning (ERP) and Customer Relationship
......
install.dpatch
\ No newline at end of file
use-etc-dolibarr-conf.patch
#! /bin/sh /usr/share/dpatch/dpatch-run Description: Enable /etc/dolibarr/conf.php so that we use packaged libraries
## install.patch by <eldy@users.sourceforge.net> Update some PHP include files to refer to /etc/dolibarr/conf.php
## instead of the in-tree conf/conf.php.
## All lines beginning with `## DP:' are a description of the patch. .
## DP: Updates htdocs/filefunc.inc.php /etc/dolibarr/conf.php configures Dolibarr to use packaged libraries
## DP: Updates htdocs/install/inc.php instead of the embedded ones.
## DP: Updates htdocs/support/inc.php Author: Laurent Destailleur <eldy@users.sourceforge.net>
Forwarded: not-needed
@DPATCH@ Last-Update: 2013-07-29
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- old/htdocs/filefunc.inc.php 2011-09-03 02:32:48.666952000 +0200 --- a/htdocs/filefunc.inc.php
+++ new/htdocs/filefunc.inc.php 2011-09-03 02:33:00.510952001 +0200 +++ b/htdocs/filefunc.inc.php
@@ -63,8 +63,8 @@ @@ -63,8 +63,8 @@ $conffiletoshowshort = "conf.php";
$conffile = "conf/conf.php"; $conffile = "conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php";
// For debian/redhat like systems // For debian/redhat like systems
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
// Include configuration // Include configuration
--- old/htdocs/install/inc.php 2011-09-03 02:33:26.450952000 +0200 --- a/htdocs/install/inc.php
+++ new/htdocs/install/inc.php 2011-09-03 02:33:36.286952001 +0200 +++ b/htdocs/install/inc.php
@@ -71,8 +71,8 @@ @@ -73,8 +73,8 @@ $conffiletoshowshort = "conf.php";
$conffile = "../conf/conf.php"; $conffile = "../conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php";
// For debian/redhat like systems // For debian/redhat like systems
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
if (! defined('DONOTLOADCONF') && file_exists($conffile)) if (! defined('DONOTLOADCONF') && file_exists($conffile))
--- old/htdocs/support/inc.php 2011-09-03 02:34:39.606952000 +0200 --- a/htdocs/support/inc.php
+++ new/htdocs/support/inc.php 2011-09-03 02:33:59.814952000 +0200 +++ b/htdocs/support/inc.php
@@ -69,8 +69,8 @@ @@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
$conffile = "../conf/conf.php"; $conffile = "../conf/conf.php";
$conffiletoshow = "htdocs/conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php";
// For debian/redhat like systems // For debian/redhat like systems
......
...@@ -7,29 +7,11 @@ export DH_OPTIONS=-v ...@@ -7,29 +7,11 @@ export DH_OPTIONS=-v
#export DH_COMPAT=7 # This is the debhelper compatability version to use, now defined into compat file #export DH_COMPAT=7 # This is the debhelper compatability version to use, now defined into compat file
# use dpatch %:
include /usr/share/dpatch/dpatch.make
configure:
dh $@
build: patch
dh $@
build-arch: patch
dh $@
build-indep: patch
dh $@
binary:
dh $@ dh $@
binary-indep: override_dh_install:
dh $@ dh_install
clean:
# Delete files # Delete files
rm -f .buildpath rm -f .buildpath
rm -fr .cache rm -fr .cache
...@@ -119,7 +101,16 @@ clean: ...@@ -119,7 +101,16 @@ clean:
rm -f htdocs/includes/phpexcel/license.txt rm -f htdocs/includes/phpexcel/license.txt
rm -f htdocs/includes/tcpdf/LICENSE.TXT rm -f htdocs/includes/tcpdf/LICENSE.TXT
dh $@ # Drop unwanted executable permissions
find debian/dolibarr/usr/share/dolibarr/htdocs -type f -print0 | \
binary-arch: xargs -0 chmod 644
# Add missing executable permissions
find debian/dolibarr/usr/share/dolibarr/scripts -type f -name '*.php' -print0 | \
xargs -0 chmod 755
override_dh_fixperms:
dh_fixperms
# Give rights to the webserver on the upload directory
chown www-data:www-data debian/dolibarr/var/lib/dolibarr/documents
chmod 2775 debian/dolibarr/var/lib/dolibarr/documents
\ No newline at end of file
3.0 (native) 3.0 (quilt)
\ No newline at end of file \ No newline at end of file
This diff is collapsed.
*~
.#*
Thumbs.db
build/exe build/exe
build/html build/html
dev/dbmodel dev/dbmodel
...@@ -7,58 +10,10 @@ dev/initdata ...@@ -7,58 +10,10 @@ dev/initdata
dev/iso-normes dev/iso-normes
dev/licence dev/licence
dev/load dev/load
dev/skeletons/*socpeople*
dev/spec
dev/test
dev/uml
dev/xdebug
doc/dev/dolibarr-phpdoc
doc/dev/barcode
doc/dev/compta
doc/dev/dbmodel
doc/dev/normes
doc/dev/html
doc/dev/iso-normes
doc/flyer
doc/font
doc/rollup
doc/tshirts
doc/wiki
document
documents
htdocs/conf/conf.php htdocs/conf/conf.php
htdocs/conf/conf.php.mysql htdocs/conf/conf.php.mysql
htdocs/conf/conf.php.old htdocs/conf/conf.php.old
htdocs/conf/conf.php.postgres htdocs/conf/conf.php.postgres
htdocs/avoir
htdocs/custom
htdocs/custom2
htdocs/customleave
htdocs/customgoogle
htdocs/document
htdocs/documents
htdocs/includes/fckeditor/_samples
htdocs/includes/fckeditor/_testcases
htdocs/includes/nusoap/samples
htdocs/includes/tcpdf/fonts/utils
htdocs/includes/tcpdf/fonts/free*.ctg.z
htdocs/includes/tcpdf/fonts/free*.z
mssql
test
CVS
*~
.#*
.buildpath
.cache
.cvsignore
.gitignore
.externalToolBuilders
.htaccess
.settings
.project
.travis.yml
Thumbs.db
data_dev.sql
doli*.tar.gz doli*.tar.gz
doli*.tgz doli*.tgz
doli*.exe doli*.exe
...@@ -66,5 +21,4 @@ doli*.rpm ...@@ -66,5 +21,4 @@ doli*.rpm
doli*.deb doli*.deb
doli*.zip doli*.zip
cvschangelogbuilder_dolibarr* cvschangelogbuilder_dolibarr*
doxygen_warnings.log
dolibarr_install.log dolibarr_install.log
\ No newline at end of file
*/build *~
*.#*
Thumbs.db
*/build/exe
*/build/html
*/dev/dbmodel/* */dev/dbmodel/*
*/dev/fpdf/* */dev/fpdf/*
*/dev/initdemo/* */dev/initdemo/*
*/dev/initdata/*
*/dev/iso-normes/* */dev/iso-normes/*
*/dev/licence/* */dev/licence/*
*/dev/load/* */dev/load/*
*/dev/test/*
*/dev/uml/*
*/dev/xdebug/*
*/doc/dev/dolibarr-phpdoc/*
*/doc/dev/barcode/*
*/doc/dev/compta/*
*/doc/dev/dbmodel/*
*/doc/dev/normes/*
*/doc/dev/html/*
*/doc/dev/iso-normes/*
*/doc/flyer/*
*/doc/font/*
*/doc/rollup/*
*/doc/tshirt/*
*/doc/wiki/*
*/document/*
*/documents/*
*/htdocs/avoir/*
*/htdocs/conf/conf.php */htdocs/conf/conf.php
*/htdocs/conf/conf.php.mysql */htdocs/conf/conf.php.mysql
*/htdocs/conf/conf.php.old */htdocs/conf/conf.php.old
*/htdocs/conf/conf.php.postgres */htdocs/conf/conf.php.postgres
*/htdocs/custom/*
*/htdocs/custom2/*
*/htdocs/document/*
*/htdocs/documents/*
*/htdocs/includes/ckeditor/_source
*/htdocs/includes/ckeditor/*_source.js
*/htdocs/includes/fckeditor/_samples/*
*/htdocs/includes/fckeditor/_testcases/*
*/htdocs/includes/nusoap/samples/*
*/htdocs/includes/phplot5/doc/*
*/htdocs/includes/phplot5/examples/*
*/htdocs/includes/scriptaculous/test/*
*/htdocs/includes/treemenu/docs/*
*/htdocs/includes/treemenu/images/*
*/htdocs/includes/treemenu/imagesAlt/*
*/htdocs/includes/treemenu/imagesAlt2/*
*/htdocs/includes/tcpdf/fonts/utils/*
*/htdocs/includes/tcpdf/fonts/free*.ctg.z
*/htdocs/includes/tcpdf/fonts/free*.z
*/test
*/CVS/*
*~
*.#*
*.buildpath*
*.cache*
*.cvsignore*
*.gitignore*
*.htaccess*
*.settings*
*.project*
*.travis.yml*
Thumbs.db
data_dev.sql
dolibarr*.tar.gz dolibarr*.tar.gz
dolibarr*.tgz dolibarr*.tgz
dolibarr*.exe dolibarr*.exe
...@@ -67,5 +21,4 @@ dolibarr*.rpm ...@@ -67,5 +21,4 @@ dolibarr*.rpm
dolibarr*.deb dolibarr*.deb
dolibarr*.zip dolibarr*.zip
cvschangelogbuilder_dolibarr* cvschangelogbuilder_dolibarr*
doxygen_warnings.log
dolibarr_install.log dolibarr_install.log
\ No newline at end of file
Order deny,allow
Deny from all
<FilesMatch "\.(js)$">
Order deny,allow
Allow from all
</FilesMatch>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment