diff --git a/build/debian/README.howto b/build/debian/README.howto index 6b2360b78b5..6632d6e8e84 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -159,10 +159,12 @@ Comment line in /etc/mysql/my.cnf if required and restart mysql Create a chroot called "unstable-amd64-sbuild". Chroot env is stored into /srv/chroot directory. -> sudo sbuild-createchroot --keyring= unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian +> sudo sbuild-createchroot --keyring=unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian Pour lister les env chroot > schroot -l +or +> ls /srv/chroot Puis pour se connecter et préparer l'environnement > schroot -c name_of_chroot @@ -170,7 +172,7 @@ Puis pour se connecter et préparer l'environnement > vi /usr/sbin/policy-rc.d and replace return code 101 (not allowed) into 0 (ok) > apt-get install links mysql-client -Pour tester un package +To test a package > On host server, stop any server on port 80 and 3306 (same port will be used by chroot env) > cp ../build-area/* /srv/chroot/unstable/tmp > sudo schroot -c name_of_chroot @@ -211,8 +213,12 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER * Some files are removed from archive by the get-orig-source.sh +* Modify the tag file to replace sRGB.icc with correct free version and rename file into +tcpdf_x.y.z+dfsgw.orig.tar.xz +(x.y.z = version, w start from 1 and is increased for each new import) + * Staying into git root directory, run -> git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x] +> git-import-orig -vv ../tcpdf_x.y.z+dfsgw.orig.tar.xz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x] and enter version when requested with format x.y.z+dfsgw (x.y.z = version, w start from 1 and is increased for each new import) @@ -220,8 +226,8 @@ x.y.z+dfsgw Note: If there was errors solved manually, you may need to make a git commit * Add an entry into debian/changelog -> dch -v x.y.z+dfsg-1 "My comment" will add entry. -For example: dch -v x.y.z+dfsg-1 "New upstream release." for a new version +> dch -v x.y.z+dfsgw-1 "My comment" will add entry. +For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version Then modify changelog to replace "version" or "unstable" with "UNRELEASED". Warning: Date must have format reported by "date -R" @@ -239,7 +245,9 @@ Note: You can use git-buildpackage -us -uc -d if you want to test Note: Package is built into directory ../build-area Note: To compare 2 packages: debdiff package1.dsc package2.dsc -* Test package (see dedicated chapter to test it with debian unstable env) +* Test package +> cp ../build-area/* /srv/chroot/unstable/tmp +See rest of process into dedicated chapter "To test a package" to test it with debian unstable env * If package .deb is ok: Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit @@ -333,6 +341,8 @@ Note: Package is built into directory ../build-area Note: To compare 2 packages: debdiff package1.dsc package2.dsc * Test package (see dedicated chapter to test it with debian unstable env) +> cp ../build-area/* /srv/chroot/unstable/tmp +See rest of process into dedicated chapter "To test a package" to test it with debian unstable env * If package .deb is ok: Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit diff --git a/build/debian/dolibarr.lintian-overrides b/build/debian/dolibarr.lintian-overrides index 7578a575776..90120971ce9 100644 --- a/build/debian/dolibarr.lintian-overrides +++ b/build/debian/dolibarr.lintian-overrides @@ -4,4 +4,7 @@ dolibarr: non-standard-dir-perm var/lib/dolibarr/documents/ 2775 != 0755 dolibarr: desktop-command-not-in-package usr/share/applications/dolibarr.desktop xdg-open # We use to include the correct configuration for each apache version dolibarr: apache2-deprecated-auth-config Order -dolibarr: apache2-deprecated-auth-config Allow \ No newline at end of file +dolibarr: apache2-deprecated-auth-config Allow +# Ignore warning required for a good install process +dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enmod +dolibarr: apache2-reverse-dependency-calls-wrapper-script postinst a2enconf \ No newline at end of file diff --git a/build/debian/source/lintian-overrides b/build/debian/source/lintian-overrides new file mode 100644 index 00000000000..a6c41886810 --- /dev/null +++ b/build/debian/source/lintian-overrides @@ -0,0 +1,3 @@ +# Remove warning, we want to keep both standard and minified sources. +dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jsgantt/* +dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jquery/* \ No newline at end of file