Petr Mladek píše v Pá 13. 04. 2012 v 18:36 +0200: > Petr Mladek píše v Pá 13. 04. 2012 v 18:00 +0200: > > Korrawit Pruegsanusak píše v Pá 13. 04. 2012 v 22:40 +0700: > > > Hello again Petr, > > > > > > On Fri, Apr 13, 2012 at 21:34, Petr Mladek <[email protected]> wrote: > > > > "the scripts "download" and "unpack-sources" needed some changes to work > > > > with the newly generated .xz source tarballs [snip] > > > > > > And I think that ./unpack-sources line 87 should be removed as well. > > > Because we don't have 'bootstrap' now. :-) > > > http://cgit.freedesktop.org/libreoffice/core/tree/bin/unpack-sources#n87 > > > > I did my best to update the stuff for download but I did not test it. My > > changes are step forward but it seems that they are not enough. If you > > want, you could improve it. Otherwise, I will look at it the following > > week.
ok, so the download started to work with http://cgit.freedesktop.org/libreoffice/core/commit/?id=ae9a98b436e7ee9c246b85d8e9bb4ff94732f3b8 It was more complicated because the core.ver file got deleted by configure. Also solenv/inc/minor.mk could not be sourced into the shell because of brackets in the RSCREVISION variable. Anyway, it works now. So, we need to cherry-pick two commits: http://cgit.freedesktop.org/libreoffice/core/commit/?id=f780859b76263638b9227122e465b0c629c7ca3e http://cgit.freedesktop.org/libreoffice/core/commit/?id=ae9a98b436e7ee9c246b85d8e9bb4ff94732f3b8 The merged commit for -3-5 is attached. If you want to test it, you need to copy the attached sources.ver into the libreoffice-core-3.5.2.2 sources. It will be generated for the next release, see the change in bin/lo-pack-sources. Best Regards, Petr
>From 3b4f4ee2ead4ff77bb530862bc42a2fb5cd5be94 Mon Sep 17 00:00:00 2001 From: Petr Mladek <[email protected]> Date: Thu, 5 Apr 2012 11:24:07 +0200 Subject: [PATCH] match version in about dialog and file properties (bnc#47840) bump VERSIONMICRO to 3 and reset buildid to 0 --- solenv/inc/minor.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 0b94955..fdd3cd2 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,11 +1,11 @@ RSCVERSION=350 -RSCREVISION=350m1(Build:300) -BUILD=300 +RSCREVISION=350m1(Build:0) +BUILD=0 LAST_MINOR=m1 SOURCEVERSION=OOO350 VERSIONMAJOR=3 VERSIONMINOR=5 -VERSIONMICRO=0 +VERSIONMICRO=3 COPYRIGHTYEARRANGE=2000-2012 -- 1.7.8.3
lo_sources_ver=3.5.2.2
_______________________________________________ LibreOffice mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice
