Fix LO 4.0.3 patch

1 files changed, 31 insertions, 31 deletions

diff --git a/libreoffice/4.0.3/patches/libreoffice-debian.diff b/libreoffice/4.0.3/patches/libreoffice-debian.diff
index 1d4ce3b..7d76d35 100644
--- a/libreoffice/4.0.3/patches/libreoffice-debian.diff
+++ b/libreoffice/4.0.3/patches/libreoffice-debian.diff
@@ -1,6 +1,6 @@
-diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/changelog TEMP/libreoffice-4.0.3/debian/changelog
---- TEMP.ORIG/libreoffice-4.0.3/debian/changelog	2013-05-20 16:20:30.000000000 +0000
-+++ TEMP/libreoffice-4.0.3/debian/changelog	2013-06-07 01:12:09.610423181 +0000
+diff -urN debian/changelog debian/changelog
+--- debian/changelog
++++ debian/changelog
 @@ -1,3 +1,9 @@
 +libreoffice (1:4.0.3-7) wheezy; urgency=low
 +
@@ -11,9 +11,9 @@ diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/changelog TEMP/libreoffice-4.0.3/de
  libreoffice (1:4.0.3-3) unstable; urgency=low
  
    * debian/patches/uno-executables-link-to-xmlreader.diff: fix
-diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/control TEMP/libreoffice-4.0.3/debian/control
---- TEMP.ORIG/libreoffice-4.0.3/debian/control	2013-05-20 21:36:44.000000000 +0000
-+++ TEMP/libreoffice-4.0.3/debian/control	2013-06-07 04:49:06.683006413 +0000
+diff -urN debian/control debian/control
+--- debian/control
++++ debian/control
 @@ -24,7 +24,8 @@
                 gperf,
                 javahelper (>= 0.37~),
@@ -84,9 +84,9 @@ diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/control TEMP/libreoffice-4.0.3/debi
  Package: libreoffice-sdbc-postgresql
  Section: misc
  Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
-diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/control.in TEMP/libreoffice-4.0.3/debian/control.in
---- TEMP.ORIG/libreoffice-4.0.3/debian/control.in	2013-05-12 20:37:48.000000000 +0000
-+++ TEMP/libreoffice-4.0.3/debian/control.in	2013-06-07 01:11:34.659951997 +0000
+diff -urN debian/control.in debian/control.in
+--- debian/control.in
++++ debian/control.in
 @@ -204,6 +204,7 @@
          libreoffice-gtk (<< ${binary:Version}),
          libreoffice-impress (<< ${binary:Version}),
@@ -95,9 +95,9 @@ diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/control.in TEMP/libreoffice-4.0.3/d
          libreoffice-officebean (<< ${binary:Version}),
          libreoffice-writer (<< ${binary:Version}),
          mozilla-libreoffice (<< 1:3.5.0~beta~),
-diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/control.tdeab.in TEMP/libreoffice-4.0.3/debian/control.tdeab.in
---- TEMP.ORIG/libreoffice-4.0.3/debian/control.tdeab.in	1970-01-01 00:00:00.000000000 +0000
-+++ TEMP/libreoffice-4.0.3/debian/control.tdeab.in	2013-06-07 01:11:34.709952670 +0000
+diff -urN debian/control.tdeab.in debian/control.tdeab.in
+--- debian/control.tdeab.in
++++ debian/control.tdeab.in
 @@ -0,0 +1,14 @@
 +Package: libreofficeVER-tdeab-trinity
 +Architecture: %OOO_BASE_ARCHS%
@@ -114,9 +114,9 @@ diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/control.tdeab.in TEMP/libreoffice-4
 + This package allows LibreOffice to access the TDE Addressbook.
 + You need to install kaddressbook-trinity separately.
 \ No newline at end of file
-diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/control.trinity.in TEMP/libreoffice-4.0.3/debian/control.trinity.in
---- TEMP.ORIG/libreoffice-4.0.3/debian/control.trinity.in	1970-01-01 00:00:00.000000000 +0000
-+++ TEMP/libreoffice-4.0.3/debian/control.trinity.in	2013-06-07 01:11:34.709952670 +0000
+diff -urN debian/control.trinity.in debian/control.trinity.in
+--- debian/control.trinity.in
++++ debian/control.trinity.in
 @@ -0,0 +1,23 @@
 +Package: libreofficeVER-trinity
 +Architecture: %OOO_ARCHS%
@@ -141,9 +141,9 @@ diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/control.trinity.in TEMP/libreoffice
 +  * konqueror / kmail
 +  * libreoffice-tdeab-trinity: TDE Addressbook support
 +
-diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff TEMP/libreoffice-4.0.3/debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff
---- TEMP.ORIG/libreoffice-4.0.3/debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff	1970-01-01 00:00:00.000000000 +0000
-+++ TEMP/libreoffice-4.0.3/debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff	2013-06-07 01:11:34.709952670 +0000
+diff -urN debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff
+--- debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff
++++ debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff
 @@ -0,0 +1,50 @@
 +diff -ur a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
 +--- a/scp2/source/ooo/module_hidden_ooo.scp
@@ -195,9 +195,9 @@ diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/patches/libreoffice_ubuntu-tde-make
 +     );
 + End
 + #endif
-diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/patches/series TEMP/libreoffice-4.0.3/debian/patches/series
---- TEMP.ORIG/libreoffice-4.0.3/debian/patches/series	2013-05-18 12:27:31.000000000 +0000
-+++ TEMP/libreoffice-4.0.3/debian/patches/series	2013-06-07 01:12:29.150686798 +0000
+diff -urN debian/patches/series debian/patches/series
+--- debian/patches/series
++++ debian/patches/series
 @@ -18,6 +18,7 @@
  make-pyuno-work-with-system-wide-module-install.diff
  #search-usr-share-for-images.diff
@@ -211,9 +211,9 @@ diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/patches/series TEMP/libreoffice-4.0
  boost-1.53.diff
  uno-executables-link-to-xmlreader.diff
 +tde-update-r14.diff
-diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/patches/tde-update-r14.diff TEMP/libreoffice-4.0.3/debian/patches/tde-update-r14.diff
---- TEMP.ORIG/libreoffice-4.0.3/debian/patches/tde-update-r14.diff	1970-01-01 00:00:00.000000000 +0000
-+++ TEMP/libreoffice-4.0.3/debian/patches/tde-update-r14.diff	2013-06-07 01:11:34.749953209 +0000
+diff -urN debian/patches/tde-update-r14.diff debian/patches/tde-update-r14.diff
+--- debian/patches/tde-update-r14.diff
++++ debian/patches/tde-update-r14.diff
 @@ -0,0 +1,440 @@
 +diff --git a/configure.ac b/configure.ac
 +index 401352a..0ea3acf 100644
@@ -655,9 +655,9 @@ diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/patches/tde-update-r14.diff TEMP/li
 + $(eval $(call gb_Library_set_include,tdeab1,\
 + 	-I$(SRCDIR)/connectivity/source/inc \
 + 	$$(INCLUDE) \
-diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/rules TEMP/libreoffice-4.0.3/debian/rules
---- TEMP.ORIG/libreoffice-4.0.3/debian/rules	2013-05-20 21:13:07.000000000 +0000
-+++ TEMP/libreoffice-4.0.3/debian/rules	2013-06-07 01:11:34.799953882 +0000
+diff -urN debian/rules debian/rules
+--- debian/rules
++++ debian/rules
 @@ -199,7 +199,8 @@
  BUILD_CAIROCANVAS=y
  SYSTEM_STUFF += cairo
@@ -787,7 +787,7 @@ diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/rules TEMP/libreoffice-4.0.3/debian
 +	rm -rf $(PKGDIR)-tdeab-trinity
 +	mkdir -p -m755 $(PKGDIR)-tdeab-trinity/$(OODIR)/program
 +	for f in libtdeab*so; do \
-+	  mv $(PKGDIR)-trinity/$(OODIR)/program/$$f $(PKGDIR)-tdeab-trinity/$(OODIR)/program || exit 1 ;\
++	  mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-tdeab-trinity/$(OODIR)/program || exit 1 ;\
 +	done
 +endif
 +
@@ -815,9 +815,9 @@ diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/rules TEMP/libreoffice-4.0.3/debian
  		-V'lpsolve-dep=$(LPSOLVE_DEP)' \
  		-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
  		-V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
-diff -urN TEMP.ORIG/libreoffice-4.0.3/debian/scripts/gid2pkgdirs.sh TEMP/libreoffice-4.0.3/debian/scripts/gid2pkgdirs.sh
---- TEMP.ORIG/libreoffice-4.0.3/debian/scripts/gid2pkgdirs.sh	2013-05-04 12:37:17.000000000 +0000
-+++ TEMP/libreoffice-4.0.3/debian/scripts/gid2pkgdirs.sh	2013-06-07 01:11:34.799953882 +0000
+diff -urN debian/scripts/gid2pkgdirs.sh debian/scripts/gid2pkgdirs.sh
+--- debian/scripts/gid2pkgdirs.sh
++++ debian/scripts/gid2pkgdirs.sh
 @@ -102,6 +102,7 @@
  create_package_directory gid_Module_Optional_Extensions_Script_Provider_For_Python		pkg/libreoffice-script-provider-python
  create_package_directory gid_Module_Optional_Gnome              pkg/libreoffice-gnome