The following commit has been merged in the debian-experimental-3.6 branch:
commit 42a6bc26446ee39e3303a1e94fe908b3c7e84040
Merge: 59fc627f417bc09c1e9b48637de2493694a92ddb
8c2d1e7be588a726b60b8fd384b2e02bca5cba8a
Author: Rene Engelhard <r...@debian.org>
Date: Wed May 9 09:24:02 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.6
diff --combined changelog
index 07cb323,2dd4b1f..0d79865
--- a/changelog
+++ b/changelog
@@@ -1,18 -1,10 +1,25 @@@
+libreoffice (1:3.6.0~alpha0~git20120508-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+ - fixes splashscreen location in multi-monitor setups
+ (closes: #657444, #431473)
+
+ * debian/patches/build-dont-run-slowcheck.diff: as name says
+
+ * debian/rules:
+ - new conditionals for: doxygen, libcdr, liblcms2
+ - remove liblucene2-java stuff; now clucene is used
+ - build-depend on libxml2-utils, xmllint now needed
+
+ -- Rene Engelhard <r...@debian.org> Thu, 03 May 2012 13:44:05 +0200
+
+ libreoffice (1:3.5.3-3) UNRELEASED; urgency=low
+
+ * debian/patches/ignore-sc_cellrangesbase-fails.diff:
+ make .IGNORE actually work
+
+ -- Rene Engelhard <r...@debian.org> Tue, 08 May 2012 11:37:43 +0200
+
libreoffice (1:3.5.3-2) unstable; urgency=low
* upload to unstable
diff --combined patches/ignore-sc_cellrangesbase-fails.diff
index 8888976,73c9c21..f7d8a84
--- a/patches/ignore-sc_cellrangesbase-fails.diff
+++ b/patches/ignore-sc_cellrangesbase-fails.diff
@@@ -1,9 -1,9 +1,9 @@@
- --- a/sc/Module_sc.mk-old 2012-04-27 09:24:15.000000000 +0200
- +++ b/sc/Module_sc.mk 2012-04-27 15:34:11.698071587 +0200
- @@ -48,4 +48,6 @@
- ))
- # JunitTest_sc_unoapi \
-
- +.IGNORE: $(call gb_Module_get_target,CppunitTest_sc_cellrangesbase)
---- a/sc/CppunitTest_sc_cellrangesbase.mk-old 2012-05-09 01:02:30.359827642
+0200
-+++ b/sc/CppunitTest_sc_cellrangesbase.mk 2012-05-09 01:04:10.416323786
+0200
-@@ -139,4 +139,6 @@
- # b) explicitly depend on the sc resource files needed at unit-test runtime
- $(call gb_CppunitTest_get_target,sc_cellrangesbase) : $(call
gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
-
++--- a/sc/CppunitTest_sc_cellrangeobj.mk-old 2012-05-09 01:02:30.359827642
+0200
+++++ b/sc/CppunitTest_sc_cellrangeobj.mk 2012-05-09 01:04:10.416323786
+0200
++@@ -132,4 +132,6 @@
++ $(call gb_CppunitTest_get_target,sc_cellrangesbase) : \
++ $(WORKDIR)/AllLangRes/sc \
++
+ +.IGNORE: $(call gb_CppunitTest_get_target,sc_cellrangesbase)
+
# vim: set noet sw=4 ts=4:
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ss1hz-0006gm...@vasks.debian.org
