From c4faab2f666fe49e7ff4133fce605988e725a51e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 15 Nov 2015 11:20:19 +0100 Subject: [PATCH] Update LibreOffice packaging patches: + 4.2.8 - Ubuntu 14.04 - Trusty + 4.3.3 - Debian 8.x - Jessie MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit b3046dd02631261a509b31a0235bf7ca14888d0b) --- libreoffice/4.2.8/trusty/debian.diff | 46 ++++++++++++++-------------- libreoffice/4.3.3/jessie/debian.diff | 32 +++++++++---------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/libreoffice/4.2.8/trusty/debian.diff b/libreoffice/4.2.8/trusty/debian.diff index b22ee45..ebbddc9 100644 --- a/libreoffice/4.2.8/trusty/debian.diff +++ b/libreoffice/4.2.8/trusty/debian.diff @@ -1,19 +1,19 @@ diff -ruN a/debian/changelog b/debian/changelog ---- a/debian/changelog 2015-04-23 18:17:58.000000000 +0000 -+++ b/debian/changelog 2015-05-12 17:57:32.608000000 +0000 +--- a/debian/changelog 2015-11-02 21:08:01.000000000 +0000 ++++ b/debian/changelog 2015-11-14 15:19:36.524000000 +0000 @@ -1,3 +1,9 @@ -+libreoffice (1:4.2.8-0ubuntu2+tde1) trusty; urgency=medium ++libreoffice (1:4.2.8-0ubuntu3+tde1) trusty; urgency=medium + + * Enable TDE module + -+ -- Slávek Banko Tue, 12 May 2015 19:08:29 +0200 ++ -- Slávek Banko Sat, 14 Nov 2015 16:18:20 +0100 + - libreoffice (1:4.2.8-0ubuntu2) trusty-security; urgency=medium + libreoffice (1:4.2.8-0ubuntu3) trusty-security; urgency=medium - * avoid null deref in EditEngine + * Rebuild as security update diff -ruN a/debian/control b/debian/control ---- a/debian/control 2015-04-23 18:22:57.000000000 +0000 -+++ b/debian/control 2015-05-12 17:57:32.608000000 +0000 +--- a/debian/control 2015-11-02 21:26:04.000000000 +0000 ++++ b/debian/control 2015-11-14 15:19:36.524000000 +0000 @@ -112,6 +112,8 @@ python (>= 2.6.6-3+squeeze4), python3, @@ -97,8 +97,8 @@ diff -ruN a/debian/control b/debian/control + You need to install kaddressbook-trinity separately. + diff -ruN a/debian/control.in b/debian/control.in ---- a/debian/control.in 2015-04-08 13:27:19.000000000 +0000 -+++ b/debian/control.in 2015-05-12 17:57:32.608000000 +0000 +--- a/debian/control.in 2015-09-18 12:59:35.000000000 +0000 ++++ b/debian/control.in 2015-11-14 15:19:36.524000000 +0000 @@ -199,6 +199,7 @@ libreoffice-impress (<< ${binary:Version}), libreoffice-kab (<< 1:3.4.1~), @@ -109,7 +109,7 @@ diff -ruN a/debian/control.in b/debian/control.in libreoffice-sdbc-postgresql (<< 0.8.1~), diff -ruN a/debian/control.tdeab.in b/debian/control.tdeab.in --- a/debian/control.tdeab.in 1970-01-01 00:00:00.000000000 +0000 -+++ b/debian/control.tdeab.in 2015-05-12 17:57:32.608000000 +0000 ++++ b/debian/control.tdeab.in 2015-11-14 15:19:36.524000000 +0000 @@ -0,0 +1,15 @@ +Package: libreofficeVER-tdeab-trinity +Architecture: %OOO_BASE_ARCHS% @@ -128,7 +128,7 @@ diff -ruN a/debian/control.tdeab.in b/debian/control.tdeab.in + diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in --- a/debian/control.trinity.in 1970-01-01 00:00:00.000000000 +0000 -+++ b/debian/control.trinity.in 2015-05-12 17:57:32.608000000 +0000 ++++ b/debian/control.trinity.in 2015-11-14 15:19:36.524000000 +0000 @@ -0,0 +1,23 @@ +Package: libreofficeVER-trinity +Architecture: %OOO_ARCHS% @@ -154,16 +154,16 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in + * libreoffice-tdeab-trinity: TDE Addressbook support + diff -ruN a/debian/patches/series b/debian/patches/series ---- a/debian/patches/series 2015-04-08 13:27:19.000000000 +0000 -+++ b/debian/patches/series 2015-05-12 17:57:32.608000000 +0000 -@@ -36,3 +36,4 @@ - lp-1342175.diff - lp-1372799.diff - check-if-reads-were-successful.diff +--- a/debian/patches/series 2015-09-18 12:59:35.000000000 +0000 ++++ b/debian/patches/series 2015-11-14 15:19:36.524000000 +0000 +@@ -40,3 +40,4 @@ + ww8dontwrap.diff + coverity-1266485.diff + pstatus-vector.diff +tde-update-r14.diff diff -ruN a/debian/patches/tde-update-r14.diff b/debian/patches/tde-update-r14.diff --- a/debian/patches/tde-update-r14.diff 1970-01-01 00:00:00.000000000 +0000 -+++ b/debian/patches/tde-update-r14.diff 2015-05-12 17:57:32.608000000 +0000 ++++ b/debian/patches/tde-update-r14.diff 2015-11-14 15:19:36.524000000 +0000 @@ -0,0 +1,68 @@ +diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk +index 298ed4c..8243280 100644 @@ -234,8 +234,8 @@ diff -ruN a/debian/patches/tde-update-r14.diff b/debian/patches/tde-update-r14.d + + $(eval $(call gb_Library_set_include,vclplug_tde,\ diff -ruN a/debian/rules b/debian/rules ---- a/debian/rules 2015-04-08 13:27:19.000000000 +0000 -+++ b/debian/rules 2015-05-12 17:57:32.608000000 +0000 +--- a/debian/rules 2015-09-18 12:59:35.000000000 +0000 ++++ b/debian/rules 2015-11-14 15:19:36.528000000 +0000 @@ -218,6 +218,7 @@ SYSTEM_STUFF += cairo CAIRO_FONTS_PATCH=y @@ -390,8 +390,8 @@ diff -ruN a/debian/rules b/debian/rules -V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \ -V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \ diff -ruN a/debian/scripts/gid2pkgdirs.sh b/debian/scripts/gid2pkgdirs.sh ---- a/debian/scripts/gid2pkgdirs.sh 2015-04-08 13:27:19.000000000 +0000 -+++ b/debian/scripts/gid2pkgdirs.sh 2015-05-12 17:57:32.612000000 +0000 +--- a/debian/scripts/gid2pkgdirs.sh 2015-09-18 12:59:35.000000000 +0000 ++++ b/debian/scripts/gid2pkgdirs.sh 2015-11-14 15:19:36.528000000 +0000 @@ -101,6 +101,7 @@ create_package_directory gid_Module_Script_Provider_For_Python pkg/libreoffice-script-provider-python create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome diff --git a/libreoffice/4.3.3/jessie/debian.diff b/libreoffice/4.3.3/jessie/debian.diff index 0e1ec1a..9e03069 100644 --- a/libreoffice/4.3.3/jessie/debian.diff +++ b/libreoffice/4.3.3/jessie/debian.diff @@ -1,19 +1,19 @@ diff -ruN a/debian/changelog b/debian/changelog ---- a/debian/changelog 2015-03-26 21:22:14.000000000 +0000 -+++ b/debian/changelog 2015-05-12 17:29:02.476000000 +0000 +--- a/debian/changelog 2015-08-28 15:18:09.000000000 +0000 ++++ b/debian/changelog 2015-11-14 17:25:07.096000000 +0000 @@ -1,3 +1,9 @@ -+libreoffice (1:4.3.3-2+tde1+deb8u1) jessie; urgency=high ++libreoffice (1:4.3.3-2+tde1+deb8u2) jessie; urgency=high + + * Enable TDE module + -+ -- Slávek Banko Tue, 12 May 2015 19:08:29 +0200 ++ -- Slávek Banko Sun, 14 Nov 2015 18:24:38 +0100 + - libreoffice (1:4.3.3-2+deb8u1) unstable; urgency=high + libreoffice (1:4.3.3-2+deb8u2) jessie-security; urgency=high - * debian/patches/hwpreader-check-reads.patch: fix + * debian/patches/CVE-2015-4551.diff: backport fix for Arbritary diff -ruN a/debian/control b/debian/control ---- a/debian/control 2015-04-08 16:36:21.000000000 +0000 -+++ b/debian/control 2015-05-12 17:29:02.476000000 +0000 +--- a/debian/control 2015-08-28 17:51:39.000000000 +0000 ++++ b/debian/control 2015-11-14 17:25:07.096000000 +0000 @@ -133,6 +133,8 @@ python-dev (>= 2.6), python3, @@ -91,8 +91,8 @@ diff -ruN a/debian/control b/debian/control Section: libs Priority: extra diff -ruN a/debian/control.in b/debian/control.in ---- a/debian/control.in 2014-10-18 20:23:39.000000000 +0000 -+++ b/debian/control.in 2015-05-12 17:29:02.476000000 +0000 +--- a/debian/control.in 2015-04-25 16:33:35.000000000 +0000 ++++ b/debian/control.in 2015-11-14 17:25:07.096000000 +0000 @@ -197,6 +197,7 @@ libreoffice-impress (<< ${binary:Version}), libreoffice-kab (<< 1:3.4.1~), @@ -103,7 +103,7 @@ diff -ruN a/debian/control.in b/debian/control.in libreoffice-sdbc-postgresql (<< 0.8.1~), diff -ruN a/debian/control.tdeab.in b/debian/control.tdeab.in --- a/debian/control.tdeab.in 1970-01-01 00:00:00.000000000 +0000 -+++ b/debian/control.tdeab.in 2015-05-12 17:29:02.476000000 +0000 ++++ b/debian/control.tdeab.in 2015-11-14 17:25:07.096000000 +0000 @@ -0,0 +1,15 @@ +Package: libreofficeVER-tdeab-trinity +Architecture: %OOO_BASE_ARCHS% @@ -122,7 +122,7 @@ diff -ruN a/debian/control.tdeab.in b/debian/control.tdeab.in + diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in --- a/debian/control.trinity.in 1970-01-01 00:00:00.000000000 +0000 -+++ b/debian/control.trinity.in 2015-05-12 17:29:02.476000000 +0000 ++++ b/debian/control.trinity.in 2015-11-14 17:25:07.096000000 +0000 @@ -0,0 +1,23 @@ +Package: libreofficeVER-trinity +Architecture: %OOO_ARCHS% @@ -148,8 +148,8 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in + * libreoffice-tdeab-trinity: TDE Addressbook support + diff -ruN a/debian/rules b/debian/rules ---- a/debian/rules 2015-03-19 21:06:33.000000000 +0000 -+++ b/debian/rules 2015-05-12 17:29:02.480000000 +0000 +--- a/debian/rules 2015-04-25 16:33:35.000000000 +0000 ++++ b/debian/rules 2015-11-14 17:25:07.096000000 +0000 @@ -223,6 +223,13 @@ QT_MINVER= (>= 4:4.5) endif @@ -297,8 +297,8 @@ diff -ruN a/debian/rules b/debian/rules -V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \ -V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \ diff -ruN a/debian/scripts/gid2pkgdirs.sh b/debian/scripts/gid2pkgdirs.sh ---- a/debian/scripts/gid2pkgdirs.sh 2014-10-18 20:23:10.000000000 +0000 -+++ b/debian/scripts/gid2pkgdirs.sh 2015-05-12 17:29:02.480000000 +0000 +--- a/debian/scripts/gid2pkgdirs.sh 2015-04-25 16:33:35.000000000 +0000 ++++ b/debian/scripts/gid2pkgdirs.sh 2015-11-14 17:25:07.096000000 +0000 @@ -102,6 +102,7 @@ create_package_directory gid_Module_Script_Provider_For_Python pkg/libreoffice-script-provider-python create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome