summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--editors/openoffice.org-2-RC/Makefile4
-rw-r--r--editors/openoffice.org-2-RC/distinfo6
-rw-r--r--editors/openoffice.org-2-RC/files/patch-i7403816
-rw-r--r--editors/openoffice.org-3-RC/Makefile4
-rw-r--r--editors/openoffice.org-3-RC/distinfo6
-rw-r--r--editors/openoffice.org-3-RC/files/patch-i7403816
6 files changed, 10 insertions, 42 deletions
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 0fc2e3543a46..e67f2cf54a49 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -78,10 +78,10 @@ IGNORE= install lang/perl5.8 then try again
.endif
CODELINE= 680
-MILESTONE?= 5
+MILESTONE?= 6
OOOTAG?= OOF680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE= 20070130
+SNAPDATE= 20070205
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
.if defined(WITH_CWS)
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 77560245a363..96fe2e6d0660 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = c95bd80c5cc46e1f88e7f3069c370585
-SHA256 (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = e27308862571c69d1afffb2af8c60c1089f3a45b5b7170c2f4046aad8df10f0d
-SIZE (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = 265636571
+MD5 (openoffice.org2.0/OOo_OOF680_m6_source.tar.bz2) = 96d504560284d1bba71567105bf4599b
+SHA256 (openoffice.org2.0/OOo_OOF680_m6_source.tar.bz2) = 668a667473d443423e93681786fa824a9a8b73fc0ec5c94b4d1149756df50680
+SIZE (openoffice.org2.0/OOo_OOF680_m6_source.tar.bz2) = 268843921
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-2-RC/files/patch-i74038 b/editors/openoffice.org-2-RC/files/patch-i74038
deleted file mode 100644
index d88d78c16efb..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-i74038
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: basctl/source/inc/localizationmgr.hxx
-===================================================================
-RCS file: /cvs/script/basctl/source/inc/localizationmgr.hxx,v
-retrieving revision 1.2.2.2
-diff -u -p --unified -r1.2.2.2 localizationmgr.hxx
---- basctl/source/inc/localizationmgr.hxx 29 Jan 2007 13:56:23 -0000 1.2.2.2
-+++ basctl/source/inc/localizationmgr.hxx 30 Jan 2007 22:26:14 -0000
-@@ -135,7 +135,7 @@ public:
- < ::com::sun::star::container::XNameContainer > xDialogLib );
-
- // Clipboard
-- static void LocalizationMgr::resetResourceForDialog(
-+ static void resetResourceForDialog(
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel,
- ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager );
-
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 0fc2e3543a46..e67f2cf54a49 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -78,10 +78,10 @@ IGNORE= install lang/perl5.8 then try again
.endif
CODELINE= 680
-MILESTONE?= 5
+MILESTONE?= 6
OOOTAG?= OOF680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE= 20070130
+SNAPDATE= 20070205
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
.if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 77560245a363..96fe2e6d0660 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = c95bd80c5cc46e1f88e7f3069c370585
-SHA256 (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = e27308862571c69d1afffb2af8c60c1089f3a45b5b7170c2f4046aad8df10f0d
-SIZE (openoffice.org2.0/OOo_OOF680_m5_source.tar.bz2) = 265636571
+MD5 (openoffice.org2.0/OOo_OOF680_m6_source.tar.bz2) = 96d504560284d1bba71567105bf4599b
+SHA256 (openoffice.org2.0/OOo_OOF680_m6_source.tar.bz2) = 668a667473d443423e93681786fa824a9a8b73fc0ec5c94b4d1149756df50680
+SIZE (openoffice.org2.0/OOo_OOF680_m6_source.tar.bz2) = 268843921
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-RC/files/patch-i74038 b/editors/openoffice.org-3-RC/files/patch-i74038
deleted file mode 100644
index d88d78c16efb..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-i74038
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: basctl/source/inc/localizationmgr.hxx
-===================================================================
-RCS file: /cvs/script/basctl/source/inc/localizationmgr.hxx,v
-retrieving revision 1.2.2.2
-diff -u -p --unified -r1.2.2.2 localizationmgr.hxx
---- basctl/source/inc/localizationmgr.hxx 29 Jan 2007 13:56:23 -0000 1.2.2.2
-+++ basctl/source/inc/localizationmgr.hxx 30 Jan 2007 22:26:14 -0000
-@@ -135,7 +135,7 @@ public:
- < ::com::sun::star::container::XNameContainer > xDialogLib );
-
- // Clipboard
-- static void LocalizationMgr::resetResourceForDialog(
-+ static void resetResourceForDialog(
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel,
- ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager );
-