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 <[email protected]>

1 files changed, 17 insertions, 17 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 <[email protected]>  Mon, 27 Apr 2015 21:03:37 +0200
++ -- Slávek Banko <[email protected]>  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