Update LibreOffice packaging patches:

+ add 4.4.2 - Debian 8.x - Jessie-backports
+ install templates to /opt/trinity instead of /usr

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

4 files changed, 367 insertions, 49 deletions

diff --git a/libreoffice/4.2.8/trusty/debian.diff b/libreoffice/4.2.8/trusty/debian.diff
index 2575e3b..b22ee45 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-04-27 19:03:46.624000000 +0000
++++ b/debian/changelog	2015-05-12 17:57:32.608000000 +0000
 @@ -1,3 +1,9 @@
-+libreoffice (1:4.2.8-0ubuntu2+tde0) trusty; urgency=medium
++libreoffice (1:4.2.8-0ubuntu2+tde1) trusty; urgency=medium
 +
 +  * Enable TDE module
 +
-+ -- Slávek Banko <slavek.banko@axis.cz>  Mon, 27 Apr 2015 21:03:37 +0200
++ -- Slávek Banko <slavek.banko@axis.cz>  Tue, 12 May 2015 19:08:29 +0200
 +
  libreoffice (1:4.2.8-0ubuntu2) trusty-security; urgency=medium
  
    * avoid null deref in EditEngine
 diff -ruN a/debian/control b/debian/control
 --- a/debian/control	2015-04-23 18:22:57.000000000 +0000
-+++ b/debian/control	2015-04-27 19:00:52.232000000 +0000
++++ b/debian/control	2015-05-12 17:57:32.608000000 +0000
 @@ -112,6 +112,8 @@
                 python (>= 2.6.6-3+squeeze4),
                 python3,
@@ -98,7 +98,7 @@ diff -ruN a/debian/control b/debian/control
 +
 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-04-27 19:00:52.232000000 +0000
++++ b/debian/control.in	2015-05-12 17:57:32.608000000 +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-04-27 19:00:52.232000000 +0000
++++ b/debian/control.tdeab.in	2015-05-12 17:57:32.608000000 +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-04-27 19:00:52.232000000 +0000
++++ b/debian/control.trinity.in	2015-05-12 17:57:32.608000000 +0000
 @@ -0,0 +1,23 @@
 +Package: libreofficeVER-trinity
 +Architecture: %OOO_ARCHS%
@@ -155,7 +155,7 @@ 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-04-08 13:27:19.000000000 +0000
-+++ b/debian/patches/series	2015-04-27 19:02:24.680000000 +0000
++++ b/debian/patches/series	2015-05-12 17:57:32.608000000 +0000
 @@ -36,3 +36,4 @@
  lp-1342175.diff
  lp-1372799.diff
@@ -163,7 +163,7 @@ diff -ruN a/debian/patches/series b/debian/patches/series
 +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-04-27 19:00:52.236000000 +0000
++++ b/debian/patches/tde-update-r14.diff	2015-05-12 17:57:32.608000000 +0000
 @@ -0,0 +1,68 @@
 +diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
 +index 298ed4c..8243280 100644
@@ -235,7 +235,7 @@ 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-04-27 19:00:52.236000000 +0000
++++ b/debian/rules	2015-05-12 17:57:32.608000000 +0000
 @@ -218,6 +218,7 @@
  SYSTEM_STUFF += cairo
  CAIRO_FONTS_PATCH=y
@@ -332,30 +332,30 @@ diff -ruN a/debian/rules b/debian/rules
 +		$(PKGDIR)-trinity/$(OODIR)/program
 +
 +	# install files for TDEs "create new" ...
-+	mkdir -p $(PKGDIR)-trinity/usr/share/templates/.source
++	mkdir -p $(PKGDIR)-trinity/opt/trinity/share/templates/.source
 +	for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \
-+		cp $$i $(PKGDIR)-trinity/usr/share/templates/.source/`basename $$i`; \
++		cp $$i $(PKGDIR)-trinity/opt/trinity/share/templates/.source/`basename $$i`; \
 +	done
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Writer/" \
 +		| sed -e "s/@EXT@/odt/" \
 +		| sed -e "s/@TYPE@/text/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.odt.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odt.desktop
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Calc/" \
 +		| sed -e "s/@EXT@/ods/" \
 +		| sed -e "s/@TYPE@/spreadsheet/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.ods.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.ods.desktop
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Impress/" \
 +		| sed -e "s/@EXT@/odp/" \
 +		| sed -e "s/@TYPE@/presentation/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.odp.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odp.desktop
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Draw/" \
 +		| sed -e "s/@EXT@/odg/" \
 +		| sed -e "s/@TYPE@/drawing/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.odg.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odg.desktop
 +endif
 +ifeq "$(ENABLE_TDEAB)" "y"
 +	rm -rf $(PKGDIR)-tdeab-trinity
@@ -391,7 +391,7 @@ diff -ruN a/debian/rules b/debian/rules
  		-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-04-27 19:00:52.236000000 +0000
++++ b/debian/scripts/gid2pkgdirs.sh	2015-05-12 17:57:32.612000000 +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 2e001f1..0e1ec1a 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-04-25 18:26:49.656000000 +0000
++++ b/debian/changelog	2015-05-12 17:29:02.476000000 +0000
 @@ -1,3 +1,9 @@
-+libreoffice (1:4.3.3-2+tde0+deb8u1) jessie; urgency=high
++libreoffice (1:4.3.3-2+tde1+deb8u1) jessie; urgency=high
 +
 +  * Enable TDE module
 +
-+ -- Slávek Banko <slavek.banko@axis.cz>  Sun, 26 Apr 2015 14:33:14 +0200
++ -- Slávek Banko <slavek.banko@axis.cz>  Tue, 12 May 2015 19:08:29 +0200
 +
  libreoffice (1:4.3.3-2+deb8u1) unstable; urgency=high
  
    * debian/patches/hwpreader-check-reads.patch: fix
 diff -ruN a/debian/control b/debian/control
 --- a/debian/control	2015-04-08 16:36:21.000000000 +0000
-+++ b/debian/control	2015-04-11 14:02:20.000000000 +0000
++++ b/debian/control	2015-05-12 17:29:02.476000000 +0000
 @@ -133,6 +133,8 @@
                 python-dev (>= 2.6),
                 python3,
@@ -92,7 +92,7 @@ diff -ruN a/debian/control b/debian/control
  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-04-11 14:00:52.000000000 +0000
++++ b/debian/control.in	2015-05-12 17:29:02.476000000 +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-04-11 14:00:52.000000000 +0000
++++ b/debian/control.tdeab.in	2015-05-12 17:29:02.476000000 +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-04-11 14:00:52.000000000 +0000
++++ b/debian/control.trinity.in	2015-05-12 17:29:02.476000000 +0000
 @@ -0,0 +1,23 @@
 +Package: libreofficeVER-trinity
 +Architecture: %OOO_ARCHS%
@@ -149,7 +149,7 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in
 +
 diff -ruN a/debian/rules b/debian/rules
 --- a/debian/rules	2015-03-19 21:06:33.000000000 +0000
-+++ b/debian/rules	2015-04-11 14:00:52.000000000 +0000
++++ b/debian/rules	2015-05-12 17:29:02.480000000 +0000
 @@ -223,6 +223,13 @@
  QT_MINVER= (>= 4:4.5)
  endif
@@ -168,7 +168,7 @@ diff -ruN a/debian/rules b/debian/rules
  	ENABLE_MYSQLNATIVE=n
  	ENABLE_EVO2=n
  	ENABLE_KDEAB=n
-++	ENABLE_TDEAB=n
++	ENABLE_TDEAB=n
  	ENABLE_REPORTDESIGN=n
  	DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers
  	DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab
@@ -240,30 +240,30 @@ diff -ruN a/debian/rules b/debian/rules
 +	$(PKGDIR)-trinity/$(OODIR)/program
 +
 +	# install files for TDEs "create new" ...
-+	mkdir -p $(PKGDIR)-trinity/usr/share/templates/.source
++	mkdir -p $(PKGDIR)-trinity/opt/trinity/share/templates/.source
 +	for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \
-+		cp $$i $(PKGDIR)-trinity/usr/share/templates/.source/`basename $$i`; \
++		cp $$i $(PKGDIR)-trinity/opt/trinity/share/templates/.source/`basename $$i`; \
 +	done
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Writer/" \
 +		| sed -e "s/@EXT@/odt/" \
 +		| sed -e "s/@TYPE@/text/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.odt.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odt.desktop
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Calc/" \
 +		| sed -e "s/@EXT@/ods/" \
 +		| sed -e "s/@TYPE@/spreadsheet/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.ods.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.ods.desktop
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Impress/" \
 +		| sed -e "s/@EXT@/odp/" \
 +		| sed -e "s/@TYPE@/presentation/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.odp.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odp.desktop
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Draw/" \
 +		| sed -e "s/@EXT@/odg/" \
 +		| sed -e "s/@TYPE@/drawing/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.odg.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odg.desktop
 +endif
 +ifeq "$(ENABLE_TDEAB)" "y"
 +	rm -rf $(PKGDIR)-tdeab-trinity
@@ -298,7 +298,7 @@ diff -ruN a/debian/rules b/debian/rules
  		-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-04-11 14:00:52.000000000 +0000
++++ b/debian/scripts/gid2pkgdirs.sh	2015-05-12 17:29:02.480000000 +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
diff --git a/libreoffice/4.3.3/wheezy-backports/debian.diff b/libreoffice/4.3.3/wheezy-backports/debian.diff
index 0f33a13..5a1a062 100644
--- a/libreoffice/4.3.3/wheezy-backports/debian.diff
+++ b/libreoffice/4.3.3/wheezy-backports/debian.diff
@@ -1,19 +1,19 @@
 diff -ruN a/debian/changelog b/debian/changelog
 --- a/debian/changelog	2015-04-06 14:18:58.000000000 +0000
-+++ b/debian/changelog	2015-04-26 16:16:58.464000000 +0000
++++ b/debian/changelog	2015-05-12 17:08:33.220000000 +0000
 @@ -1,3 +1,9 @@
-+libreoffice (1:4.3.3-2+tde0+deb8u1~bpo70+1) wheezy-backports; urgency=high
++libreoffice (1:4.3.3-2+tde1+deb8u1~bpo70+1) wheezy-backports; urgency=high
 +
 +  * Enable TDE module
 +
-+ -- Slávek Banko <slavek.banko@axis.cz>  Sun, 26 Apr 2015 18:16:14 +0200
++ -- Slávek Banko <slavek.banko@axis.cz>  Tue, 12 May 2015 19:08:29 +0200
 +
  libreoffice (1:4.3.3-2+deb8u1~bpo70+1) wheezy-backports; urgency=high
  
    * Rebuild for wheezy-backports.
 diff -ruN a/debian/control b/debian/control
 --- a/debian/control	2015-04-06 14:59:08.000000000 +0000
-+++ b/debian/control	2015-04-26 16:14:47.668000000 +0000
++++ b/debian/control	2015-05-12 17:07:51.160000000 +0000
 @@ -100,6 +100,8 @@
                 python,
                 python (>= 2.6.6-3+squeeze4),
@@ -101,7 +101,7 @@ diff -ruN a/debian/control b/debian/control
           unzip,
 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-04-26 16:14:47.668000000 +0000
++++ b/debian/control.in	2015-05-12 17:07:51.160000000 +0000
 @@ -197,6 +197,7 @@
          libreoffice-impress (<< ${binary:Version}),
          libreoffice-kab (<< 1:3.4.1~),
@@ -112,7 +112,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-04-26 16:14:47.668000000 +0000
++++ b/debian/control.tdeab.in	2015-05-12 17:07:51.160000000 +0000
 @@ -0,0 +1,15 @@
 +Package: libreofficeVER-tdeab-trinity
 +Architecture: %OOO_BASE_ARCHS%
@@ -131,7 +131,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-04-26 16:14:47.668000000 +0000
++++ b/debian/control.trinity.in	2015-05-12 17:07:51.160000000 +0000
 @@ -0,0 +1,23 @@
 +Package: libreofficeVER-trinity
 +Architecture: %OOO_ARCHS%
@@ -158,7 +158,7 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in
 +
 diff -ruN a/debian/rules b/debian/rules
 --- a/debian/rules	2015-04-06 12:49:47.000000000 +0000
-+++ b/debian/rules	2015-04-26 16:14:47.668000000 +0000
++++ b/debian/rules	2015-05-12 17:07:51.160000000 +0000
 @@ -223,6 +223,13 @@
  QT_MINVER= (>= 4:4.5)
  endif
@@ -177,7 +177,7 @@ diff -ruN a/debian/rules b/debian/rules
  	ENABLE_MYSQLNATIVE=n
  	ENABLE_EVO2=n
  	ENABLE_KDEAB=n
-++	ENABLE_TDEAB=n
++	ENABLE_TDEAB=n
  	ENABLE_REPORTDESIGN=n
  	DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers
  	DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab
@@ -249,30 +249,30 @@ diff -ruN a/debian/rules b/debian/rules
 +	$(PKGDIR)-trinity/$(OODIR)/program
 +
 +	# install files for TDEs "create new" ...
-+	mkdir -p $(PKGDIR)-trinity/usr/share/templates/.source
++	mkdir -p $(PKGDIR)-trinity/opt/trinity/share/templates/.source
 +	for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \
-+		cp $$i $(PKGDIR)-trinity/usr/share/templates/.source/`basename $$i`; \
++		cp $$i $(PKGDIR)-trinity/opt/trinity/share/templates/.source/`basename $$i`; \
 +	done
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Writer/" \
 +		| sed -e "s/@EXT@/odt/" \
 +		| sed -e "s/@TYPE@/text/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.odt.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odt.desktop
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Calc/" \
 +		| sed -e "s/@EXT@/ods/" \
 +		| sed -e "s/@TYPE@/spreadsheet/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.ods.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.ods.desktop
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Impress/" \
 +		| sed -e "s/@EXT@/odp/" \
 +		| sed -e "s/@TYPE@/presentation/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.odp.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odp.desktop
 +	cat debian/templates/soffice-template.desktop.in \
 +		| sed -e "s/@APP@/Draw/" \
 +		| sed -e "s/@EXT@/odg/" \
 +		| sed -e "s/@TYPE@/drawing/" \
-+		> $(PKGDIR)-trinity/usr/share/templates/soffice.odg.desktop
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odg.desktop
 +endif
 +ifeq "$(ENABLE_TDEAB)" "y"
 +	rm -rf $(PKGDIR)-tdeab-trinity
@@ -307,7 +307,7 @@ diff -ruN a/debian/rules b/debian/rules
  		-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-04-26 16:14:47.668000000 +0000
++++ b/debian/scripts/gid2pkgdirs.sh	2015-05-12 17:07:51.160000000 +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
diff --git a/libreoffice/4.4.2/jessie-backports/debian.diff b/libreoffice/4.4.2/jessie-backports/debian.diff
new file mode 100644
index 0000000..08dd2bd
--- /dev/null
+++ b/libreoffice/4.4.2/jessie-backports/debian.diff
@@ -0,0 +1,318 @@
+diff -ruN a/debian/changelog b/debian/changelog
+--- a/debian/changelog	2015-05-01 16:04:58.000000000 +0000
++++ b/debian/changelog	2015-05-13 13:01:03.576000000 +0000
+@@ -1,3 +1,9 @@
++libreoffice (1:4.4.2-1+tde1~bpo8+1) jessie-backports; urgency=medium
++
++  * Enable TDE module
++
++ -- Slávek Banko <slavek.banko@axis.cz>  Tue, 12 May 2015 19:08:29 +0200
++
+ libreoffice (1:4.4.2-1~bpo8+1) jessie-backports; urgency=medium
+ 
+   * Rebuild for jessie-backports.
+diff -ruN a/debian/control b/debian/control
+--- a/debian/control	2015-05-04 00:03:52.000000000 +0000
++++ b/debian/control	2015-05-13 13:00:17.656000000 +0000
+@@ -131,6 +131,8 @@
+                pkg-config,
+                python3,
+                python3-dev (>= 3.3),
++               tdelibs14-trinity-dev,
++               tdepim-trinity-dev,
+                ucpp,
+                unixodbc-dev (>= 2.2.11),
+                unzip,
+@@ -250,6 +252,7 @@
+   * libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support,
+     QuickStarter for GNOMEs notification are
+   * libreoffice-gnome: GIO, GConf backend
++  * libreoffice-trinity: TDE UI Plugin and TDE File Picker support
+   * libreoffice-kde: KDE UI Plugin and KDE File Picker support
+   * unixodbc: ODBC database support
+   * cups-bsd: Allows LibreOffice to detect your CUPS printer queues
+@@ -363,6 +366,7 @@
+         libreoffice-style-hicontrast (<< 1:3.3.0-1),
+         libreoffice-style-oxygen (<< 1:3.3.0-1),
+         libreoffice-style-tango (<< 1:3.3.0-1),
++        libreoffice-trinity (<< ${binary:Version}),
+         libreoffice-writer (<< ${binary:Version}),
+         mozilla-libreoffice (<< 1:3.5.0~beta~),
+         mozilla-plugin-vlc (<< 1.0),
+@@ -4292,6 +4296,28 @@
+   * konqueror / kmail
+   * libreoffice-kab: KDE Addressbook support
+ 
++Package: libreoffice-trinity
++Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc ppc64el arm64
++Depends: libreoffice-core (= ${binary:Version}),
++         ${misc:Depends},
++         ${shlibs:Depends}
++Recommends: ${trinity-iconset-dep}
++Suggests: kmail-trinity, konqueror-trinity, libreoffice-tdeab-trinity
++Section: tde
++Enhances: libreoffice
++Replaces: libreoffice-core (= 1:3.5.0~beta2-1),
++          openoffice.org-trinity (<< 1:3.3.0~)
++Description: office productivity suite -- TDE integration
++ LibreOffice is a full-featured office productivity suite that provides
++ a near drop-in replacement for Microsoft(R) Office.
++ .
++ This package contains the TDE plugin for drawing OOo's widgets with
++ TDE/Qt and a TDEish File Picker when running under TDE.
++ You can extend the functionality of this by installing these packages:
++ .
++  * konqueror / kmail
++  * libreoffice-tdeab-trinity: TDE Addressbook support
++
+ Package: libreoffice-sdbc-postgresql
+ Section: misc
+ Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
+@@ -4342,6 +4368,21 @@
+  This package allows LibreOffice to access Evolution address books.
+  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
++Depends: libreoffice-common (>= 1:3.4.0~),
++         libreoffice-core (= ${binary:Version}),
++         ${misc:Depends},
++         ${shlibs:Depends}
++Recommends: kaddressbook-trinity
++Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
++Description: office productivity suite -- TDE adressbook support
++ LibreOffice is a full-featured office productivity suite that provides
++ a near drop-in replacement for Microsoft(R) Office.
++ .
++ This package allows LibreOffice to access the TDE Addressbook.
++ You need to install kaddressbook-trinity separately.
++
+ Package: libreoffice-subsequentcheckbase
+ Section: libs
+ Priority: extra
+diff -ruN a/debian/control.in b/debian/control.in
+--- a/debian/control.in	2015-04-07 17:56:48.000000000 +0000
++++ b/debian/control.in	2015-05-13 13:00:17.656000000 +0000
+@@ -196,6 +196,7 @@
+         libreoffice-impress (<< ${binary:Version}),
+         libreoffice-kab (<< 1:3.4.1~),
+         libreoffice-kde (<< ${binary:Version}),
++        libreoffice-trinity (<< ${binary:Version}),
+         libreoffice-officebean (<< ${binary:Version}),
+         libreoffice-presentation-minimizer (<< 1:4.2~),
+         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-13 13:00:17.656000000 +0000
+@@ -0,0 +1,15 @@
++Package: libreofficeVER-tdeab-trinity
++Architecture: %OOO_BASE_ARCHS%
++Depends: libreofficeVER-core (= ${binary:Version}),
++ libreofficeVER-common (>= 1:3.4.0~),
++ ${shlibs:Depends},
++ ${misc:Depends}
++Recommends: kaddressbook-trinity
++Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
++Description: office productivity suite -- TDE adressbook support
++ LibreOffice is a full-featured office productivity suite that provides
++ a near drop-in replacement for Microsoft(R) Office.
++ .
++ This package allows LibreOffice to access the TDE Addressbook.
++ You need to install kaddressbook-trinity separately.
++
+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-13 13:00:17.656000000 +0000
+@@ -0,0 +1,23 @@
++Package: libreofficeVER-trinity
++Architecture: %OOO_ARCHS%
++Depends: libreofficeVER-core (= ${binary:Version}),
++ ${shlibs:Depends},
++ ${misc:Depends}
++Recommends: ${trinity-iconset-dep}
++Suggests: konqueror-trinity,
++ kmail-trinity,
++ libreofficeVER-tdeab-trinity
++Section: tde
++Enhances: libreofficeVER
++Replaces: openoffice.org-trinity (<< 1:3.3.0~), libreoffice-core (= 1:3.5.0~beta2-1)
++Description: office productivity suite -- TDE integration
++ LibreOffice is a full-featured office productivity suite that provides
++ a near drop-in replacement for Microsoft(R) Office.
++ .
++ This package contains the TDE plugin for drawing OOo's widgets with
++ TDE/Qt and a TDEish File Picker when running under TDE.
++ You can extend the functionality of this by installing these packages:
++ .
++  * konqueror / kmail
++  * libreoffice-tdeab-trinity: TDE Addressbook support
++
+diff -ruN a/debian/rules b/debian/rules
+--- a/debian/rules	2015-04-12 10:25:41.000000000 +0000
++++ b/debian/rules	2015-05-13 13:00:17.656000000 +0000
+@@ -197,6 +197,13 @@
+ QT_MINVER= (>= 4:4.5)
+ endif
+ KDELIBS_MINVER= (>= 4:4.3.4)
++BUILD_TDE=y
++ifeq "$(BUILD_TDE)" "y"
++  ENABLE_TDEAB=y
++endif
++ifeq "$(BUILD_TDE)" "y"
++  TDELIBS_MINVER= (>= 4:3.5.13)
++endif
+ BUILD_DBG_PACKAGE=y
+ ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+   BUILD_TEST_PACKAGE=y
+@@ -558,6 +565,7 @@
+ 	ENABLE_MYSQLNATIVE=n
+ 	ENABLE_EVO2=n
+ 	ENABLE_KDEAB=n
++	ENABLE_TDEAB=n
+ 	ENABLE_REPORTDESIGN=n
+ 	DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers
+ 	DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab
+@@ -1183,6 +1191,23 @@
+   endif
+ endif
+ 
++ifeq "$(BUILD_TDE)" "n"
++  CONFIGURE_FLAGS+= --disable-tde
++  CONFIGURE_FLAGS+= --with-images="$(IMAGES)"
++else
++  CONFIGURE_FLAGS+= --enable-tde
++  TDE_ICONSET_DEP=libreoffice$(VER)-style-crystal
++  BUILD_DEPS += , tdelibs14-trinity-dev
++
++  DBG_DBG_SUGGESTS+= , tdelibs-trinity-dbg, libtqtinterface-dbg
++
++  ifeq "$(ENABLE_TDEAB)" "y"
++    BUILD_DEPS += , tdepim-trinity-dev
++  else
++    CONFIGURE_FLAGS+= --disable-tdeab
++  endif
++endif
++
+ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
+ 	CONFIGURE_FLAGS += --enable-ext-mariadb-connector
+   ifneq "$(USE_MARIADB)" "y"
+@@ -1671,6 +1696,11 @@
+ ifeq "$(BUILD_KDE)" "y"
+ 	cat debian/control.kde.in >> debian/control
+ endif
++ifeq "$(BUILD_TDE)" "y"
++	sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
++		>> debian/control < debian/control.trinity.in
++	  perl -pi -e 's/ libreoffice$(VER)-gnome,/ libreoffice-gnome | libreoffice$(VER)-trinity,/' debian/control
++endif
+ ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
+ 	cat debian/control.postgresql.in >> debian/control
+ endif
+@@ -1683,6 +1713,10 @@
+ ifeq "$(ENABLE_KDEAB)" "y"
+ 	cat debian/control.kab.in >> debian/control
+ endif
++ifeq "$(ENABLE_TDEAB)" "y"
++	sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
++		>> debian/control < debian/control.tdeab.in
++endif
+ ifeq "$(BUILD_TEST_PACKAGE)" "y"
+   ifneq "$(OOO_JAVA_ARCHS)" ""
+ 	cat debian/control.subsequentcheckbase.in >> debian/control
+@@ -1762,6 +1796,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
++ifeq "$(BUILD_TDE)" "y"
++	perl -pi -e 's/GConf backend$$/GConf backend\n  * libreoffice$(VER)-trinity: TDE UI Plugin and TDE File Picker support/' debian/control
++endif
+ 
+ ifeq "$(USE_DBUS)" "y"
+ 	perl -pi -e 's/paperconf$$/paperconf\n  * bluez: Bluetooth support for Impress (slideshow remote control/' debian/control
+@@ -2433,6 +2470,45 @@
+ 		| sed -e "s/@TYPE@/drawing/" \
+ 		> $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop
+ endif
++ 
++ifeq "$(BUILD_TDE)" "y"
++	mkdir -p -m755 $(PKGDIR)-trinity/$(OODIR)/program
++	mv $(PKGDIR)-core/$(OODIR)/program/tdefilepicker \
++	$(PKGDIR)-trinity/$(OODIR)/program
++
++	# install files for TDEs "create new" ...
++	mkdir -p $(PKGDIR)-trinity/opt/trinity/share/templates/.source
++	for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \
++		cp $$i $(PKGDIR)-trinity/opt/trinity/share/templates/.source/`basename $$i`; \
++	done
++	cat debian/templates/soffice-template.desktop.in \
++		| sed -e "s/@APP@/Writer/" \
++		| sed -e "s/@EXT@/odt/" \
++		| sed -e "s/@TYPE@/text/" \
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odt.desktop
++	cat debian/templates/soffice-template.desktop.in \
++		| sed -e "s/@APP@/Calc/" \
++		| sed -e "s/@EXT@/ods/" \
++		| sed -e "s/@TYPE@/spreadsheet/" \
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.ods.desktop
++	cat debian/templates/soffice-template.desktop.in \
++		| sed -e "s/@APP@/Impress/" \
++		| sed -e "s/@EXT@/odp/" \
++		| sed -e "s/@TYPE@/presentation/" \
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odp.desktop
++	cat debian/templates/soffice-template.desktop.in \
++		| sed -e "s/@APP@/Draw/" \
++		| sed -e "s/@EXT@/odg/" \
++		| sed -e "s/@TYPE@/drawing/" \
++		> $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odg.desktop
++endif
++ifeq "$(ENABLE_TDEAB)" "y"
++	rm -rf $(PKGDIR)-tdeab-trinity
++	mkdir -p -m755 $(PKGDIR)-tdeab-trinity/$(OODIR)/program
++	for f in libtdeab*so; do \
++	  mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-tdeab-trinity/$(OODIR)/program || exit 1 ;\
++	done
++endif
+ 
+ 	# split out gtk stuff
+ 	rm -rf $(PKGDIR)-gtk
+@@ -3028,6 +3104,12 @@
+ 	# register technical.dic
+ 	perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
+ 
++ifeq "$(BUILD_TDE)" "y"
++	# be sure we use the right moc, FIXME: Trinity uses its own moc
++	mkdir -p $(CURDIR)/debian/usr/bin
++	ln -sf /usr/bin/moc-qt$(KDE_VER) $(CURDIR)/debian/usr/bin/moc
++endif
++
+ #ifeq "$(PACKAGE_SDK)" "y"
+ #	# install gengal stuff into -dev
+ #	mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+@@ -3212,6 +3294,7 @@
+ 		-V'Binary-Version=$(BINARY_VERSION)' \
+ 		-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
+ 		-V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \
++		-V'tde-iconset-dep=$(TDE_ICONSET_DEP)' \
+ 		-V'lpsolve-dep=$(LPSOLVE_DEP)' \
+ 		-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-02 21:01:25.000000000 +0000
++++ b/debian/scripts/gid2pkgdirs.sh	2015-05-13 13:02:34.128000000 +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
+ create_package_directory gid_Module_Optional_Kde                pkg/libreoffice-kde
++create_package_directory gid_Module_Optional_Tde                pkg/libreoffice-trinity
+ create_package_directory gid_Module_Root_Files
+ create_package_directory gid_Module_Optional_OGLTrans		pkg/libreoffice-ogltrans
+ create_package_directory gid_Module_Root_SDK                    pkg/libreoffice-dev
+@@ -147,7 +148,7 @@
+ fi &&
+ ( cd pkg/libreoffice-common/$OOINSTBASE/program
+   find -maxdepth 1 \
+-     -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\|ui-previewer\)' \
++     -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|kdefilepicker\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\|ui-previewer\)' \
+      -exec mv {} $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program \;
+ );
+