[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.3_rc2-1-24-g52b55aa
The following commit has been merged in the debian-experimental-3.6 branch:
commit fc95f7e55bfaa6a510d6a933936c4b21a37f15ab
Author: Rene Engelhard <rene@debian.org>
Date: Tue Nov 13 08:29:52 2012 +0100
prepare for 3.6.4 rc1
diff --git a/changelog b/changelog
index bd6c64e..61f3651 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,9 @@
-libreoffice (1:3.6.3~rc2-2) UNRELEASED; urgency=low
+libreoffice (1:3.6.4~rc1-1) UNRELEASED; urgency=low
- * debian/patches/poppler_0_2*.diff: fix build of sdext with poppler
- 0.21.0 and fix the test with 0.20.x, thanks Pino Toscano
+ * new upstream release candidate
+
+ * debian/patches/poppler_0_21_0.diff: fix build of sdext with poppler
+ 0.21.0
* merge from Ubuntu:
- fix quoting of PYTHON_{CFLAGS,LIBS} (Matthias Klose)
@@ -12,7 +14,7 @@ libreoffice (1:3.6.3~rc2-2) UNRELEASED; urgency=low
- recommend fonts-liberation instead of ttf-liberation
(closes: #691949)
- -- Rene Engelhard <rene@debian.org> Sun, 28 Oct 2012 14:33:55 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 12 Nov 2012 21:42:23 +0100
libreoffice (1:3.6.3~rc2-1) experimental; urgency=low
diff --git a/patches/he-lucida-sans-unicode.diff b/patches/he-lucida-sans-unicode.diff
deleted file mode 100644
index 52a1cab..0000000
--- a/patches/he-lucida-sans-unicode.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
-index e01d207..6050768 100644
---- a/officecfg/registry/data/org/openoffice/VCL.xcu
-+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
-@@ -187,19 +187,19 @@
- <value>Tahoma;Arial Unicode MS;Lucida Sans Unicode;DejaVu Sans;Albany AMT;Albany;Arial;Nimbus Sans L;Interface User;Geneva;Tahoma;Dialog;Lucida;Helvetica;Helmet;Interface System;Sans Serif</value>
- </prop>
- <prop oor:name="CTL_DISPLAY" oor:type="xs:string" oor:op="replace">
-- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
- </prop>
- <prop oor:name="CTL_HEADING" oor:type="xs:string" oor:op="replace">
-- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
- </prop>
- <prop oor:name="CTL_PRESENTATION" oor:type="xs:string" oor:op="replace">
-- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
- </prop>
- <prop oor:name="CTL_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
- </prop>
- <prop oor:name="CTL_TEXT" oor:type="xs:string" oor:op="replace">
-- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
- </prop>
- </node>
- <node oor:name="th" oor:op="replace">
diff --git a/patches/poppler_0_20_x.diff b/patches/poppler_0_20_x.diff
deleted file mode 100644
index 8acfd4d..0000000
--- a/patches/poppler_0_20_x.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index e6bc761..1ebcebf 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -485,7 +485,9 @@ void PDFOutDev::endPage()
- printf("endPage\n");
- }
-
--#if POPPLER_CHECK_VERSION(0, 17, 0)
-+#if POPPLER_CHECK_VERSION(0, 19, 0)
-+void PDFOutDev::processLink(AnnotLink *link)
-+#elif POPPLER_CHECK_VERSION(0, 17, 0)
- void PDFOutDev::processLink(AnnotLink *link, Catalog *)
- #else
- void PDFOutDev::processLink(Link* link, Catalog*)
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index 0a19b9a..e5e48fc 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -189,10 +189,12 @@ namespace pdfi
- // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
- // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
-
-- #if POPPLER_CHECK_VERSION(0, 17, 0)
-- virtual void processLink(AnnotLink *link, Catalog *catalog);
-- #else
- //----- link borders
-+ #if POPPLER_CHECK_VERSION(0, 19, 0)
-+ virtual void processLink(AnnotLink *link);
-+ #elif POPPLER_CHECK_VERSION(0, 17, 0)
-+ virtual void processLink(AnnotLink *link, Catalog *catalog);
-+ #else
- virtual void processLink(Link *link, Catalog *catalog);
- #endif
-
diff --git a/patches/series b/patches/series
index a6818d5..bf055e6 100644
--- a/patches/series
+++ b/patches/series
@@ -26,8 +26,5 @@ pyuno-py3-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
-soffice-bashisms.diff
-he-lucida-sans-unicode.diff
ure-no-etc-opt-ure.diff
-poppler_0_20_x.diff
poppler_0_21_0.diff
diff --git a/patches/soffice-bashisms.diff b/patches/soffice-bashisms.diff
deleted file mode 100644
index 53ec60c..0000000
--- a/patches/soffice-bashisms.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index 7727206..0c3ab6d 100755
---- a/desktop/scripts/soffice.sh
-+++ b/desktop/scripts/soffice.sh
-@@ -155,7 +155,7 @@ fi
- # valgrind --log-file=valgrind.log does not work well with --trace-children=yes
- if [ -n "$VALGRINDCHECK" -a -z "$VALGRIND" ] ; then
- echo "redirecting the standard and the error output to valgrind.log"
-- exec &>valgrind.log
-+ exec > valgrind.log 2>&1
- fi
-
- # oosplash does the rest: forcing pages in, javaldx etc. are
diff --git a/rules b/rules
index 108bb30..2122848 100755
--- a/rules
+++ b/rules
@@ -69,11 +69,11 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.6.3.2
+lo_sources_ver=3.6.4.1
# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.6.3.2 libreoffice-3.6.3.2
+# use ./g checkout -b tag-libreoffice-3.6.4.1 libreoffice-3.6.4.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-3-6-3
+GIT_BRANCH=libreoffice-3-6-4
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
--
LibreOffice packaging repository
Reply to: