From 2bc63a86a93ccdd5cda67b55c97d552d6d8dc5ba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Mar 2014 18:05:52 +0100 Subject: [PATCH] Alignement of debian packaging files --- build/debian/README.Debian | 13 +++++++++++++ build/debian/README.source | 12 ------------ build/debian/dolibarr.doc-base | 10 ---------- build/debian/dolibarr.docs | 2 ++ build/debian/dolibarr.install | 2 -- build/debian/rules | 6 ++++++ build/launchpad/README | 2 +- build/makepack-dolibarr.pl | 7 +++---- 8 files changed, 25 insertions(+), 29 deletions(-) create mode 100644 build/debian/README.Debian delete mode 100644 build/debian/README.source delete mode 100644 build/debian/dolibarr.doc-base create mode 100644 build/debian/dolibarr.docs diff --git a/build/debian/README.Debian b/build/debian/README.Debian new file mode 100644 index 00000000000..e5262b8c61a --- /dev/null +++ b/build/debian/README.Debian @@ -0,0 +1,13 @@ +Information about Dolibarr in Debian +------------------------------------ + +The Debian package provides integration with apache2 and lighttpd. +If you have one of those servers installed, then Dolibarr is immediately +accessible at http://localhost/dolibarr/ + +But it won't be usable until you configure it via +http://localhost/dolibarr/install/ + +To complete the setup process you will need the MySQL root credentials +because the Dolibarr installer will create the database and the dedicated user +for you. diff --git a/build/debian/README.source b/build/debian/README.source deleted file mode 100644 index 298db1e8595..00000000000 --- a/build/debian/README.source +++ /dev/null @@ -1,12 +0,0 @@ -================================================================== -Dolibarr - Web based software to manage a small company or foundation -================================================================== - - -Note for package maintainers ----------------------------- -This file explains how to modify official sources (from http://www.dolibarr.org) -to have ready to use source files to build a debian package. - -All changes are included into patch file -build/debian/patches diff --git a/build/debian/dolibarr.doc-base b/build/debian/dolibarr.doc-base deleted file mode 100644 index d7d5666d883..00000000000 --- a/build/debian/dolibarr.doc-base +++ /dev/null @@ -1,10 +0,0 @@ -Document: dolibarr -Title: Dolibarr ERP & CRM documentation -Author: Dolibarr team -Abstract: This documentation covers the install, use and administration of - Dolibarr ERP & CRM software. -Section: Office - -Format: HTML -Index: /usr/share/doc/dolibarr/index.html -Files: /usr/share/doc/dolibarr/*.html \ No newline at end of file diff --git a/build/debian/dolibarr.docs b/build/debian/dolibarr.docs new file mode 100644 index 00000000000..5d4b554ef74 --- /dev/null +++ b/build/debian/dolibarr.docs @@ -0,0 +1,2 @@ +README.md +README-FR.md diff --git a/build/debian/dolibarr.install b/build/debian/dolibarr.install index 72dff46ed15..a49ad442eb5 100755 --- a/build/debian/dolibarr.install +++ b/build/debian/dolibarr.install @@ -6,8 +6,6 @@ debian/lighttpd/50-dolibarr.conf etc/lighttpd/conf-available/ debian/install.forced.php.install etc/dolibarr/ htdocs usr/share/dolibarr/ scripts usr/share/dolibarr/ -changelog usr/share/doc/dolibarr/ -README usr/share/doc/dolibarr/ doc/install usr/share/doc/dolibarr/ doc/user usr/share/doc/dolibarr/ doc/index.html usr/share/doc/dolibarr/ \ No newline at end of file diff --git a/build/debian/rules b/build/debian/rules index 776dd540eb7..bd3a9badb09 100755 --- a/build/debian/rules +++ b/build/debian/rules @@ -9,6 +9,12 @@ export DH_OPTIONS=-v %: dh $@ + +override_dh_auto_clean: +# Do nothing. Added to disable launchpad to use bugged dh_auto_clean search for ant + +override_dh_auto_build: +# Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant override_dh_install: dh_install diff --git a/build/launchpad/README b/build/launchpad/README index 0107c7d9537..973509aa6d1 100644 --- a/build/launchpad/README +++ b/build/launchpad/README @@ -81,7 +81,7 @@ If you want to build/test package locally: bzr init bzr add bzr commit -m "Init control files" - bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable] (put here any branch name) + bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable] (put here any branch name or just bzr push if into a known branch) - or download it from launchpad bazaar: cd bzr bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable] diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index b82fdcb05a0..b7c43443ed8 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -365,7 +365,6 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build.xml`; $ret=`rm -f $BUILDROOT/$PROJECT/quickbuild.xml`; $ret=`rm -f $BUILDROOT/$PROJECT/pom.xml`; - $ret=`mv $BUILDROOT/$PROJECT/README.md $BUILDROOT/$PROJECT/README`; $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`; $ret=`rm -f $BUILDROOT/$PROJECT/build/Doli*-*`; @@ -708,7 +707,7 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/copyright`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.config`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.doc-base`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.docs`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.install`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postrm`; @@ -716,6 +715,7 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/rules`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/README.Debian`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/build/debian/watch`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`; @@ -744,11 +744,10 @@ if ($nboftargetok) { $ret=`cp -f "$SOURCE/build/debian/control" "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`cp -f "$SOURCE/build/debian/copyright" "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`cp -f "$SOURCE/build/debian/dolibarr.desktop" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/dolibarr.doc-base" "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`cp -f "$SOURCE/build/debian/dolibarr.docs" "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`cp -f "$SOURCE/build/debian/dolibarr.install" "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`cp -f "$SOURCE/build/debian/dolibarr.lintian-overrides" "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`cp -f "$SOURCE/build/debian/dolibarr.xpm" "$BUILDROOT/$PROJECT.tmp/debian"`; - $ret=`cp -f "$SOURCE/build/debian/README.source" "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`cp -f "$SOURCE/build/debian/rules" "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`cp -f "$SOURCE/build/debian/watch" "$BUILDROOT/$PROJECT.tmp/debian"`; $ret=`cp -fr "$SOURCE/build/debian/patches" "$BUILDROOT/$PROJECT.tmp/debian"`;