------------------------------------------------------------
revno: 1966
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Sat 2010-05-08 16:31:43 +0200
message:
add /usr/lib/libfakeroots and fix environment changing, though that doesn't
help the installer yet - add temporary(?) hack to fix it; it sees the fakeroot
ERRORs and fails
added:
patches/revert-installer-worker-error-reporting.diff
modified:
changelog
patches/series
rules
=== modified file 'changelog'
--- a/changelog 2010-05-07 22:51:44 +0000
+++ b/changelog 2010-05-08 14:31:43 +0000
@@ -22,7 +22,7 @@
- use "non-split" tarballs from Oracle
* debian/broffice.org.*: update diversions for new about.png
- -- Rene Engelhard <r...@debian.org> Thu, 06 May 2010 18:17:37 +0200
+ -- Rene Engelhard <r...@debian.org> Sat, 08 May 2010 16:31:32 +0200
openoffice.org (1:3.2.0-9) unstable; urgency=low
=== added file 'patches/revert-installer-worker-error-reporting.diff'
--- a/patches/revert-installer-worker-error-reporting.diff 1970-01-01
00:00:00 +0000
+++ b/patches/revert-installer-worker-error-reporting.diff 2010-05-08
14:31:43 +0000
@@ -0,0 +1,33 @@
+--- /dev/null 2010-05-02 17:01:50.016998199 +0200
++++
openoffice.org-3.2.1~rc1/ooo-build-3-2-0-99-3/patches/dev300/revert-installer-worker-error-reporting.diff
2010-05-08 14:26:00.000000000 +0200
+@@ -0,0 +1,16 @@
++diff --git a/solenv/bin/modules/installer/worker.pm
b/solenv/bin/modules/installer/worker.pm
++--- solenv/bin/modules/installer/worker.pm
+++++ solenv/bin/modules/installer/worker.pm
++@@ -491,12 +491,6 @@
++
++ if ( $installer::globals::creating_windows_installer_patch ) {
$installer::globals::creating_windows_installer_patch = 0; }
++
++- # Exiting the packaging process, if an error occured.
++- # This is important, to get an error code "-1", if an error was found
in the log file,
++- # that did not break the packaging process
++-
++- if ( ! $is_success) { installer::exiter::exit_program("ERROR: Found
an error in the logfile. Packaging failed.", "analyze_and_save_logfile"); }
++-
++ return ($is_success, $finalinstalldir);
++ }
++
+--- openoffice.org-3.2.1~rc1/ooo-build-3-2-0-99-3/patches/dev300/apply-old
2010-05-08 14:26:44.000000000 +0200
++++ openoffice.org-3.2.1~rc1/ooo-build-3-2-0-99-3/patches/dev300/apply
2010-05-08 14:28:19.000000000 +0200
+@@ -1212,6 +1212,11 @@
+ # to download it from elsewhere
+ reportdesign-mention-package-l10n-m7.diff, rengelha
+
++[ DebianBaseOnly and TemporaryHacks >= ooo320-m17 ]
++# installer is run under fakeroot. fakeroot (this should be fixed, though)
++# reports an ERROR: which since m17 makes the installer fail...
++revert-installer-worker-error-reporting.diff, rengelha
++
+ [ GoOoSplash ]
+ # move progress bar for go-oo splash
+ go-oo-splash.diff
=== modified file 'patches/series'
--- a/patches/series 2010-05-07 22:52:16 +0000
+++ b/patches/series 2010-05-08 14:31:43 +0000
@@ -6,3 +6,4 @@
fix-system-mythes-for-mythes-1.2.diff
m16.diff
m17.diff
+revert-installer-worker-error-reporting.diff
=== modified file 'rules'
--- a/rules 2010-05-07 22:51:44 +0000
+++ b/rules 2010-05-08 14:31:43 +0000
@@ -1293,7 +1293,7 @@
endif
endif
BUILD_PATH := $(CURDIR)/debian/usr/bin:$(BUILD_PATH)
-BUILD_LD_LIBRARY_PATH := $(BUILD_LD_LIBRARY_PATH):$(GCJ_JAWT_DIR)
+BUILD_LD_LIBRARY_PATH :=
/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH):$(GCJ_JAWT_DIR)
ifeq "$(ENABLE_LDAP)" "y"
ifeq "$(USE_OPENLDAP)" "y"
@@ -1995,8 +1995,8 @@
# apparently setting this here globally doesn't work, so hack around.
# If we don't do this we get loads of harmless, but log-bloating
# warnings
- if ! grep fakeroot $(SOURCE_TREE)/*.sh; then \
- perl -pi -e
's,LD_LIBRARY_PATH=\"(.*)\",LD_LIBRARY_PATH=\"/usr/lib/libfakeroot:\1\",'
$(SOURCE_TREE)/*.sh; \
+ if ! grep fakeroot $(OOO_BUILD_TREE)/bin/setup; then \
+ perl -pi -e
's,LD_LIBRARY_PATH=\"(.*)\",LD_LIBRARY_PATH=\"/usr/lib/libfakeroot:\1\",'
$(OOO_BUILD_TREE)/bin/setup; \
fi
# DPKG is only set on with-EPM build what we don't do and the menu stuff
@@ -2066,7 +2066,7 @@
# install OpenOffice.org.
cd $(OOO_BUILD_TREE)/; PATH=$(BUILD_PATH) \
- LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH)"
\
+
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH)" \
DESTDIR=$(CURDIR)/debian/tmp $(MAKE) install
# prepare install/dir files for dh
