From 6a3027b3e8d082b8780cfd96d6c35cea89d33238 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 22 Jul 2011 16:40:17 +0000 Subject: [PATCH] Work on packages --- COPYRIGHT | 2 +- build/deb/changelog | 4 +- build/deb/{control => control.DEBIAN} | 2 +- build/deb/control.debian | 7 +++ build/deb/rules | 8 ++-- build/makepack-dolibarr.pl | 66 ++++++++++++++++++--------- htdocs/langs/ca_ES/admin.lang | 4 +- htdocs/langs/ca_ES/companies.lang | 2 +- htdocs/langs/es_ES/admin.lang | 4 +- htdocs/langs/es_ES/companies.lang | 2 +- 10 files changed, 66 insertions(+), 35 deletions(-) rename build/deb/{control => control.DEBIAN} (98%) mode change 100644 => 100755 create mode 100755 build/deb/control.debian diff --git a/COPYRIGHT b/COPYRIGHT index 830e89ff116..05d6c08e753 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -16,7 +16,6 @@ ArtiChow 1.07 Public Domain Yes Graphics CKEditor 3.6.1 GPL or LGPL 2.1 or MPL 1.1 Yes Editor WYSIWYG EFC/XFSS 1.0.1 LGPL 3.0 Yes Enhanced File Crypt/Extended File Stealth System FCKEditor 2.6.6 LGPL 2.1 or Mozilla PL 1.0 Yes Editor WYSIWYG -Flot 0.7 MIT Licence Yes JS library to build graph FPDF 1.6 Public domain Yes PDF generation (original code is modified) FPDF_TPL 1.1.5 Apache Software License 2.0 No GPL3 only PDF templates management FPDI 1.3.4 Apache Software License 2.0 No GPL3 only PDF templates management @@ -24,6 +23,7 @@ FPDI_Protection 1.0.3 Apache Software License 2.0 No GPL3 only PDF encr GeoIP x.x Yes GeoIP Maxmind conversion jQuery 1.6.1 GPL and MIT Licence Yes JS library jQuery UI 1.8.14 GPL and MIT Licence Yes JS library plugin UI +jQuery Flot 0.7 MIT Licence Yes JS library to build graph jQuery JCrop 0.9.8 MIT Licence Yes JS library plugin Crop (to crop images) jQuery Layout 1.3.0 GPL and MIT Licence Yes JS library plugin Layout (RC-29.15) jQuery TableDnD 0.5 GPL and MIT Licence Yes JS library plugin TableDnD (to reorder table rows) diff --git a/build/deb/changelog b/build/deb/changelog index d4a628fbb4f..fc8d0a81a84 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -1,6 +1,6 @@ -dolibarr (3.1.0-1) unstable; urgency=low +dolibarr (3.1.0-1.1) unstable; urgency=low - [ Laurent Destailleur ] + * Non-maintainer upload * New upstream release. closes: bug#634783 diff --git a/build/deb/control b/build/deb/control.DEBIAN old mode 100644 new mode 100755 similarity index 98% rename from build/deb/control rename to build/deb/control.DEBIAN index 0c35d38d224..41a2ba37d19 --- a/build/deb/control +++ b/build/deb/control.DEBIAN @@ -1,4 +1,5 @@ Package: dolibarr +Source: dolibarr Version: __VERSION__ Architecture: all Maintainer: Laurent Destailleur @@ -45,4 +46,3 @@ Description: Easy to use web based ERP & CRM software And a lot of more modules... . You can also add third parties external modules or develop yours. - \ No newline at end of file diff --git a/build/deb/control.debian b/build/deb/control.debian new file mode 100755 index 00000000000..38688b12e1b --- /dev/null +++ b/build/deb/control.debian @@ -0,0 +1,7 @@ +Source: dolibarr +Maintainer: Laurent Destailleur +Standards-Version: 3.9.1 +Section: web +Priority: optional +Homepage: http://www.dolibarr.org +Build-Depends: \ No newline at end of file diff --git a/build/deb/rules b/build/deb/rules index df233257ac4..b875626b494 100644 --- a/build/deb/rules +++ b/build/deb/rules @@ -1,4 +1,4 @@ -# -# Sample debian/rules -# -# This script is not used, so is empty. +#!/usr/bin/make -f + +%: + dh $@ \ No newline at end of file diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 6a2141bfee8..bc96628066f 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -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.112 2011/07/21 22:11:30 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.113 2011/07/22 16:40:18 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.112 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.113 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -468,19 +468,30 @@ 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`; + + # Create DEBIAN directory 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"; - $ret=`cp -r "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; - $ret=`cp -r "$SOURCE/build/deb/control" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; - $ret=`cp -r "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; - $ret=`cp -r "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; - $ret=`cp -r "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; - + print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/DEBIAN\n"; + $ret=`cp -f "$SOURCE/build/deb/config" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; + $ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; + $ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; + $ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; + print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; + open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; + open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; + while () { + $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; + print SPECTO $_; + } + close SPECFROM; + close SPECTO; + print "Version set to $MAJOR.$MINOR.$newbuild\n"; + print "Remove other files\n"; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`; - $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/perl`; @@ -513,17 +524,6 @@ if ($nboftargetok) { # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; - print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control") || die "Error"; - open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; - while () { - $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; - print SPECTO $_; - } - close SPECFROM; - close SPECTO; - print "Version set to $MAJOR.$MINOR.$newbuild\n"; - # dolibarr.desktop print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/applications\n"; $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/applications"`; @@ -581,10 +581,34 @@ if ($nboftargetok) { $olddir=getcwd(); chdir("$BUILDROOT"); + # Creation of binary package $cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}.deb"; print "Launch DEB build ($cmd)\n"; $ret=`$cmd`; print $ret."\n"; + + # Creation of source package + print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n"; + $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`; + $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`; + print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n"; + $ret=`cp -f "$SOURCE/build/deb/changelog" "$BUILDROOT/$PROJECT.tmp/debian/changelog"`; + $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`; + $ret=`cp -f "$SOURCE/build/deb/rules" "$BUILDROOT/$PROJECT.tmp/debian/rules"`; + $ret=`cp -f "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/debian/copyright"`; + #$ret=`cp -f "$SOURCE/build/deb/postinst" "$BUILDROOT/$PROJECT.tmp/debian"`; + #$ret=`cp -f "$SOURCE/build/deb/postrm" "$BUILDROOT/$PROJECT.tmp/debian"`; + #$ret=`cp -f "$SOURCE/build/deb/templates" "$BUILDROOT/$PROJECT.tmp/debian"`; + + $build = $newbuild; + $build =~ s/-.*$//g; + $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; + $ret=`$cmd`; + $cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build"; + print "Launch DEB src build ($cmd)\n"; + $ret=`$cmd`; + print $ret."\n"; + chdir("$olddir"); if ($OS =~ /windows/i) diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index d04d2711843..87a8cd1edcc 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset amb Greenwich (segons) ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons) DaylingSavingTime=Horari d'estiu (usuari) CurrentHour=Hora PHP (servidor) -CompanyTZ=Zona Horària empresa (casa mare) -CompanyHour=Hora empresa (casa mare) +CompanyTZ=Zona Horària empresa (seu central) +CompanyHour=Hora empresa (seu central) CurrentSessionTimeOut=Time out sessió actual OSEnv=Entorn SO Box=Panell diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang index 77e2e4adb78..df7dbb0ab90 100644 --- a/htdocs/langs/ca_ES/companies.lang +++ b/htdocs/langs/ca_ES/companies.lang @@ -48,7 +48,7 @@ Individual=Particular ToCreateContactWithSameName=Crearà automàticament un contacte físic amb la mateixa informació ReportByCustomers=Informe per client ReportByQuarter=Informe per tasa -ParentCompany=Casa mare +ParentCompany=Seu Central Subsidiary=Filial Subsidiaries=Filials NoSubsidiary=Cap filial diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 841addc52af..eb268695a5c 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset servidor con Greenwich (segundos) ClientOffsetWithGreenwich=Offset cliente/navegador con Greenwich (segundos) DaylingSavingTime=Horario de verano (usuario) CurrentHour=Hora PHP (servidor) -CompanyTZ=Zona Horaria empresa (casa madre) -CompanyHour=Hora empresa (casa madre) +CompanyTZ=Zona Horaria empresa (sede central) +CompanyHour=Hora empresa (sede central) CurrentSessionTimeOut=Time out sesión actual OSEnv=Entorno SO Box=Panel diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang index 23d49bba0a2..7f2e6f9fdf4 100644 --- a/htdocs/langs/es_ES/companies.lang +++ b/htdocs/langs/es_ES/companies.lang @@ -48,7 +48,7 @@ Individual=Particular ToCreateContactWithSameName=Creará automáticamente un contacto físico con la misma información ReportByCustomers=Informe por cliente ReportByQuarter=Informe por tasa -ParentCompany=Casa madre +ParentCompany=Sede central Subsidiary=Filial Subsidiaries=Filiales NoSubsidiary=Ninguna filial