srb1: merge from DEv300:m83

12 files changed, 23 insertions, 55 deletions

diff --git a/jfreereport/download/sacjava-1.3.zip b/jfreereport/download/sacjava-1.3.zip
deleted file mode 100644
index 20eb8012eb2a..000000000000
--- a/jfreereport/download/sacjava-1.3.zip
+++ /dev/null
diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
index 42b8fdd3062b..2de23ec7bb54 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,6 +40,8 @@ TARGET=flute
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)-$(FLUTE_VERSION)
+TARFILE_MD5=f3e2febd267c8e4b13df00dac211dd6d
+# TARFILE_ROOTDIR=$(TARGET)
 TARFILE_IS_FLAT=true
 PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
 CONVERTFILES=common_build.xml
diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk
index 2c630f34b4ea..85c03fdb33e3 100644
--- a/jfreereport/java/jfreereport/makefile.mk
+++ b/jfreereport/java/jfreereport/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,6 +41,7 @@ TARGET=flow-engine
 .IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)-$(FLOW_ENGINE_VERSION)
 TARFILE_IS_FLAT=true
+TARFILE_MD5=d4c4d91ab3a8e52a2e69d48d34ef4df4
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
 CONVERTFILES=build.xml
 
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk
index 04acff1621b3..3dd97f9387a2 100644
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,6 +39,7 @@ TARGET=libbase
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)-$(LIBBASE_VERSION)
+TARFILE_MD5=8ea307d71d11140574bfb9fcc2487e33
 #TARFILE_ROOTDIR=$(TARGET)
 TARFILE_IS_FLAT=true
 
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
index 4de9039f1f8f..a76938d868a1 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,6 +41,7 @@ TARGET=libfonts
 .IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)-$(LIBFONTS_VERSION)
 TARFILE_IS_FLAT=true
+TARFILE_MD5=f7925ba8491fe570e5164d2c72791358
 PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
 CONVERTFILES=common_build.xml
 
diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk
index 5256b06956ab..a3aa18fee7b8 100644
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,6 +41,7 @@ TARGET=libformula
 .IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)-$(LIBFORMULA_VERSION)
 TARFILE_IS_FLAT=true
+TARFILE_MD5=d1a3205871c3c52e8a50c9f18510ae12
 PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
 CONVERTFILES=common_build.xml
 
diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk
index 7a47e736ec17..94c6beda5595 100644
--- a/jfreereport/java/liblayout/makefile.mk
+++ b/jfreereport/java/liblayout/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,6 +41,7 @@ TARGET=liblayout
 .IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)-$(LIBLAYOUT_VERSION)
 TARFILE_IS_FLAT=true
+TARFILE_MD5=79600e696a98ff95c2eba976f7a8dfbb
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
 CONVERTFILES=build.xml
 
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index 22757ffc969a..58bb579e84d8 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,6 +41,7 @@ TARGET=libloader
 
 TARFILE_NAME=$(TARGET)-$(LIBLOADER_VERSION)
 TARFILE_IS_FLAT=true
+TARFILE_MD5=a06a496d7a43cbdc35e69dbe678efadb
 PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
 CONVERTFILES=common_build.xml
 
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index 5b620164340a..97316f9a93ba 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,6 +41,7 @@ TARGET=librepository
 
 TARFILE_NAME=$(TARGET)-$(LIBREPOSITORY_VERSION)
 TARFILE_IS_FLAT=true
+TARFILE_MD5=dbb3757275dc5cc80820c0b4dd24ed95
 PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
 CONVERTFILES=common_build.xml
 
diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk
index b734bc220bef..83bb255d84f5 100644
--- a/jfreereport/java/libserializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,6 +41,7 @@ TARGET=libserializer
 .IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)-$(LIBSERIALIZER_VERSION)
 TARFILE_IS_FLAT=true
+TARFILE_MD5=5aba06ede2daa9f2c11892fbd7bc3057
 PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
 CONVERTFILES=common_build.xml
                 
diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk
index 65f20ddbb58b..afc941c80e5a 100644
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,6 +41,7 @@ TARGET=libxml
 .IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)-$(LIBXML_VERSION)
 TARFILE_IS_FLAT=true
+TARFILE_MD5=67b42915c8432abf0a922438f00860a2
 PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
 CONVERTFILES=common_build.xml
 
diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk
index 43aa15fe2db5..01d6186fd36d 100644
--- a/jfreereport/java/sac/makefile.mk
+++ b/jfreereport/java/sac/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,6 +45,7 @@ ANT_BUILDFILE=build.xml
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=sacjava-1.3
+TARFILE_MD5=39bb3fcea1514f1369fcfc87542390fd
 
 TARFILE_ROOTDIR=$(TARGET)