diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 16:30:21 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 16:30:21 +0200 |
| commit | 66516232a53046a6c9c821cf73e6a800f89f45bd (patch) | |
| tree | 470b7675e5cdf5e04f554adff0698c5ea4159db5 | |
| parent | 1b5907ff3718a9deb14cd71840c9bf24418fdc56 (diff) | |
Unify NovellLikeOnlyWin32
| -rw-r--r-- | patches/dev300/apply | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 2f4924a80..ef1d41f78 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -86,7 +86,7 @@ Win32 : Win32Common # translate.org.za translate-org-za-linux: translate-org-za-common, LinuxCommon, Common translate-org-za-win32: translate-org-za-common, Win32Common, Common -NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin32Only, \ +NovellLikeWin32: Win32Common, NovellOnly, MultilanguageWin32Only, \ CustomUserConfig, LiberationFontsOnWindows # Novell NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, Win32Packaging @@ -1240,10 +1240,18 @@ sled10-splash.diff, i#123456, pmladek [ SUSE112 ] xulrunner-1.9.1.diff, ccheney -[ NovellLikeOnlyWin32 ] +#[ NovellLikeOnlyWin32 ] # Drop this for now # novell-win32-msi-patchability.diff, tml +# FIXME: 2009-09-11: Bypass this for now. Interferes with +# cws-koheidatapilot03-vcl.diff. Test whether still needed, and if +# yes, will have to split out the interfering part of +# cws-koheidatapilot03-vcl.diff into separate versions for +# NovellLikeOnlyWin32 and others. (I am not at all sure enough about +# this to have it used on all platforms.) --tml +# i92372.diff, i#92372, n#353143, tml + [ PardusOnly ] pardus-default-ExternalMailer.diff pardus-clipart.diff @@ -1360,15 +1368,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 -[ NovellLikeOnlyWin32 ] - -# FIXME: 2009-09-11: Bypass this for now. Interferes with -# cws-koheidatapilot03-vcl.diff. Test whether still needed, and if -# yes, will have to split out the interfering part of -# cws-koheidatapilot03-vcl.diff into separate versions for -# NovellLikeOnlyWin32 and others. (I am not at all sure enough about -# this to have it used on all platforms.) --tml -# i92372.diff, i#92372, n#353143, tml [ MinGW ] # build fix for odma - not up-stream |