------------------------------------------------------------
revno: 2051
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2010-07-09 20:37:34 +0200
message:
fix odks confiure.pl
added:
patches/odk-configure-honour-ure-link.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-07-05 15:28:33 +0000
+++ b/changelog 2010-07-09 18:37:34 +0000
@@ -1,5 +1,8 @@
openoffice.org (1:3.2.1-5) UNRELEASED; urgency=medium
+ * debian/patches/odk-configure-honour-ure-link.diff: fix the (unneeded)
+ configure.pl of the SDK to honour ure-link (closes: #588495)
+
* debian/rules:
- for safety, add a build-conflicts against libhsqldb-java (>> 1.8.1~)
- disable Java on mips as (some new) mips buildds have serious problems
with
@@ -7,7 +10,7 @@
* debian/control.in:
- make new -common Breaks: older openoffice.org-core (closes: #587750)
- -- Rene Engelhard <r...@debian.org> Fri, 02 Jul 2010 09:56:26 +0200
+ -- Rene Engelhard <r...@debian.org> Fri, 09 Jul 2010 20:35:17 +0200
openoffice.org (1:3.2.1-4) unstable; urgency=medium
=== added file 'patches/odk-configure-honour-ure-link.diff'
--- a/patches/odk-configure-honour-ure-link.diff 1970-01-01 00:00:00
+0000
+++ b/patches/odk-configure-honour-ure-link.diff 2010-07-09 18:37:34
+0000
@@ -0,0 +1,35 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index ab452bd..a95d736 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
+@@ -1463,6 +1463,8 @@ psprint_config-no-orig.diff, jholesov
+ odk-remove-nonexisting-package.diff, i#105803
+ # fix gcj builds. we need to specify the -I.../<os> there, too
+ odk-unowinreg-osdir.diff
++# fix configure.pl
++odk-configure-honour-ure-link.diff
+
+ [ DebianOnly ]
+ open-url-support-iceanimals.diff
+diff --git a/patches/dev300/odk-configure-honour-ure-link.diff
b/patches/dev300/odk-configure-honour-ure-link.diff
+new file mode 100644
+index 0000000..4646410
+--- /dev/null
++++
openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/odk-configure-honour-ure-link.diff
+@@ -0,0 +1,16 @@
++--- odk/configure.pl-old 2010-07-09 16:48:56.000000000 +0200
+++++ odk/configure.pl 2010-07-09 16:50:37.000000000 +0200
++@@ -31,12 +31,7 @@
++
++ $main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath,
"/sdk"));
++
++-if ( $main::operatingSystem =~ m/darwin/ )
++-{
++-# $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
++-} else {
++- $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../../ure && pwd`;
++-}
+++$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
++ chomp($main::OO_SDK_URE_HOME);
++
++ $main::OO_SDK_MAKE_HOME = "";
=== modified file 'patches/series'
--- a/patches/series 2010-06-28 09:25:49 +0000
+++ b/patches/series 2010-07-09 18:37:34 +0000
@@ -2,3 +2,4 @@
fix-nodep-check.diff
installer-globals-max-1-regcomp.diff
fix-system-saxon.diff
+odk-configure-honour-ure-link.diff
