[Libreoffice-commits] .: 2 commits - hsqldb/ExternalProject_hsqldb.mk solenv/gbuild

[Libreoffice Gerrit user]

 hsqldb/ExternalProject_hsqldb.mk |    5 +----
 solenv/gbuild/UnpackedTarball.mk |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 6ded01b0762554e2d90fef6557a0cdae2e0c7a2b
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Oct 3 14:11:10 2012 +0200

    two shall be the number thou shalt count
    
    Change-Id: If84003c6a95cee0fd6e4e985ec0655f7074b0851

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index c96d4ce..7312362 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -100,7 +100,7 @@ endef
 
 # This is what dmake patches use. Once all external modules are
 # converted, it is better to be changed to 1.
-gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 3
+gb_UnpackedTarball_PATCHLEVEL_DEFAULT := 2
 
 gb_UnpackedTarball_CONVERTTODOS = \
 	$(gb_AWK) 'sub("$$","\r")' $(1) > $(1).TEMP && mv $(1).TEMP $(1)
commit ce7372c3bd8755accf1bc1db1f44bd78d1a55421
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Sep 27 08:44:14 2012 +0200

    do not overcomplicate this
    
    Change-Id: I08add6a39547dd1a674b0efd52d6d4d257b92557

diff --git a/hsqldb/ExternalProject_hsqldb.mk b/hsqldb/ExternalProject_hsqldb.mk
index b9144b6..c45725e 100644
--- a/hsqldb/ExternalProject_hsqldb.mk
+++ b/hsqldb/ExternalProject_hsqldb.mk
@@ -7,9 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# for RSCREVISION
-include $(SOLARENV)/inc/minor.mk
-
 $(eval $(call gb_ExternalProject_ExternalProject,hsqldb))
 
 $(eval $(call gb_ExternalProject_use_unpacked,hsqldb,hsqldb))
@@ -23,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,hsqldb,build) :
 	"$(ANT)" \
 		-q \
 		-f build/build.xml \
-		-Dbuild.label="build-$(RSCREVISION)" \
+		-Dbuild.label="build-libreoffice" \
 		$(if $(filter yes,$(JAVACISGCJ))\
 			,-Dbuild.compiler=gcj \
 			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \