[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.2.1/experimental r1981: unfuzzy patch for 3.2.1.1



------------------------------------------------------------
revno: 1981
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2010-05-13 22:17:47 +0200
message:
  unfuzzy patch for 3.2.1.1
modified:
  patches/installer-logfile-check-ignore-fakeroot.diff
=== modified file 'patches/installer-logfile-check-ignore-fakeroot.diff'
--- a/patches/installer-logfile-check-ignore-fakeroot.diff	2010-05-11 22:54:27 +0000
+++ b/patches/installer-logfile-check-ignore-fakeroot.diff	2010-05-13 20:17:47 +0000
@@ -15,9 +15,9 @@
 + 			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
-@@ -1212,6 +1212,11 @@
+@@ -1125,6 +1125,11 @@
  # to download it from elsewhere
- reportdesign-mention-package-l10n-m7.diff, rengelha
+ reportdesign-mention-package-l10n.diff, rengelha
  
 +[ DebianBaseOnly and TemporaryHacks >= ooo320-m17 ]
 +# installer is run under fakeroot. fakeroot (this should be fixed, though)
@@ -26,4 +26,4 @@
 +
  [ GoOoSplash ]
  # move progress bar for go-oo splash
- go-oo-splash.diff
+ # FIXME: 2010-04-23: doesn't appply, adapt to branding changes


Reply to: