[ooo-build-commit] .: patches/dev300 src/Makefile.am src/patchability-extras.zip

[Fridrich Strba]

 patches/dev300/apply                           |    7 +++
 patches/dev300/patchability-reportbuilder.diff |   11 ++++
 patches/dev300/patchability-scp2.diff          |   58 +++++++++++++++++++++++++
 patches/dev300/patchability-sdext.diff         |   17 +++++++
 src/Makefile.am                                |    1 
 src/patchability-extras.zip                    |binary
 6 files changed, 94 insertions(+)

New commits:
commit e39f04957edc10b1e0899214bec9792086af087d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Apr 28 16:47:09 2010 +0200

    Restore NovellWin32 patchability wrt. 3.2.0 lost after branding update
    
    * patches/dev300/apply:
    * patches/dev300/patchability-reportbuilder.diff:
    * patches/dev300/patchability-scp2.diff:
    * patches/dev300/patchability-sdext.diff:
    * src/Makefile.am:
    * src/patchability-extras.zip:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 51a5ebf..1f273d9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3873,3 +3873,10 @@ magyarlinuxlibertine-fonts.diff
 [ OOXML ]
 oox-import-helper-property-map-dump.diff, rodo
 oox-pptx-import-fix-text-body-vert-2.diff, n#479829, rodo
+
+[ NovellOnlyWin32 ]
+
+patches/dev300/patchability-reportbuilder.diff, fridrich
+patches/dev300/patchability-scp2.diff, fridrich
+patches/dev300/patchability-sdext.diff, fridrich
+
diff --git a/patches/dev300/patchability-reportbuilder.diff b/patches/dev300/patchability-reportbuilder.diff
new file mode 100644
index 0000000..8d13d0a
--- /dev/null
+++ b/patches/dev300/patchability-reportbuilder.diff
@@ -0,0 +1,11 @@
+diff -urEbwB --exclude=wntmsci12.pro reportbuilder/prj/d.lst reportbuilder/prj/d.lst
+--- reportbuilder/prj/d.lst	2010-04-26 12:28:00.843750000 +0200
++++ reportbuilder/prj/d.lst	2010-04-26 12:28:59.796875000 +0200
+@@ -1,6 +1,6 @@
+ # Extensions
+ 
+-..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
++..\%__SRC%\bin\oracle-report-builder.oxt %_DEST%\bin%_EXT%\sun-report-builder.oxt
+ 
+ # License
+ mkdir: %_DEST%\bin%_EXT%\reportbuilder
diff --git a/patches/dev300/patchability-scp2.diff b/patches/dev300/patchability-scp2.diff
new file mode 100644
index 0000000..edc7a3c
--- /dev/null
+++ b/patches/dev300/patchability-scp2.diff
@@ -0,0 +1,58 @@
+diff -urEbwB --exclude=wntmsci12.pro scp2/source/extensions/file_extensions.scp scp2/source/extensions/file_extensions.scp
+--- scp2/source/extensions/file_extensions.scp	2010-04-26 12:24:00.468750000 +0200
++++ scp2/source/extensions/file_extensions.scp	2010-04-26 13:06:42.625000000 +0200
+@@ -41,11 +41,11 @@
+ 
+ #ifndef WITHOUT_EXTENSION_MINIMIZER
+ 
+-File gid_File_Oxt_Presentation_Minimizer
++File gid_File_Oxt_Sun_Presentation_Minimizer
+     TXT_FILE_BODY;
+     Styles = (PACKED);
+     Dir = gid_Brand_Dir_Share_Extension_Install;
+-    Name = "presentation-minimizer.oxt";
++    Name = "sun-presentation-minimizer.oxt";
+ End
+ 
+ #endif
+@@ -54,11 +54,11 @@
+ 
+ #ifndef WITHOUT_EXTENSION_REPORTDESIGN
+ 
+-File gid_File_Oxt_Oracle_Report_Builder
++File gid_File_Oxt_Sun_Report_Builder
+     TXT_FILE_BODY;
+     Styles = (PACKED);
+     Dir = gid_Brand_Dir_Share_Extension_Install;
+-    Name = "oracle-report-builder.oxt";
++    Name = "sun-report-builder.oxt";
+ End
+ 
+ #endif
+@@ -67,7 +67,7 @@
+ 
+ #ifndef WITHOUT_EXTENSION_MEDIAWIKI
+ 
+-File gid_File_Oxt_MediaWiki
++File gid_File_Oxt_Sun_MediaWiki
+     TXT_FILE_BODY;
+     Styles = (PACKED);
+     Dir = gid_Brand_Dir_Share_Extension_Install;
+@@ -80,7 +80,7 @@
+ 
+ #ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
+ 
+-File gid_File_Oxt_Presenter_Screen
++File gid_File_Oxt_Sun_Presenter_Screen
+     TXT_FILE_BODY;
+     Styles = (PACKED);
+     Dir = gid_Brand_Dir_Share_Extension_Install;
+@@ -93,7 +93,7 @@
+ 
+ #ifndef WITHOUT_EXTENSION_PDFIMPORT
+ 
+-File gid_File_Oxt_PDF_Import
++File gid_File_Oxt_Sun_PDF_Import
+     TXT_FILE_BODY;
+     Styles = (PACKED);
+     Dir = gid_Brand_Dir_Share_Extension_Install;
diff --git a/patches/dev300/patchability-sdext.diff b/patches/dev300/patchability-sdext.diff
new file mode 100644
index 0000000..fcd0c70
--- /dev/null
+++ b/patches/dev300/patchability-sdext.diff
@@ -0,0 +1,17 @@
+diff -urEbwB --exclude=wntmsci12.pro sdext/prj/d.lst sdext/prj/d.lst
+--- sdext/prj/d.lst	2010-04-26 12:19:16.062500000 +0200
++++ sdext/prj/d.lst	2010-04-26 12:20:40.187500000 +0200
+@@ -1,11 +1,11 @@
+ mkdir: %_DEST%\bin%_EXT%\minimizer
+ mkdir: %_DEST%\bin%_EXT%\presenter
+ mkdir: %_DEST%\bin%_EXT%\pdfimport
+-..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\presentation-minimizer.oxt
++..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\sun-presentation-minimizer.oxt
+ ..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter-screen.oxt
+ ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport.oxt
+ ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
+ ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
+ ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
+-..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\presentation-minimizer.oxt
++..\%__SRC%\bin\presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\sun-presentation-minimizer.oxt
+ ..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt
diff --git a/src/Makefile.am b/src/Makefile.am
index 08476fe..34b12d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,6 +35,7 @@ EXTRA_DIST=\
 	openintro_pld.bmp \
 	openabout_pld.bmp \
 	openintro_fsfhu.bmp \
+	patchability-extras.zip \
 	sg3.sdg sg3.sdv sg3.thm \
 	sofficerc-upstream \
 	tango_mainapp_16.png \
diff --git a/src/patchability-extras.zip b/src/patchability-extras.zip
new file mode 100644
index 0000000..6b41bce
Binary files /dev/null and b/src/patchability-extras.zip differ