------------------------------------------------------------
revno: 1994
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Thu 2010-05-20 13:37:59 +0200
message:
remove installer-logfile-check-ignore-fakeroot.diff, obsolete
removed:
patches/installer-logfile-check-ignore-fakeroot.diff
modified:
patches/series
=== removed file 'patches/installer-logfile-check-ignore-fakeroot.diff'
--- a/patches/installer-logfile-check-ignore-fakeroot.diff 2010-05-13
20:17:47 +0000
+++ b/patches/installer-logfile-check-ignore-fakeroot.diff 1970-01-01
00:00:00 +0000
@@ -1,29 +0,0 @@
---- /dev/null 2010-05-02 17:01:50.016998199 +0200
-+++
openoffice.org-3.2.1~rc1/ooo-build-3-2-1-1/patches/dev300/installer-logfile-check-ignore-fakeroot.diff
2010-05-08 16:18:58.000000000 +0200
-@@ -0,0 +1,12 @@
-+diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
-+--- solenv/bin/modules/installer/control.pm
-++++ solenv/bin/modules/installer/control.pm
-+@@ -342,7 +342,7 @@
-+ $compareline =~ s/Error\.idl//g; # removing all
occurences of "Error.idl"
-+ $compareline =~ s/Error\.html//g; # removing all
occurences of "Error.html"
-+
-+- if ( $compareline =~ /\bError\b/i )
-++ if ( $compareline =~ /\bError\b/i && $compareline !~ /fakeroot/
)
-+ {
-+ $contains_error = 1;
-+ push(@errors, $line);
---- openoffice.org-3.2.1~rc1/ooo-build-3-2-1-1/patches/dev300/apply-old
2010-05-08 14:26:44.000000000 +0200
-+++ openoffice.org-3.2.1~rc1/ooo-build-3-2-1-1/patches/dev300/apply
2010-05-08 14:28:19.000000000 +0200
-@@ -1125,6 +1125,11 @@
- # to download it from elsewhere
- reportdesign-mention-package-l10n.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...
-+installer-logfile-check-ignore-fakeroot.diff, rengelha
-+
- [ GoOoSplash ]
- # move progress bar for go-oo splash
- # FIXME: 2010-04-23: doesn't appply, adapt to branding changes
=== modified file 'patches/series'
--- a/patches/series 2010-05-19 20:14:16 +0000
+++ b/patches/series 2010-05-20 11:37:59 +0000
@@ -1,3 +1,2 @@
branch-update-275dce9de504ce941389f1b15a6f763124d6086a.diff
-installer-logfile-check-ignore-fakeroot.diff
extensions-mozilla-plugin-pc-if-libxul.diff
