|
|
|
@ -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+deb8u7) jessie; urgency=high
|
|
|
|
|
+libreoffice (1:4.3.3-2+tde1+deb8u11) jessie; urgency=high
|
|
|
|
|
+
|
|
|
|
|
+ * Enable TDE module
|
|
|
|
|
+
|
|
|
|
|
+ -- Slávek Banko <slavek.banko@axis.cz> Fri, 28 Apr 2017 14:02:22 +0200
|
|
|
|
|
+ -- Slávek Banko <slavek.banko@axis.cz> Sat, 21 Apr 2018 14:27:29 +0200
|
|
|
|
|
+
|
|
|
|
|
libreoffice (1:4.3.3-2+deb8u7) jessie-security; urgency=high
|
|
|
|
|
libreoffice (1:4.3.3-2+deb8u11) jessie-security; urgency=high
|
|
|
|
|
|
|
|
|
|
* debian/patches/CVE-2017-7870.diff: fix CVE-2017-7870
|
|
|
|
|
* debian/patches/CVE-2018-10119.diff,
|
|
|
|
|
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
|
|
|
|
@ -73,7 +73,7 @@ diff -ruN a/debian/control b/debian/control
|
|
|
|
|
You need to install evolution separately.
|
|
|
|
|
|
|
|
|
|
+Package: libreoffice-tdeab-trinity
|
|
|
|
|
+Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc ppc64el arm64
|
|
|
|
|
+Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
|
|
|
|
|
+Depends: libreoffice-common (>= 1:3.4.0~),
|
|
|
|
|
+ libreoffice-core (= ${binary:Version}),
|
|
|
|
|
+ ${misc:Depends},
|
|
|
|
@ -90,6 +90,15 @@ diff -ruN a/debian/control b/debian/control
|
|
|
|
|
Package: libreoffice-subsequentcheckbase
|
|
|
|
|
Section: libs
|
|
|
|
|
Priority: extra
|
|
|
|
|
@@ -4602,6 +4643,8 @@
|
|
|
|
|
python-dev (>= 2.6),
|
|
|
|
|
python3,
|
|
|
|
|
python3-dev (>= 3.3),
|
|
|
|
|
+ tdelibs14-trinity-dev,
|
|
|
|
|
+ tdepim-trinity-dev,
|
|
|
|
|
ucpp,
|
|
|
|
|
unixodbc-dev (>= 2.2.11),
|
|
|
|
|
unzip,
|
|
|
|
|
diff -ruN a/debian/control.in b/debian/control.in
|
|
|
|
|
--- a/debian/control.in 2015-04-25 16:33:35.000000000 +0000
|
|
|
|
|
+++ b/debian/control.in 2015-11-14 17:25:07.096000000 +0000
|
|
|
|
@ -164,7 +173,7 @@ diff -ruN a/debian/rules b/debian/rules
|
|
|
|
|
BUILD_DBG_PACKAGE=y
|
|
|
|
|
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
|
|
|
|
|
BUILD_TEST_PACKAGE=y
|
|
|
|
|
@@ -604,6 +611,7 @@
|
|
|
|
|
@@ -605,6 +612,7 @@
|
|
|
|
|
ENABLE_MYSQLNATIVE=n
|
|
|
|
|
ENABLE_EVO2=n
|
|
|
|
|
ENABLE_KDEAB=n
|
|
|
|
@ -172,7 +181,7 @@ diff -ruN a/debian/rules b/debian/rules
|
|
|
|
|
ENABLE_REPORTDESIGN=n
|
|
|
|
|
DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers
|
|
|
|
|
DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab
|
|
|
|
|
@@ -1293,6 +1301,23 @@
|
|
|
|
|
@@ -1294,6 +1302,23 @@
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
@ -196,7 +205,7 @@ diff -ruN a/debian/rules b/debian/rules
|
|
|
|
|
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
|
|
|
|
|
CONFIGURE_FLAGS += --enable-ext-mariadb-connector
|
|
|
|
|
ifneq "$(USE_MARIADB)" "y"
|
|
|
|
|
@@ -1821,6 +1846,11 @@
|
|
|
|
|
@@ -1822,6 +1847,11 @@
|
|
|
|
|
ifeq "$(BUILD_KDE)" "y"
|
|
|
|
|
cat debian/control.kde.in >> debian/control
|
|
|
|
|
endif
|
|
|
|
@ -208,7 +217,7 @@ diff -ruN a/debian/rules b/debian/rules
|
|
|
|
|
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
|
|
|
|
|
cat debian/control.postgresql.in >> debian/control
|
|
|
|
|
endif
|
|
|
|
|
@@ -1833,6 +1863,10 @@
|
|
|
|
|
@@ -1834,6 +1864,10 @@
|
|
|
|
|
ifeq "$(ENABLE_KDEAB)" "y"
|
|
|
|
|
cat debian/control.kab.in >> debian/control
|
|
|
|
|
endif
|
|
|
|
@ -219,7 +228,7 @@ diff -ruN a/debian/rules b/debian/rules
|
|
|
|
|
ifeq "$(BUILD_TEST_PACKAGE)" "y"
|
|
|
|
|
ifneq "$(OOO_JAVA_ARCHS)" ""
|
|
|
|
|
cat debian/control.subsequentcheckbase.in >> debian/control
|
|
|
|
|
@@ -1920,6 +1954,9 @@
|
|
|
|
|
@@ -1921,6 +1955,9 @@
|
|
|
|
|
ifeq "$(BUILD_KDE)" "y"
|
|
|
|
|
perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice-kde: KDE UI Plugin and KDE File Picker support/' debian/control
|
|
|
|
|
endif
|
|
|
|
@ -229,7 +238,7 @@ diff -ruN a/debian/rules b/debian/rules
|
|
|
|
|
|
|
|
|
|
ifeq "$(USE_DBUS)" "y"
|
|
|
|
|
perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control/' debian/control
|
|
|
|
|
@@ -2603,6 +2640,45 @@
|
|
|
|
|
@@ -2604,6 +2641,45 @@
|
|
|
|
|
| sed -e "s/@TYPE@/drawing/" \
|
|
|
|
|
> $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop
|
|
|
|
|
endif
|
|
|
|
@ -275,7 +284,7 @@ diff -ruN a/debian/rules b/debian/rules
|
|
|
|
|
|
|
|
|
|
# split out gtk stuff
|
|
|
|
|
rm -rf $(PKGDIR)-gtk
|
|
|
|
|
@@ -3274,6 +3350,12 @@
|
|
|
|
|
@@ -3275,6 +3351,12 @@
|
|
|
|
|
# register technical.dic
|
|
|
|
|
perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
|
|
|
|
|
|
|
|
|
@ -288,7 +297,7 @@ diff -ruN a/debian/rules b/debian/rules
|
|
|
|
|
#ifeq "$(PACKAGE_SDK)" "y"
|
|
|
|
|
# # install gengal stuff into -dev
|
|
|
|
|
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
|
|
|
|
|
@@ -3469,6 +3551,7 @@
|
|
|
|
|
@@ -3470,6 +3552,7 @@
|
|
|
|
|
-V'Binary-Version=$(BINARY_VERSION)' \
|
|
|
|
|
-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
|
|
|
|
|
-V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \
|
|
|
|
|