summaryrefslogtreecommitdiffstats
path: root/libreoffice/4.3.3
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-06-08 13:50:10 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-06-08 13:50:10 +0200
commit1e08d9beddc3f011f28ad8b9375cc345a8856285 (patch)
tree2758cc8e5f90fb009240736ca6472e06e2eddffa /libreoffice/4.3.3
parent84314564254bec77cf9a339cb4290030a073873b (diff)
downloadthirdparty-1e08d9beddc3f011f28ad8b9375cc345a8856285.tar.gz
thirdparty-1e08d9beddc3f011f28ad8b9375cc345a8856285.zip
Update LibreOffice packaging patches:
+ 4.2.8 - Ubuntu 14.04 - Trusty + 4.3.3 - Debian 7.x - Wheezy-backports + 4.3.3 - Debian 8.x - Jessie + 5.2.7 - Debian 8.x - Jessie-backports (updated from 5.2.5) Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'libreoffice/4.3.3')
-rw-r--r--libreoffice/4.3.3/jessie/debian.diff8
-rw-r--r--libreoffice/4.3.3/wheezy-backports/debian.diff38
2 files changed, 8 insertions, 38 deletions
diff --git a/libreoffice/4.3.3/jessie/debian.diff b/libreoffice/4.3.3/jessie/debian.diff
index f4b0a98..4f0cdf4 100644
--- a/libreoffice/4.3.3/jessie/debian.diff
+++ b/libreoffice/4.3.3/jessie/debian.diff
@@ -2,15 +2,15 @@ diff -ruN a/debian/changelog b/debian/changelog
--- a/debian/changelog 2015-08-28 15:18:09.000000000 +0000
+++ b/debian/changelog 2016-06-30 02:03:40.000000000 +0000
@@ -1,3 +1,9 @@
-+libreoffice (1:4.3.3-2+tde1+deb8u6) jessie; urgency=medium
++libreoffice (1:4.3.3-2+tde1+deb8u7) jessie; urgency=high
+
+ * Enable TDE module
+
-+ -- Slávek Banko <slavek.banko@axis.cz> Sun, 26 Feb 2017 03:12:30 +0100
++ -- Slávek Banko <slavek.banko@axis.cz> Fri, 28 Apr 2017 14:02:22 +0200
+
- libreoffice (1:4.3.3-2+deb8u6) jessie-security; urgency=high
+ libreoffice (1:4.3.3-2+deb8u7) jessie-security; urgency=high
- * debian/patches/olefix.diff: fix CVE-2017-3157
+ * debian/patches/CVE-2017-7870.diff: fix CVE-2017-7870
diff -ruN a/debian/control b/debian/control
--- a/debian/control 2015-08-28 17:51:39.000000000 +0000
+++ b/debian/control 2015-11-14 17:25:07.096000000 +0000
diff --git a/libreoffice/4.3.3/wheezy-backports/debian.diff b/libreoffice/4.3.3/wheezy-backports/debian.diff
index 5b69a64..489b29d 100644
--- a/libreoffice/4.3.3/wheezy-backports/debian.diff
+++ b/libreoffice/4.3.3/wheezy-backports/debian.diff
@@ -1,15 +1,14 @@
diff -ruN a/debian/changelog b/debian/changelog
--- a/debian/changelog 2017-02-25 16:48:23.000000000 +0000
+++ b/debian/changelog 2017-03-03 12:42:16.000000000 +0000
-@@ -1,3 +1,10 @@
-+libreoffice (1:4.3.3-2+tde1+deb8u6~bpo70+1a) wheezy; urgency=high
+@@ -1,3 +1,9 @@
++libreoffice (1:4.3.3-2+tde1+deb8u7~bpo70+1) wheezy-backports; urgency=high
+
+ * Enable TDE module
-+ * Fix FTBFS with GCC < 4.7
+
-+ -- Slávek Banko <slavek.banko@axis.cz> Fri, 03 Mar 2017 13:43:23 +0100
++ -- Slávek Banko <slavek.banko@axis.cz> Wed, 07 Jun 2017 19:48:19 +0200
+
- libreoffice (1:4.3.3-2+deb8u6~bpo70+1) wheezy-backports; urgency=high
+ libreoffice (1:4.3.3-2+deb8u7~bpo70+1) wheezy-backports; urgency=high
* Rebuild for wheezy-backports.
diff -ruN a/debian/control b/debian/control
@@ -157,35 +156,6 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in
+ * konqueror / kmail
+ * libreoffice-tdeab-trinity: TDE Addressbook support
+
-diff -ruN a/debian/patches/olefix-gcc-4.6.diff b/debian/patches/olefix-gcc-4.6.diff
---- a/debian/patches/olefix-gcc-4.6.diff 1970-01-01 00:00:00.000000000 +0000
-+++ b/debian/patches/olefix-gcc-4.6.diff 2017-03-03 12:12:03.000000000 +0000
-@@ -0,0 +1,16 @@
-+Index: b/include/svx/svdoole2.hxx
-+===================================================================
-+--- a/include/svx/svdoole2.hxx
-++++ b/include/svx/svdoole2.hxx
-+@@ -204,9 +204,9 @@
-+ explicit SdrEmbedObjectLink(SdrOle2Obj* pObj);
-+ virtual ~SdrEmbedObjectLink();
-+
-+- virtual void Closed() override;
-++ virtual void Closed();
-+ virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-+- const OUString& rMimeType, const css::uno::Any & rValue ) override;
-++ const OUString& rMimeType, const css::uno::Any & rValue );
-+
-+ bool Connect() { return GetRealObject() != nullptr; }
-+ };
-diff -ruN a/debian/patches/series b/debian/patches/series
---- a/debian/patches/series 2017-02-25 16:47:19.000000000 +0000
-+++ b/debian/patches/series 2017-03-03 12:39:17.000000000 +0000
-@@ -48,4 +48,5 @@
- ppc64el-jdk-paths.diff
- CVE-2016-4324.diff
- olefix.diff
-+olefix-gcc-4.6.diff
- icu-icudata-link-fix-armhf.diff
diff -ruN a/debian/rules b/debian/rules
--- a/debian/rules 2015-04-06 12:49:47.000000000 +0000
+++ b/debian/rules 2015-05-12 17:07:51.160000000 +0000