diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2015-11-15 11:20:19 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2015-11-15 11:21:07 +0100 |
commit | c4faab2f666fe49e7ff4133fce605988e725a51e (patch) | |
tree | 36622f4b6dd59ff8879ec059b6b62d18b7d9db26 /libreoffice/4.3.3/jessie/debian.diff | |
parent | 309e65bcd6acf445bd87552570a88b51fc75ce65 (diff) | |
download | thirdparty-c4faab2f666fe49e7ff4133fce605988e725a51e.tar.gz thirdparty-c4faab2f666fe49e7ff4133fce605988e725a51e.zip |
Update LibreOffice packaging patches:r14.0.3
+ 4.2.8 - Ubuntu 14.04 - Trusty
+ 4.3.3 - Debian 8.x - Jessie
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b3046dd02631261a509b31a0235bf7ca14888d0b)
Diffstat (limited to 'libreoffice/4.3.3/jessie/debian.diff')
-rw-r--r-- | libreoffice/4.3.3/jessie/debian.diff | 32 |
1 files changed, 16 insertions, 16 deletions
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 <slavek.banko@axis.cz> Tue, 12 May 2015 19:08:29 +0200 ++ -- Slávek Banko <slavek.banko@axis.cz> 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 |