[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/novell-win32-agfa-monotype-fonts.diff |   32 -------------------
 patches/dev300/postprocess-extra-extensions.diff     |   11 ------
 2 files changed, 2 insertions(+), 41 deletions(-)

New commits:
commit 1a73b25545d25029e9299996ef011086726401dc
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jul 28 11:45:05 2010 +0200

    Massage to apply correctly
    
    * patches/dev300/novell-win32-agfa-monotype-fonts.diff:
    * patches/dev300/postprocess-extra-extensions.diff:

diff --git a/patches/dev300/novell-win32-agfa-monotype-fonts.diff b/patches/dev300/novell-win32-agfa-monotype-fonts.diff
index 7e9157b..6b6ca50 100644
--- a/patches/dev300/novell-win32-agfa-monotype-fonts.diff
+++ b/patches/dev300/novell-win32-agfa-monotype-fonts.diff
@@ -1,18 +1,3 @@
----
- agfa_monotype_fonts/makefile.mk   |   81 +++++++++++++++++++++++++++++++++++++
- agfa_monotype_fonts/prj/build.lst |    3 +
- agfa_monotype_fonts/prj/d.lst     |    2 +
- configure.in                      |   17 ++++++++
- postprocess/prj/build.lst         |    2 +-
- scp2/source/ooo/file_font_ooo.scp |   27 ++++++++++++
- 6 files changed, 131 insertions(+), 1 deletions(-)
- create mode 100644 agfa_monotype_fonts/makefile.mk
- create mode 100644 agfa_monotype_fonts/prj/build.lst
- create mode 100644 agfa_monotype_fonts/prj/d.lst
-
-diff --git agfa_monotype_fonts/makefile.mk agfa_monotype_fonts/makefile.mk
-new file mode 100644
-index 0000000..4d73457
 --- /dev/null
 +++ agfa_monotype_fonts/makefile.mk
 @@ -0,0 +1,81 @@
@@ -97,25 +82,17 @@ index 0000000..4d73457
 +	pwd
 +	$(REMOVE_PACKAGE_COMMAND)
 +	+$(TOUCH) $(MISC)$/remove_build.flag
-diff --git agfa_monotype_fonts/prj/build.lst agfa_monotype_fonts/prj/build.lst
-new file mode 100644
-index 0000000..5a21934
 --- /dev/null
 +++ agfa_monotype_fonts/prj/build.lst
 @@ -0,0 +1,3 @@
 +bs	agfa_monotype_fonts : solenv NULL
 +bs	agfa_monotype_fonts		usr1	-	all	amt_mkout NULL
 +bs	agfa_monotype_fonts		nmake	-	all	amt_fonts NULL
-diff --git agfa_monotype_fonts/prj/d.lst agfa_monotype_fonts/prj/d.lst
-new file mode 100644
-index 0000000..424f228
 --- /dev/null
 +++ agfa_monotype_fonts/prj/d.lst
 @@ -0,0 +1,2 @@
 +mkdir: %_DEST%\pck%_EXT%
 +..\%__SRC%\misc\build\agfa-monotype-fonts\*.ttf %_DEST%\pck%_EXT%\*.ttf
-diff --git configure.in configure.in
-index daf6ef9..8c2277a 100644
 --- configure.in
 +++ configure.in
 @@ -100,6 +100,11 @@ AC_ARG_WITH(afms,
@@ -149,8 +126,6 @@ index daf6ef9..8c2277a 100644
  dnl ===================================================================
  dnl Test whether to include ppds
  dnl ===================================================================
-diff --git postprocess/prj/build.lst postprocess/prj/build.lst
-index 9a052b9..dceeee8 100644
 --- postprocess/prj/build.lst
 +++ postprocess/prj/build.lst
 @@ -1,4 +1,4 @@
@@ -158,9 +133,7 @@ index 9a052b9..dceeee8 100644
 +po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
  po	postprocess			    	usr1	-	all	po_mkout NULL
  po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
- po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
-diff --git scp2/source/ooo/file_font_ooo.scp scp2/source/ooo/file_font_ooo.scp
-index 8ad8526..d493a96 100644
+ po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
 --- scp2/source/ooo/file_font_ooo.scp
 +++ scp2/source/ooo/file_font_ooo.scp
 @@ -148,3 +148,30 @@ End
@@ -194,6 +167,3 @@ index 8ad8526..d493a96 100644
 +STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
 +#endif
 +#endif
--- 
-1.7.0.1
-
diff --git a/patches/dev300/postprocess-extra-extensions.diff b/patches/dev300/postprocess-extra-extensions.diff
index 410c197..d4248b1 100644
--- a/patches/dev300/postprocess-extra-extensions.diff
+++ b/patches/dev300/postprocess-extra-extensions.diff
@@ -1,9 +1,3 @@
----
- postprocess/prj/build.lst |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git postprocess/prj/build.lst postprocess/prj/build.lst
-index dceeee8..dac3f80 100644
 --- postprocess/prj/build.lst
 +++ postprocess/prj/build.lst
 @@ -1,4 +1,4 @@
@@ -11,7 +5,4 @@ index dceeee8..dac3f80 100644
 +po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign CT2N:ct2n NLPSOLVER:nlpsolver LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
  po	postprocess			    	usr1	-	all	po_mkout NULL
  po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
- po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
--- 
-1.7.0.1
-
+ po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL