diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 16:25:15 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 16:25:15 +0200 |
| commit | 945cb626e0cd0a097b8dc0d7db7c8a251ac860cc (patch) | |
| tree | f03131c033518af0c540893965cbf52402040c4a | |
| parent | eb788aa4cf88582c172c92c2c127a35b30bb3c2a (diff) | |
Unify ArkOnly
| -rw-r--r-- | patches/dev300/apply | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 5bd7b1695..105233743 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -571,6 +571,13 @@ SectionOwner => brosenk # Db 4.3/4.4 needs -lpthread system-db-4.3-use-lpthread.diff, i#58474, rengelha +# We use KMail... +# There's no point in upstreaming this because not everyone uses KMail. +ark-default-ExternalMailer.diff + +# See what breaks if we build with more optimizations +testing-more-optimizations-ark.diff + [ PLDOnly ] SectionOwner => arekm @@ -1185,13 +1192,6 @@ kde4-kab.diff # we need a good plan before, though ;-) split-icons-search-usr-share.diff, n#296502, pmladek -[ ArkOnly ] -SectionOwner => brosenk - -# We use KMail... -# There's no point in upstreaming this because not everyone uses KMail. -ark-default-ExternalMailer.diff - [ ArkOnlyExperimental ] # There's no point in upstreaming this because it relies on the Ark # Java lib naming scheme and won't work anywhere else. @@ -1366,11 +1366,6 @@ sw-do-not-capture-surround-through-objs-patch.diff, n#367341, i#18732, flr # need to be fixed in Pootle; sent mail to l10n@es.libreoffice.org # sc-autofilter-l10n-es.diff, i#103840, pmladek -[ ArkOnly ] -SectionOwner => brosenk -# See what breaks if we build with more optimizations -testing-more-optimizations-ark.diff - [ NovellLikeOnlyWin32 ] # FIXME: 2009-09-11: Bypass this for now. Interferes with |