summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2016-02-27 01:54:15 +0100
committerSlávek Banko <[email protected]>2016-02-27 01:54:34 +0100
commit2a9b8206781e2d68cc6a0a30f32e059eaf16efc8 (patch)
tree9323fa4950bab0d5e22fd849c7b12b912d12795e
parentc4faab2f666fe49e7ff4133fce605988e725a51e (diff)
downloadthirdparty-2a9b8206781e2d68cc6a0a30f32e059eaf16efc8.tar.gz
thirdparty-2a9b8206781e2d68cc6a0a30f32e059eaf16efc8.zip
Update LibreOffice packaging patches:
+ 4.2.8 - Ubuntu 14.04 - Trusty + 4.3.3 - Debian 8.x - Jessie Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit a8ba107586827d86367de160749665eaf7e0b506)
-rw-r--r--libreoffice/4.2.8/trusty/debian.diff16
-rw-r--r--libreoffice/4.3.3/jessie/debian.diff8
2 files changed, 12 insertions, 12 deletions
diff --git a/libreoffice/4.2.8/trusty/debian.diff b/libreoffice/4.2.8/trusty/debian.diff
index ebbddc9..44e553a 100644
--- a/libreoffice/4.2.8/trusty/debian.diff
+++ b/libreoffice/4.2.8/trusty/debian.diff
@@ -2,15 +2,15 @@ diff -ruN a/debian/changelog b/debian/changelog
--- 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-0ubuntu3+tde1) trusty; urgency=medium
++libreoffice (1:4.2.8-0ubuntu4+tde1) trusty; urgency=medium
+
+ * Enable TDE module
+
-+ -- Slávek Banko <[email protected]> Sat, 14 Nov 2015 16:18:20 +0100
++ -- Slávek Banko <[email protected]> Wed, 24 Feb 2016 19:29:09 +0100
+
- libreoffice (1:4.2.8-0ubuntu3) trusty-security; urgency=medium
+ libreoffice (1:4.2.8-0ubuntu4) trusty-security; urgency=medium
- * Rebuild as security update
+ * various lwp fixes
diff -ruN a/debian/control b/debian/control
--- a/debian/control 2015-11-02 21:26:04.000000000 +0000
+++ b/debian/control 2015-11-14 15:19:36.524000000 +0000
@@ -156,10 +156,10 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in
diff -ruN a/debian/patches/series b/debian/patches/series
--- 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
+@@ -45,3 +45,4 @@
+ lwpfix3.diff
+ lwpfix4.diff
+ lwpfix5.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
diff --git a/libreoffice/4.3.3/jessie/debian.diff b/libreoffice/4.3.3/jessie/debian.diff
index 9e03069..2d4d026 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 2015-11-14 17:25:07.096000000 +0000
@@ -1,3 +1,9 @@
-+libreoffice (1:4.3.3-2+tde1+deb8u2) jessie; urgency=high
++libreoffice (1:4.3.3-2+tde1+deb8u3) jessie; urgency=high
+
+ * Enable TDE module
+
-+ -- Slávek Banko <[email protected]> Sun, 14 Nov 2015 18:24:38 +0100
++ -- Slávek Banko <[email protected]> Wed, 24 Feb 2016 18:35:40 +0100
+
- libreoffice (1:4.3.3-2+deb8u2) jessie-security; urgency=high
+ libreoffice (1:4.3.3-2+deb8u3) jessie-security; urgency=high
- * debian/patches/CVE-2015-4551.diff: backport fix for Arbritary
+ * debian/patches/V-1lp8t84lh4.diff: fix "LibreOffice Writer Lotus Word Pro
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