The following commit has been merged in the debian-experimental-3.5 branch:
commit 8e6d88d11896094e4cd5cf73c00bd2512be723ef
Author: Rene Engelhard <[email protected]>
Date: Tue Dec 20 17:26:36 2011 +0100
disable tests relying on user-template until it doesn't contain loads of
duplicated binaries
diff --git a/patches/disable-user-template-nonsense.diff
b/patches/disable-user-template-nonsense.diff
new file mode 100644
index 0000000..ca2a28c
--- /dev/null
+++ b/patches/disable-user-template-nonsense.diff
@@ -0,0 +1,422 @@
+diff -urN test-old/prj/d.lst test/prj/d.lst
+--- libreoffice-3.5.0/test-old/prj/d.lst 2011-12-12 14:08:40.000000000
+0100
++++ libreoffice-3.5.0/test/prj/d.lst 2011-12-14 11:09:57.000000000 +0100
+@@ -7,393 +7,3 @@
+ ..\inc\test\testdllapi.hxx %_DEST%\inc\test\testdllapi.hxx
+ ..\inc\test\bootstrapfixture.hxx %_DEST%\inc\test\bootstrapfixture.hxx
+ ..\inc\test\unoapi_test.hxx %_DEST%\inc\test\unoapi_test.hxx
+-mkdir: %_DEST%\unittest
+-mkdir: %_DEST%\unittest\registry
+-mkdir: %_DEST%\unittest\user\
+-mkdir: %_DEST%\unittest\user\autocorr
+-mkdir: %_DEST%\unittest\user\autotext
+-mkdir: %_DEST%\unittest\user\autotext\en-US
+-mkdir: %_DEST%\unittest\user\basic
+-mkdir: %_DEST%\unittest\user\basic\Depot
+-mkdir: %_DEST%\unittest\user\basic\Euro
+-mkdir: %_DEST%\unittest\user\basic\FormWizard
+-mkdir: %_DEST%\unittest\user\basic\Gimmicks
+-mkdir: %_DEST%\unittest\user\basic\ImportWizard
+-mkdir: %_DEST%\unittest\user\basic\Schedule
+-mkdir: %_DEST%\unittest\user\basic\ScriptBindingLibrary
+-mkdir: %_DEST%\unittest\user\basic\Template
+-mkdir: %_DEST%\unittest\user\basic\Tools
+-mkdir: %_DEST%\unittest\user\basic\Tutorials
+-mkdir: %_DEST%\unittest\user\config
+-mkdir: %_DEST%\unittest\user\config\linked
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbquery
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbquery\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbquery\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtable
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtable\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtable\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sbibliography
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sbibliography\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\layout
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\images
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\scalc\images\Bitmaps
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\schart
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\schart\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\schart\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\schart\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\simpress
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\simpress\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\simpress\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\simpress\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\smath
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\smath\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\smath\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\smath\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sweb
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sweb\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sweb\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\sweb\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swform
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swform\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swform\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swform\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swreport
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swreport\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swreport\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swreport\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swriter
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swriter\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swriter\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swriter\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swxform
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swxform\menubar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swxform\statusbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\modules\swxform\toolbar
+-mkdir: %_DEST%\unittest\user\config\soffice.cfg\simpress
+-mkdir: %_DEST%\unittest\user\config\symbol
+-mkdir: %_DEST%\unittest\user\config\webcast
+-mkdir: %_DEST%\unittest\user\config\wizard
+-mkdir: %_DEST%\unittest\user\config\wizard\form
+-mkdir: %_DEST%\unittest\user\config\wizard\form\styles
+-mkdir: %_DEST%\unittest\user\config\wizard\web
+-mkdir: %_DEST%\unittest\user\config\wizard\web\buttons
+-mkdir: %_DEST%\unittest\user\config\wizard\web\images
+-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts
+-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\diagonal
+-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\frame_bottom
+-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\frame_left
+-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\frame_right
+-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\frame_top
+-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\simple
+-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\table_2
+-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\table_3
+-mkdir: %_DEST%\unittest\user\config\wizard\web\layouts\zigzag
+-mkdir: %_DEST%\unittest\user\config\wizard\web\styles
+-mkdir: %_DEST%\unittest\user\dtd
+-mkdir: %_DEST%\unittest\user\dtd\math
+-mkdir: %_DEST%\unittest\user\dtd\math\1_01
+-mkdir: %_DEST%\unittest\user\dtd\officedocument
+-mkdir: %_DEST%\unittest\user\dtd\officedocument\1_0
+-mkdir: %_DEST%\unittest\user\fonts
+-mkdir: %_DEST%\unittest\user\fonts\truetype
+-mkdir: %_DEST%\unittest\user\gallery
+-mkdir: %_DEST%\unittest\user\gallery\bullets
+-mkdir: %_DEST%\unittest\user\gallery\htmlexpo
+-mkdir: %_DEST%\unittest\user\gallery\rulers
+-mkdir: %_DEST%\unittest\user\gallery\sounds
+-mkdir: %_DEST%\unittest\user\gallery\www-back
+-mkdir: %_DEST%\unittest\user\gallery\www-graf
+-mkdir: %_DEST%\unittest\user\psprint
+-mkdir: %_DEST%\unittest\user\psprint\driver
+-mkdir: %_DEST%\unittest\user\psprint\fontmetric
+-mkdir: %_DEST%\unittest\user\template
+-mkdir: %_DEST%\unittest\user\template\common
+-mkdir: %_DEST%\unittest\user\template\common\layout
+-mkdir: %_DEST%\unittest\user\template\en-US
+-mkdir: %_DEST%\unittest\user\template\en-US\internal
+-mkdir: %_DEST%\unittest\user\template\en-US\presnt
+-mkdir: %_DEST%\unittest\user\template\en-US\wizard
+-mkdir: %_DEST%\unittest\user\template\en-US\wizard\agenda
+-mkdir: %_DEST%\unittest\user\template\en-US\wizard\fax
+-mkdir: %_DEST%\unittest\user\template\en-US\wizard\report
+-mkdir: %_DEST%\unittest\user\template\en-US\wizard\styles
+-mkdir: %_DEST%\unittest\user\template\wizard
+-mkdir: %_DEST%\unittest\user\template\wizard\bitmap
+-mkdir: %_DEST%\unittest\user\template\wizard\letter
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\bg
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\cs
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\da
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\de
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\en-GB
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\en-US
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\es
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\eu
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\fr
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\hu
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\it
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\ja
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\km
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\ko
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\nl
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\pl
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\pt-BR
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\pt
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\ru
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\sk
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\sl
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\sv
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\tr
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\vi
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\zh-CN
+-mkdir: %_DEST%\unittest\user\template\wizard\letter\zh-TW
+-mkdir: %_DEST%\unittest\user\wordbook
+-mkdir: %_DEST%\unittest\user\xslt
+-mkdir: %_DEST%\unittest\user\xslt\common
+-mkdir: %_DEST%\unittest\user\xslt\docbook
+-mkdir: %_DEST%\unittest\user\xslt\export
+-mkdir: %_DEST%\unittest\user\xslt\export\common
+-mkdir: %_DEST%\unittest\user\xslt\export\common\styles
+-mkdir: %_DEST%\unittest\user\xslt\export\common\table
+-mkdir: %_DEST%\unittest\user\xslt\export\spreadsheetml
+-mkdir: %_DEST%\unittest\user\xslt\export\uof
+-mkdir: %_DEST%\unittest\user\xslt\export\wordml
+-mkdir: %_DEST%\unittest\user\xslt\export\xhtml
+-mkdir: %_DEST%\unittest\user\xslt\import
+-mkdir: %_DEST%\unittest\user\xslt\import\common
+-mkdir: %_DEST%\unittest\user\xslt\import\spreadsheetml
+-mkdir: %_DEST%\unittest\user\xslt\import\uof
+-mkdir: %_DEST%\unittest\user\xslt\import\wordml
+-..\user-template\registry\modifications.xcd
%_DEST%\unittest\registry\modifications.xcd
+-..\user-template\user\* %_DEST%\unittest\user\*
+-..\user-template\user\autocorr\* %_DEST%\unittest\user\autocorr\*
+-..\user-template\user\autotext\* %_DEST%\unittest\user\autotext\*
+-..\user-template\user\autotext\en-US\* %_DEST%\unittest\user\autotext\en-US\*
+-..\user-template\user\basic\* %_DEST%\unittest\user\basic\*
+-..\user-template\user\basic\Depot\* %_DEST%\unittest\user\basic\Depot\*
+-..\user-template\user\basic\Euro\* %_DEST%\unittest\user\basic\Euro\*
+-..\user-template\user\basic\FormWizard\*
%_DEST%\unittest\user\basic\FormWizard\*
+-..\user-template\user\basic\Gimmicks\* %_DEST%\unittest\user\basic\Gimmicks\*
+-..\user-template\user\basic\ImportWizard\*
%_DEST%\unittest\user\basic\ImportWizard\*
+-..\user-template\user\basic\Schedule\* %_DEST%\unittest\user\basic\Schedule\*
+-..\user-template\user\basic\ScriptBindingLibrary\*
%_DEST%\unittest\user\basic\ScriptBindingLibrary\*
+-..\user-template\user\basic\Template\* %_DEST%\unittest\user\basic\Template\*
+-..\user-template\user\basic\Tools\* %_DEST%\unittest\user\basic\Tools\*
+-..\user-template\user\basic\Tutorials\*
%_DEST%\unittest\user\basic\Tutorials\*
+-..\user-template\user\config\* %_DEST%\unittest\user\config\*
+-..\user-template\user\config\linked\* %_DEST%\unittest\user\config\linked\*
+-..\user-template\user\config\soffice.cfg\*
%_DEST%\unittest\user\config\soffice.cfg\*
+-..\user-template\user\config\soffice.cfg\modules\*
%_DEST%\unittest\user\config\soffice.cfg\modules\*
+-..\user-template\user\config\soffice.cfg\modules\BasicIDE\*
%_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\*
+-..\user-template\user\config\soffice.cfg\modules\BasicIDE\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\BasicIDE\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\BasicIDE\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\BasicIDE\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\StartModule\*
%_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\*
+-..\user-template\user\config\soffice.cfg\modules\StartModule\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\StartModule\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\StartModule\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\StartModule\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\dbapp\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\*
+-..\user-template\user\config\soffice.cfg\modules\dbapp\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\dbapp\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\dbapp\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbapp\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\dbbrowser\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser\*
+-..\user-template\user\config\soffice.cfg\modules\dbbrowser\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\dbbrowser\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbbrowser\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\dbquery\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbquery\*
+-..\user-template\user\config\soffice.cfg\modules\dbquery\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbquery\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\dbquery\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbquery\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\dbrelation\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation\*
+-..\user-template\user\config\soffice.cfg\modules\dbrelation\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\dbrelation\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbrelation\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\dbreport\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\*
+-..\user-template\user\config\soffice.cfg\modules\dbreport\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\dbreport\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\dbreport\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbreport\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\dbtable\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbtable\*
+-..\user-template\user\config\soffice.cfg\modules\dbtable\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbtable\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\dbtable\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbtable\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\dbtdata\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata\*
+-..\user-template\user\config\soffice.cfg\modules\dbtdata\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\dbtdata\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\dbtdata\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\sbibliography\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sbibliography\*
+-..\user-template\user\config\soffice.cfg\modules\sbibliography\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sbibliography\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\scalc\*
%_DEST%\unittest\user\config\soffice.cfg\modules\scalc\*
+-..\user-template\user\config\soffice.cfg\modules\scalc\layout\*
%_DEST%\unittest\user\config\soffice.cfg\modules\scalc\layout\*
+-..\user-template\user\config\soffice.cfg\modules\scalc\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\scalc\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\scalc\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\scalc\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\scalc\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\scalc\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\scalc\images\*
%_DEST%\unittest\user\config\soffice.cfg\modules\scalc\images\*
+-..\user-template\user\config\soffice.cfg\modules\scalc\images\Bitmaps\*
%_DEST%\unittest\user\config\soffice.cfg\modules\scalc\images\Bitmaps\*
+-..\user-template\user\config\soffice.cfg\modules\schart\*
%_DEST%\unittest\user\config\soffice.cfg\modules\schart\*
+-..\user-template\user\config\soffice.cfg\modules\schart\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\schart\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\schart\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\schart\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\schart\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\schart\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\sdraw\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\*
+-..\user-template\user\config\soffice.cfg\modules\sdraw\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\sdraw\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\sdraw\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sdraw\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\sglobal\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\*
+-..\user-template\user\config\soffice.cfg\modules\sglobal\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\sglobal\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\sglobal\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sglobal\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\simpress\*
%_DEST%\unittest\user\config\soffice.cfg\modules\simpress\*
+-..\user-template\user\config\soffice.cfg\modules\simpress\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\simpress\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\simpress\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\simpress\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\simpress\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\simpress\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\smath\*
%_DEST%\unittest\user\config\soffice.cfg\modules\smath\*
+-..\user-template\user\config\soffice.cfg\modules\smath\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\smath\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\smath\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\smath\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\smath\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\smath\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\sweb\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sweb\*
+-..\user-template\user\config\soffice.cfg\modules\sweb\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sweb\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\sweb\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sweb\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\sweb\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\sweb\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\swform\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swform\*
+-..\user-template\user\config\soffice.cfg\modules\swform\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swform\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\swform\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swform\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\swform\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swform\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\swreport\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swreport\*
+-..\user-template\user\config\soffice.cfg\modules\swreport\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swreport\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\swreport\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swreport\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\swreport\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swreport\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\swriter\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swriter\*
+-..\user-template\user\config\soffice.cfg\modules\swriter\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swriter\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\swriter\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swriter\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\swriter\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swriter\toolbar\*
+-..\user-template\user\config\soffice.cfg\modules\swxform\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swxform\*
+-..\user-template\user\config\soffice.cfg\modules\swxform\menubar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swxform\menubar\*
+-..\user-template\user\config\soffice.cfg\modules\swxform\statusbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swxform\statusbar\*
+-..\user-template\user\config\soffice.cfg\modules\swxform\toolbar\*
%_DEST%\unittest\user\config\soffice.cfg\modules\swxform\toolbar\*
+-..\user-template\user\config\soffice.cfg\simpress\*
%_DEST%\unittest\user\config\soffice.cfg\simpress\*
+-..\user-template\user\config\symbol\* %_DEST%\unittest\user\config\symbol\*
+-..\user-template\user\config\webcast\* %_DEST%\unittest\user\config\webcast\*
+-..\user-template\user\config\wizard\* %_DEST%\unittest\user\config\wizard\*
+-..\user-template\user\config\wizard\form\*
%_DEST%\unittest\user\config\wizard\form\*
+-..\user-template\user\config\wizard\form\styles\*
%_DEST%\unittest\user\config\wizard\form\styles\*
+-..\user-template\user\config\wizard\web\*
%_DEST%\unittest\user\config\wizard\web\*
+-..\user-template\user\config\wizard\web\buttons\*
%_DEST%\unittest\user\config\wizard\web\buttons\*
+-..\user-template\user\config\wizard\web\images\*
%_DEST%\unittest\user\config\wizard\web\images\*
+-..\user-template\user\config\wizard\web\layouts\*
%_DEST%\unittest\user\config\wizard\web\layouts\*
+-..\user-template\user\config\wizard\web\layouts\diagonal\*
%_DEST%\unittest\user\config\wizard\web\layouts\diagonal\*
+-..\user-template\user\config\wizard\web\layouts\frame_bottom\*
%_DEST%\unittest\user\config\wizard\web\layouts\frame_bottom\*
+-..\user-template\user\config\wizard\web\layouts\frame_left\*
%_DEST%\unittest\user\config\wizard\web\layouts\frame_left\*
+-..\user-template\user\config\wizard\web\layouts\frame_right\*
%_DEST%\unittest\user\config\wizard\web\layouts\frame_right\*
+-..\user-template\user\config\wizard\web\layouts\frame_top\*
%_DEST%\unittest\user\config\wizard\web\layouts\frame_top\*
+-..\user-template\user\config\wizard\web\layouts\simple\*
%_DEST%\unittest\user\config\wizard\web\layouts\simple\*
+-..\user-template\user\config\wizard\web\layouts\table_2\*
%_DEST%\unittest\user\config\wizard\web\layouts\table_2\*
+-..\user-template\user\config\wizard\web\layouts\table_3\*
%_DEST%\unittest\user\config\wizard\web\layouts\table_3\*
+-..\user-template\user\config\wizard\web\layouts\zigzag\*
%_DEST%\unittest\user\config\wizard\web\layouts\zigzag\*
+-..\user-template\user\config\wizard\web\styles\*
%_DEST%\unittest\user\config\wizard\web\styles\*
+-..\user-template\user\dtd\* %_DEST%\unittest\user\dtd\*
+-..\user-template\user\dtd\math\* %_DEST%\unittest\user\dtd\math\*
+-..\user-template\user\dtd\math\1_01\* %_DEST%\unittest\user\dtd\math\1_01\*
+-..\user-template\user\dtd\officedocument\*
%_DEST%\unittest\user\dtd\officedocument\*
+-..\user-template\user\dtd\officedocument\1_0\*
%_DEST%\unittest\user\dtd\officedocument\1_0\*
+-..\user-template\user\fonts\* %_DEST%\unittest\user\fonts\*
+-..\user-template\user\fonts\truetype\* %_DEST%\unittest\user\fonts\truetype\*
+-..\user-template\user\gallery\* %_DEST%\unittest\user\gallery\*
+-..\user-template\user\gallery\bullets\*
%_DEST%\unittest\user\gallery\bullets\*
+-..\user-template\user\gallery\htmlexpo\*
%_DEST%\unittest\user\gallery\htmlexpo\*
+-..\user-template\user\gallery\rulers\* %_DEST%\unittest\user\gallery\rulers\*
+-..\user-template\user\gallery\sounds\* %_DEST%\unittest\user\gallery\sounds\*
+-..\user-template\user\gallery\www-back\*
%_DEST%\unittest\user\gallery\www-back\*
+-..\user-template\user\gallery\www-graf\*
%_DEST%\unittest\user\gallery\www-graf\*
+-..\user-template\user\psprint\* %_DEST%\unittest\user\psprint\*
+-..\user-template\user\psprint\driver\* %_DEST%\unittest\user\psprint\driver\*
+-..\user-template\user\psprint\fontmetric\*
%_DEST%\unittest\user\psprint\fontmetric\*
+-..\user-template\user\template\* %_DEST%\unittest\user\template\*
+-..\user-template\user\template\common\*
%_DEST%\unittest\user\template\common\*
+-..\user-template\user\template\common\layout\*
%_DEST%\unittest\user\template\common\layout\*
+-..\user-template\user\template\en-US\* %_DEST%\unittest\user\template\en-US\*
+-..\user-template\user\template\en-US\internal\*
%_DEST%\unittest\user\template\en-US\internal\*
+-..\user-template\user\template\en-US\presnt\*
%_DEST%\unittest\user\template\en-US\presnt\*
+-..\user-template\user\template\en-US\wizard\*
%_DEST%\unittest\user\template\en-US\wizard\*
+-..\user-template\user\template\en-US\wizard\agenda\*
%_DEST%\unittest\user\template\en-US\wizard\agenda\*
+-..\user-template\user\template\en-US\wizard\fax\*
%_DEST%\unittest\user\template\en-US\wizard\fax\*
+-..\user-template\user\template\en-US\wizard\report\*
%_DEST%\unittest\user\template\en-US\wizard\report\*
+-..\user-template\user\template\en-US\wizard\styles\*
%_DEST%\unittest\user\template\en-US\wizard\styles\*
+-..\user-template\user\template\wizard\*
%_DEST%\unittest\user\template\wizard\*
+-..\user-template\user\template\wizard\bitmap\*
%_DEST%\unittest\user\template\wizard\bitmap\*
+-..\user-template\user\template\wizard\letter\*
%_DEST%\unittest\user\template\wizard\letter\*
+-..\user-template\user\template\wizard\letter\bg\*
%_DEST%\unittest\user\template\wizard\letter\bg\*
+-..\user-template\user\template\wizard\letter\cs\*
%_DEST%\unittest\user\template\wizard\letter\cs\*
+-..\user-template\user\template\wizard\letter\da\*
%_DEST%\unittest\user\template\wizard\letter\da\*
+-..\user-template\user\template\wizard\letter\de\*
%_DEST%\unittest\user\template\wizard\letter\de\*
+-..\user-template\user\template\wizard\letter\en-GB\*
%_DEST%\unittest\user\template\wizard\letter\en-GB\*
+-..\user-template\user\template\wizard\letter\en-US\*
%_DEST%\unittest\user\template\wizard\letter\en-US\*
+-..\user-template\user\template\wizard\letter\es\*
%_DEST%\unittest\user\template\wizard\letter\es\*
+-..\user-template\user\template\wizard\letter\eu\*
%_DEST%\unittest\user\template\wizard\letter\eu\*
+-..\user-template\user\template\wizard\letter\fr\*
%_DEST%\unittest\user\template\wizard\letter\fr\*
+-..\user-template\user\template\wizard\letter\hu\*
%_DEST%\unittest\user\template\wizard\letter\hu\*
+-..\user-template\user\template\wizard\letter\it\*
%_DEST%\unittest\user\template\wizard\letter\it\*
+-..\user-template\user\template\wizard\letter\ja\*
%_DEST%\unittest\user\template\wizard\letter\ja\*
+-..\user-template\user\template\wizard\letter\km\*
%_DEST%\unittest\user\template\wizard\letter\km\*
+-..\user-template\user\template\wizard\letter\ko\*
%_DEST%\unittest\user\template\wizard\letter\ko\*
+-..\user-template\user\template\wizard\letter\nl\*
%_DEST%\unittest\user\template\wizard\letter\nl\*
+-..\user-template\user\template\wizard\letter\pl\*
%_DEST%\unittest\user\template\wizard\letter\pl\*
+-..\user-template\user\template\wizard\letter\pt-BR\*
%_DEST%\unittest\user\template\wizard\letter\pt-BR\*
+-..\user-template\user\template\wizard\letter\pt\*
%_DEST%\unittest\user\template\wizard\letter\pt\*
+-..\user-template\user\template\wizard\letter\ru\*
%_DEST%\unittest\user\template\wizard\letter\ru\*
+-..\user-template\user\template\wizard\letter\sk\*
%_DEST%\unittest\user\template\wizard\letter\sk\*
+-..\user-template\user\template\wizard\letter\sl\*
%_DEST%\unittest\user\template\wizard\letter\sl\*
+-..\user-template\user\template\wizard\letter\sv\*
%_DEST%\unittest\user\template\wizard\letter\sv\*
+-..\user-template\user\template\wizard\letter\tr\*
%_DEST%\unittest\user\template\wizard\letter\tr\*
+-..\user-template\user\template\wizard\letter\vi\*
%_DEST%\unittest\user\template\wizard\letter\vi\*
+-..\user-template\user\template\wizard\letter\zh-CN\*
%_DEST%\unittest\user\template\wizard\letter\zh-CN\*
+-..\user-template\user\template\wizard\letter\zh-TW\*
%_DEST%\unittest\user\template\wizard\letter\zh-TW\*
+-..\user-template\user\wordbook\* %_DEST%\unittest\user\wordbook\*
+-..\user-template\user\xslt\* %_DEST%\unittest\user\xslt\*
+-..\user-template\user\xslt\common\* %_DEST%\unittest\user\xslt\common\*
+-..\user-template\user\xslt\docbook\* %_DEST%\unittest\user\xslt\docbook\*
+-..\user-template\user\xslt\export\* %_DEST%\unittest\user\xslt\export\*
+-..\user-template\user\xslt\export\common\*
%_DEST%\unittest\user\xslt\export\common\*
+-..\user-template\user\xslt\export\common\styles\*
%_DEST%\unittest\user\xslt\export\common\styles\*
+-..\user-template\user\xslt\export\common\table\*
%_DEST%\unittest\user\xslt\export\common\table\*
+-..\user-template\user\xslt\export\spreadsheetml\*
%_DEST%\unittest\user\xslt\export\spreadsheetml\*
+-..\user-template\user\xslt\export\uof\*
%_DEST%\unittest\user\xslt\export\uof\*
+-..\user-template\user\xslt\export\wordml\*
%_DEST%\unittest\user\xslt\export\wordml\*
+-..\user-template\user\xslt\export\xhtml\*
%_DEST%\unittest\user\xslt\export\xhtml\*
+-..\user-template\user\xslt\import\* %_DEST%\unittest\user\xslt\import\*
+-..\user-template\user\xslt\import\common\*
%_DEST%\unittest\user\xslt\import\common\*
+-..\user-template\user\xslt\import\spreadsheetml\*
%_DEST%\unittest\user\xslt\import\spreadsheetml\*
+-..\user-template\user\xslt\import\uof\*
%_DEST%\unittest\user\xslt\import\uof\*
+-..\user-template\user\xslt\import\wordml\*
%_DEST%\unittest\user\xslt\import\wordml\*
+-..\user-template\user\data\* %_DEST%\unittest\user\data\*
+diff -urN sc-old/Module_sc.mk sc/Module_sc.mk
+--- libreoffice-3.5.0/sc-old/Module_sc.mk 2011-12-06 14:02:06.000000000
+0000
++++ libreoffice-3.5.0/sc/Module_sc.mk 2011-12-14 11:09:05.000000000 +0000
+@@ -40,10 +40,7 @@
+ ))
+
+ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
+- CppunitTest_sc_macros_test \
+- CppunitTest_sc_cellrangesbase \
+ CppunitTest_sc_subsequent_filters_test \
+- CppunitTest_sc_tableautoformatfield \
+ JunitTest_sc_complex \
+ JunitTest_sc_unoapi \
+ ))
+diff -urN sw-old/Module_sw.mk sw/Module_sw.mk
+--- libreoffice-3.5.0/sw-old/Module_sw.mk 2011-12-06 14:02:14.000000000
+0000
++++ libreoffice-3.5.0/sw/Module_sw.mk 2011-12-14 15:52:55.000000000 +0000
+@@ -42,7 +42,6 @@
+
+ $(eval $(call gb_Module_add_check_targets,sw,\
+ CppunitTest_sw_filters_test \
+- CppunitTest_sw_macros_test \
+ CppunitTest_sw_swdoc_test \
+ ))
+
diff --git a/patches/series b/patches/series
index 93ae9a7..93202ae 100644
--- a/patches/series
+++ b/patches/series
@@ -16,6 +16,8 @@ getMIMEDescription-mismatch.diff
mention-java-common-package.diff
help-msg-add-package-info.diff
sensible-lomua.diff
-sensble-browser.diff
+sensible-browser.diff
fix-racecondition-in-sdext-source-pdfimport-makefile.diff
fix-armhf-build-in-bridges.diff
+disable-user-template-nonsense.diff
+fix-mailmerge-install.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
