summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-24 17:15:34 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-24 17:15:34 +0100
commit2a81e5d48e60fd9dd2729dbcd2cd1dfd6d6c2bd0 (patch)
treebf88ff9fc74890afdba709367a728c8db34e9e18
parentbd4f6ffc37e76996f97368bc73844ce68e63acbe (diff)
remove help-msg-add-package-info.diff, downstreamed to debian-experimental-3.5
-rw-r--r--patches/dev300/apply2
-rw-r--r--patches/dev300/help-msg-add-package-info.diff11
2 files changed, 0 insertions, 13 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9967d1a8e..c958f4bbe 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -359,8 +359,6 @@ sensible-browser.diff
# add JDK paths for MySQL, PostgreSQL, JTDS
jdbc-driver-classpaths-debian.diff
-help-msg-add-package-info.diff
-
soffice-opengl-and-locking-config.diff, mklose
#configures-explicit-arch.diff
diff --git a/patches/dev300/help-msg-add-package-info.diff b/patches/dev300/help-msg-add-package-info.diff
deleted file mode 100644
index 510cf0054..000000000
--- a/patches/dev300/help-msg-add-package-info.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- sfx2/source/appl/sfxhelp.cxx~ 2006-02-15 02:53:15.839949000 +0100
-+++ sfx2/source/appl/sfxhelp.cxx 2006-02-15 02:55:01.389949000 +0100
-@@ -151,7 +151,7 @@
-
- NoHelpErrorBox::NoHelpErrorBox( Window* _pParent ) :
-
-- ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST ) ) )
-+ ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST ) ).Append(String(DEFINE_CONST_UNICODE(".\nPlease install the openoffice.org-help-en-us package or the locale specific help package openoffice.org-help-<language-code>."))) )
- {
- // Error message: "No help available"
- }