Update LibreOffice packaging patches:r14.0.1

+ 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>
(cherry picked from commit c6e95f5f471c17e67f8a228c0e29170b23f2a588)

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 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