diff options
Diffstat (limited to 'libreoffice/4.0.3/patches/libreoffice-debian.diff')
| -rw-r--r-- | libreoffice/4.0.3/patches/libreoffice-debian.diff | 105 |
1 files changed, 53 insertions, 52 deletions
diff --git a/libreoffice/4.0.3/patches/libreoffice-debian.diff b/libreoffice/4.0.3/patches/libreoffice-debian.diff index 94e701e..1d4ce3b 100644 --- a/libreoffice/4.0.3/patches/libreoffice-debian.diff +++ b/libreoffice/4.0.3/patches/libreoffice-debian.diff @@ -1,29 +1,30 @@ -diff -urN debian/changelog debian/changelog ---- debian/changelog 2013-05-11 11:11:54.000000000 +0000 -+++ debian/changelog 2013-06-04 19:07:09.618754652 +0000 +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 @@ -1,3 +1,9 @@ -+libreoffice (1:4.0.3-2) wheezy; urgency=low ++libreoffice (1:4.0.3-7) wheezy; urgency=low + + * Enable TDE module + + -- Timothy Pearson <[email protected]> Tue, 04 Jun 2013 14:07:00 -0600 + - libreoffice (1:4.0.3-2~bpo70+1) wheezy-backports; urgency=low + libreoffice (1:4.0.3-3) unstable; urgency=low - * Rebuild for wheezy-backports. -diff -urN debian/control debian/control ---- debian/control 2013-05-11 11:10:29.000000000 +0000 -+++ debian/control 2013-06-04 18:59:03.581453968 +0000 -@@ -24,7 +24,7 @@ + * 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 +@@ -24,7 +24,8 @@ gperf, javahelper (>= 0.37~), junit4 (>= 4.8.2-2), - kdelibs5-dev (>= 4:4.3.4), + tdelibs4-trinity-dev, ++ tdepim-trinity-dev, libarchive-zip-perl, libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386], - libboost-date-time-dev (>= 1.38), -@@ -184,7 +184,7 @@ + libboost-date-time1.53-dev, +@@ -191,7 +192,7 @@ iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, imagemagick | graphicsmagick-imagemagick-compat, libgl1, @@ -32,7 +33,7 @@ diff -urN debian/control debian/control libreoffice-grammarcheck, libreoffice-help-${help-l10n-virtual-version}, libreoffice-l10n-${help-l10n-virtual-version}, -@@ -223,6 +223,7 @@ +@@ -230,6 +231,7 @@ QuickStarter for GNOMEs notification are * libreoffice-gnome: GIO, GConf backend * libreoffice-kde: KDE UI Plugin and KDE File Picker support @@ -40,7 +41,7 @@ diff -urN debian/control debian/control * unixodbc: ODBC database support * cups-bsd: Allows LibreOffice to detect your CUPS printer queues automatically -@@ -325,6 +326,7 @@ +@@ -332,6 +334,7 @@ libreoffice-impress (<< ${binary:Version}), libreoffice-kab (<< 1:3.4.1~), libreoffice-kde (<< ${binary:Version}), @@ -48,7 +49,7 @@ diff -urN debian/control debian/control libreoffice-officebean (<< ${binary:Version}), libreoffice-sdbc-postgresql (<< 0.8.1~), libreoffice-style-andromeda (<< 1:3.3.0-1), -@@ -4240,7 +4242,7 @@ +@@ -4247,7 +4250,7 @@ Section: debug Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc Priority: extra @@ -57,7 +58,7 @@ diff -urN debian/control debian/control ${misc:Depends} Recommends: ure-dbg Suggests: ${dbg-dbg-suggests} -@@ -4352,6 +4354,25 @@ +@@ -4359,6 +4362,25 @@ * konqueror / kmail * libreoffice-kab: KDE Addressbook support @@ -83,9 +84,9 @@ diff -urN debian/control debian/control 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 debian/control.in debian/control.in ---- debian/control.in 2013-05-10 20:05:04.000000000 +0000 -+++ debian/control.in 2013-06-04 18:59:36.691951126 +0000 +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 @@ -204,6 +204,7 @@ libreoffice-gtk (<< ${binary:Version}), libreoffice-impress (<< ${binary:Version}), @@ -94,9 +95,9 @@ diff -urN debian/control.in debian/control.in libreoffice-officebean (<< ${binary:Version}), libreoffice-writer (<< ${binary:Version}), mozilla-libreoffice (<< 1:3.5.0~beta~), -diff -urN debian/control.tdeab.in debian/control.tdeab.in ---- debian/control.tdeab.in 1970-01-01 00:00:00.000000000 +0000 -+++ debian/control.tdeab.in 2013-06-04 18:58:33.340999923 +0000 +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 @@ -0,0 +1,14 @@ +Package: libreofficeVER-tdeab-trinity +Architecture: %OOO_BASE_ARCHS% @@ -113,9 +114,9 @@ diff -urN debian/control.tdeab.in debian/control.tdeab.in + This package allows LibreOffice to access the TDE Addressbook. + You need to install kaddressbook-trinity separately. \ No newline at end of file -diff -urN debian/control.trinity.in debian/control.trinity.in ---- debian/control.trinity.in 1970-01-01 00:00:00.000000000 +0000 -+++ debian/control.trinity.in 2013-06-04 18:58:33.340999923 +0000 +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 @@ -0,0 +1,23 @@ +Package: libreofficeVER-trinity +Architecture: %OOO_ARCHS% @@ -140,9 +141,9 @@ diff -urN debian/control.trinity.in debian/control.trinity.in + * konqueror / kmail + * libreoffice-tdeab-trinity: TDE Addressbook support + -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 1970-01-01 00:00:00.000000000 +0000 -+++ debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff 2013-06-04 18:58:33.340999923 +0000 +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 @@ -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 @@ -194,9 +195,9 @@ diff -urN debian/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.d + ); + End + #endif -diff -urN debian/patches/series debian/patches/series ---- debian/patches/series 2013-05-04 12:38:06.000000000 +0000 -+++ debian/patches/series 2013-06-04 19:00:08.672431349 +0000 +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 @@ -18,6 +18,7 @@ make-pyuno-work-with-system-wide-module-install.diff #search-usr-share-for-images.diff @@ -205,14 +206,14 @@ diff -urN debian/patches/series debian/patches/series mediwiki-oor-replace.diff debian-hardened-buildflags-CPPFLAGS.diff gtk3-hack-explicit-gmodule.diff -@@ -30,3 +31,4 @@ - wheezy-backports-python.diff +@@ -31,3 +32,4 @@ fix-internal-hsqldb-build.diff boost-1.53.diff + uno-executables-link-to-xmlreader.diff +tde-update-r14.diff -diff -urN debian/patches/tde-update-r14.diff debian/patches/tde-update-r14.diff ---- debian/patches/tde-update-r14.diff 1970-01-01 00:00:00.000000000 +0000 -+++ debian/patches/tde-update-r14.diff 2013-06-04 18:58:33.441001423 +0000 +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 @@ -0,0 +1,440 @@ +diff --git a/configure.ac b/configure.ac +index 401352a..0ea3acf 100644 @@ -654,10 +655,10 @@ diff -urN debian/patches/tde-update-r14.diff debian/patches/tde-update-r14.diff + $(eval $(call gb_Library_set_include,tdeab1,\ + -I$(SRCDIR)/connectivity/source/inc \ + $$(INCLUDE) \ -diff -urN debian/rules debian/rules ---- debian/rules 2013-05-11 11:09:56.000000000 +0000 -+++ debian/rules 2013-06-04 18:58:33.451001574 +0000 -@@ -197,7 +197,8 @@ +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 +@@ -199,7 +199,8 @@ BUILD_CAIROCANVAS=y SYSTEM_STUFF += cairo CAIRO_FONTS_PATCH=y @@ -667,7 +668,7 @@ diff -urN debian/rules debian/rules # not ported to KDE 4 ENABLE_KDEAB=n ifeq "$(SYSTEM_GCC_VERSION)" "4.7" -@@ -207,6 +208,12 @@ +@@ -209,6 +210,12 @@ QT_MINVER= (>= 4:4.5) endif KDELIBS_MINVER= (>= 4:4.3.4) @@ -680,7 +681,7 @@ diff -urN debian/rules debian/rules BUILD_DBG_PACKAGE=y ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) BUILD_TEST_PACKAGE=y -@@ -462,6 +469,7 @@ +@@ -464,6 +471,7 @@ ENABLE_MYSQLNATIVE=n ENABLE_EVO2=n ENABLE_KDEAB=n @@ -688,7 +689,7 @@ diff -urN debian/rules debian/rules ENABLE_REPORTDESIGN=n DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab -@@ -1068,6 +1076,25 @@ +@@ -1078,6 +1086,25 @@ endif endif @@ -714,7 +715,7 @@ diff -urN debian/rules debian/rules ifeq "$(ENABLE_MYSQLNATIVE)" "y" CONFIGURE_FLAGS += --enable-ext-mysql-connector ifneq (,$(filter mysql, $(SYSTEM_STUFF))) -@@ -1499,6 +1526,11 @@ +@@ -1515,6 +1542,11 @@ ifeq "$(BUILD_KDE)" "y" cat debian/control.kde.in >> debian/control endif @@ -726,7 +727,7 @@ diff -urN debian/rules debian/rules ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y" cat debian/control.postgresql.in >> debian/control endif -@@ -1519,6 +1551,10 @@ +@@ -1535,6 +1567,10 @@ ifeq "$(PACKAGE_LIBRELOGO)" "y" cat debian/control.librelogo.in >> debian/control endif @@ -737,7 +738,7 @@ diff -urN debian/rules debian/rules perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control -@@ -1596,6 +1632,9 @@ +@@ -1612,6 +1648,9 @@ perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control/' debian/control perl -pi -e 's/Description: office productivity suite -- presentation/Suggests: bluez\nDescription: office productivity suite -- presentation/' debian/control endif @@ -747,7 +748,7 @@ diff -urN debian/rules debian/rules ifneq "$(DICT_DIR)" "/usr/share/hunspell" perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control -@@ -2179,6 +2218,45 @@ +@@ -2195,6 +2234,45 @@ > $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop endif @@ -793,7 +794,7 @@ diff -urN debian/rules debian/rules # split out gtk stuff rm -rf $(PKGDIR)-gtk mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/program -@@ -2453,6 +2531,12 @@ +@@ -2469,6 +2547,12 @@ rm -f $(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/registration/LICENSE endif @@ -806,7 +807,7 @@ diff -urN debian/rules debian/rules #ifeq "$(PACKAGE_SDK)" "y" # # install gengal stuff into -dev # mkdir -p $(PKGDIR)-dev/$(OODIR)/program -@@ -3021,6 +3105,7 @@ +@@ -3037,6 +3121,7 @@ -V'Binary-Version=$(BINARY_VERSION)' \ -V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \ -V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \ @@ -814,9 +815,9 @@ diff -urN debian/rules debian/rules -V'lpsolve-dep=$(LPSOLVE_DEP)' \ -V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \ -V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \ -diff -urN debian/scripts/gid2pkgdirs.sh debian/scripts/gid2pkgdirs.sh ---- debian/scripts/gid2pkgdirs.sh 2013-05-04 12:37:17.000000000 +0000 -+++ debian/scripts/gid2pkgdirs.sh 2013-06-04 18:58:33.451001574 +0000 +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 @@ -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 |