From cb6f9f40b81f65e8467a6afb094ae0bbb4d8f9e4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 17 Jun 2012 19:22:44 +0200 Subject: [PATCH] Prepare release --- build/debian/changelog | 2 +- build/exe/doliwamp/doliwamp.iss | 6 +++--- build/makepack-dolibarr.pl | 2 +- build/makepack-howto.txt | 4 ++-- build/pad/pad_dolibarr.xml | 4 ++-- build/pad/pad_doliwamp.xml | 4 ++-- build/rpm/dolibarr_fedora.spec | 2 +- build/rpm/dolibarr_generic.spec | 2 +- build/rpm/dolibarr_mandriva.spec | 2 +- build/rpm/dolibarr_opensuse.spec | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 3b1aeb0907f..3d2b04c129c 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -4,6 +4,6 @@ dolibarr (3.2.0+nmu1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 10 Aug 2011 12:00:00 +0100 + -- Dolibarr team Mon, 18 Jun 2012 12:00:00 +0100 # For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz \ No newline at end of file diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 4e77d880df0..0baa034e545 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -17,9 +17,9 @@ ; ----- Change this ----- AppName=DoliWamp ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta -AppVerName=DoliWamp-3.2.0-beta +AppVerName=DoliWamp-3.2.0 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta -OutputBaseFilename=DoliWamp-3.2.0-beta +OutputBaseFilename=DoliWamp-3.2.0 ; Define full path from wich all relative path are defined ; You must modify this to put here your dolibarr root directory ;SourceDir=C:\Documents and Settings\ldestail\git\dolibarrold @@ -32,7 +32,7 @@ AppPublisherURL=http://www.nltechno.com AppSupportURL=http://www.dolibarr.org AppUpdatesURL=http://www.dolibarr.org AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares. -AppCopyright=Copyright (C) 2008-2011 Laurent Destailleur, NLTechno +AppCopyright=Copyright (C) 2008-2012 Laurent Destailleur, NLTechno DefaultDirName=c:\dolibarr DefaultGroupName=Dolibarr ;LicenseFile=COPYING diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index e14ebd9304e..68b8866d524 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -10,7 +10,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="2"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-rc"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index 44d96f3c109..b7c8899e2a9 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -8,7 +8,7 @@ This files describe steps made by Dolibarr packaging team to make a beta version of Dolibarr, step by step. - Check all files are commited. -- Update version/info in / directory (README*.txt, ChangeLog...) +- Update version/info in /ChangeLog - Update version number with x.x.x in build/doxygen/dolibarr-doxygen.doxyfile - Update version number with x.x.x in build/perl/virtualmin/dolibarr.pl - Update version number with x.x.x-y in build/makepack-dolibarr.pl @@ -34,7 +34,7 @@ This files describe steps made by Dolibarr packaging team to make a complete release of Dolibarr, step by step. - Check all files are commited. -- Update version/info in / directory (README*.txt, ChangeLog...) +- Update version/info in /ChangeLog - Update version number with x.x.x-y in build/makepack-dolibarr.pl - Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss - Update version number with x.x.x-y in htdocs/filefunc.inc.php diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml index 1d609838f97..8b85e501dd7 100644 --- a/build/pad/pad_dolibarr.xml +++ b/build/pad/pad_dolibarr.xml @@ -35,8 +35,8 @@ Dolibarr 3.2.0 - 05 - 10 + 06 + 18 2012 diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml index deae060cbc8..31a30d2d24e 100644 --- a/build/pad/pad_doliwamp.xml +++ b/build/pad/pad_doliwamp.xml @@ -35,8 +35,8 @@ DoliWamp 3.2.0 - 10 - 05 + 06 + 18 2012 diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 93b290510e8..a306112108e 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -312,5 +312,5 @@ fi %changelog -* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.2.beta1 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 40df91e4008..88991dcebbb 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -368,5 +368,5 @@ fi %changelog -* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.2.beta1 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index eda35d0ed74..86a570cdd91 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -301,5 +301,5 @@ fi %changelog -* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.2.beta1 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 9e37eb4ec29..512f7a021a7 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -306,5 +306,5 @@ fi %changelog -* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.2.beta1 +* Mon Jun 18 2012 Laurent Destailleur 3.2.0-0.3 - Initial version (#723326)