./packages/libreoffice/3.3.0/experimental r2216: actually add hack-no-rm-fr-of-smoketest-userconfig.diff and splash-progressbarcolor.diff, oops
------------------------------------------------------------
revno: 2216
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2010-11-26 21:04:28 +0100
message:
actually add hack-no-rm-fr-of-smoketest-userconfig.diff and splash-progressbarcolor.diff, oops
added:
patches/hack-no-rm-fr-of-smoketest-userconfig.diff
patches/splash-progressbarcolor.diff
=== added file 'patches/hack-no-rm-fr-of-smoketest-userconfig.diff'
--- a/patches/hack-no-rm-fr-of-smoketest-userconfig.diff 1970-01-01 00:00:00 +0000
+++ b/patches/hack-no-rm-fr-of-smoketest-userconfig.diff 2010-11-26 20:04:28 +0000
@@ -0,0 +1,51 @@
+--- /dev/null 2010-10-31 21:59:47.283126105 +0100
++++ libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/hack-no-rm-fr-of-smoketest-userconfig.diff 2010-11-09 21:21:23.000000000 +0100
+@@ -0,0 +1,39 @@
++diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
++index 80de446..3a7be7f 100644
++--- solenv/inc/installationtest.mk
+++++ solenv/inc/installationtest.mk
++@@ -90,14 +90,14 @@ $(MISC)/$(TARGET)/installation.flag : $(shell \
++ .END
++
++ cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb
++- $(RM) -r $(MISC)/$(TARGET)/user
+++# $(RM) -r $(MISC)/$(TARGET)/user
++ $(MKDIRHIER) $(MISC)/$(TARGET)/user
++ $(CPPUNITTESTER) \
++ -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
++ -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \
++ -env:arg-soffice=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \
++ $(my_cppenv) $(OOO_CPPTEST_ARGS)
++- $(RM) -r $(MISC)/$(TARGET)/user
+++# $(RM) -r $(MISC)/$(TARGET)/user
++ .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
++ $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
++ cpptest : $(MISC)/$(TARGET)/installation.flag
++@@ -111,7 +111,7 @@ $(MISC)/$(TARGET)/services.rdb :
++
++ .IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != ""
++ javatest .PHONY : $(JAVATARGET)
++- $(RM) -r $(MISC)/$(TARGET)/user
+++# $(RM) -r $(MISC)/$(TARGET)/user
++ $(MKDIRHIER) $(MISC)/$(TARGET)/user
++ $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
++ '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \
++@@ -119,7 +119,7 @@ javatest .PHONY : $(JAVATARGET)
++ -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \
++ $(my_javaenv) org.junit.runner.JUnitCore \
++ $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//))
++- $(RM) -r $(MISC)/$(TARGET)/user
+++# $(RM) -r $(MISC)/$(TARGET)/user
++ .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
++ $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
++ javatest : $(MISC)/$(TARGET)/installation.flag
+--- libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/apply-old 2010-11-10 11:46:58.000000000 +0100
++++ libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/apply 2010-11-10 11:47:21.000000000 +0100
+@@ -2411,3 +2411,6 @@
+ sd_effects_styles.diff, pixie
+ symbols-20-august.diff, i#11167, jopsen
+ vEdit-13-August.diff, jopsen
++
++[ TemporaryHacks ]
++hack-no-rm-fr-of-smoketest-userconfig.diff
=== added file 'patches/splash-progressbarcolor.diff'
--- a/patches/splash-progressbarcolor.diff 1970-01-01 00:00:00 +0000
+++ b/patches/splash-progressbarcolor.diff 2010-11-26 20:04:28 +0000
@@ -0,0 +1,29 @@
+--- /dev/null 2010-09-28 02:28:57.560060918 +0200
++++ libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/debian-splash.diff 2010-10-07 19:19:42.000000000 +0200
+@@ -0,0 +1,11 @@
++--- instsetoo_native/util/openoffice.lst-old 2008-08-06 00:03:46.000000000 +0200
+++++ instsetoo_native/util/openoffice.lst 2008-08-06 00:04:01.000000000 +0200
++@@ -25,7 +25,7 @@
++ POOLPRODUCT 1
++ REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
++ REGISTRATIONURL http://survey.libreoffice.org/user/index.php
++- PROGRESSBARCOLOR 126,170,23
+++ PROGRESSBARCOLOR 215,7,81
++ PROGRESSSIZE 320,7
++ PROGRESSPOSITION 185,206
++ PROGRESSFRAMECOLOR 207,208,211
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 485e60d..536caec 100644
+--- libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/apply
++++ libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/apply
+@@ -572,6 +572,10 @@
+ pushfont-psstream.diff
+ scp2-user-config-ooo3.diff
+
++[ DebianBaseOnly ]
++# fix the splash progressbar colors
++debian-splash.diff
++
+ [ DroplineGNOMEOnly ]
+ SectionOwner => DropLine
+
Reply to: