From 1d6404e009abc76b9aa15444b36f4e2a19c1434b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 16 Sep 2015 20:58:32 +0200 Subject: [PATCH] Update LibreOffice packaging patches: + add 5.0.1 - Debian 8.x - Jessie-backports (updated from 4.4.5) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../jessie-backports/debian.diff | 108 ++++++++++++------ 1 file changed, 75 insertions(+), 33 deletions(-) rename libreoffice/{4.4.5 => 5.0.1}/jessie-backports/debian.diff (79%) diff --git a/libreoffice/4.4.5/jessie-backports/debian.diff b/libreoffice/5.0.1/jessie-backports/debian.diff similarity index 79% rename from libreoffice/4.4.5/jessie-backports/debian.diff rename to libreoffice/5.0.1/jessie-backports/debian.diff index 09f51d7..9ebfd49 100644 --- a/libreoffice/4.4.5/jessie-backports/debian.diff +++ b/libreoffice/5.0.1/jessie-backports/debian.diff @@ -1,20 +1,21 @@ diff -ruN a/debian/changelog b/debian/changelog ---- a/debian/changelog 2015-08-07 17:09:24.000000000 +0000 -+++ b/debian/changelog 2015-08-09 00:14:32.580000000 +0000 -@@ -1,3 +1,9 @@ -+libreoffice (1:4.4.5-2+tde0~bpo8+2) jessie-backports; urgency=medium +--- a/debian/changelog 2015-09-11 10:37:43.000000000 +0000 ++++ b/debian/changelog 2015-09-15 17:21:28.096000000 +0000 +@@ -1,3 +1,10 @@ ++libreoffice (1:5.0.1-1+tde1~bpo8+2) jessie-backports; urgency=medium + + * Enable TDE module ++ * Enable crystal icons + -+ -- Slávek Banko Sun, 09 Aug 2015 00:14:24 +0200 ++ -- Slávek Banko Tue, 15 Sep 2015 19:21:35 +0200 + - libreoffice (1:4.4.5-2~bpo8+2) jessie-backports; urgency=medium + libreoffice (1:5.0.1-1~bpo8+2) jessie-backports; urgency=medium - * debian/rules: + * rebuild with all l10n... diff -ruN a/debian/control b/debian/control ---- a/debian/control 2015-08-07 17:12:32.000000000 +0000 -+++ b/debian/control 2015-08-09 00:13:24.988000000 +0000 -@@ -129,6 +129,8 @@ +--- a/debian/control 2015-09-11 10:40:07.000000000 +0000 ++++ b/debian/control 2015-09-15 17:16:30.492000000 +0000 +@@ -127,6 +127,8 @@ pkg-config, python3, python3-dev (>= 3.3), @@ -23,7 +24,7 @@ diff -ruN a/debian/control b/debian/control ucpp, unixodbc-dev (>= 2.2.11), unzip, -@@ -247,6 +249,7 @@ +@@ -245,6 +247,7 @@ * libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support, QuickStarter for GNOMEs notification are * libreoffice-gnome: GIO, GConf backend @@ -31,7 +32,7 @@ diff -ruN a/debian/control b/debian/control * libreoffice-kde: KDE UI Plugin and KDE File Picker support * unixodbc: ODBC database support * cups-bsd: Allows LibreOffice to detect your CUPS printer queues -@@ -360,6 +363,7 @@ +@@ -358,6 +361,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), @@ -39,7 +40,27 @@ diff -ruN a/debian/control b/debian/control libreoffice-writer (<< ${binary:Version}), mozilla-libreoffice (<< 1:3.5.0~beta~), mozilla-plugin-vlc (<< 1.0), -@@ -4274,6 +4278,28 @@ +@@ -587,6 +591,19 @@ + . + This package contains the database component for LibreOffice. + ++Package: libreoffice-style-crystal ++Architecture: all ++Enhances: libreoffice-core ++Depends: ${misc:Depends} ++Suggests: crystalcursors, kde-icons-crystal ++Provides: libreoffice-style ++Replaces: libreoffice-common (<< 1:3.3.0~rc4-2) ++Description: office productivity suite -- Crystal symbol style ++ LibreOffice is a full-featured office productivity suite that provides ++ a near drop-in replacement for Microsoft(R) Office. ++ . ++ This package contains the "crystal" symbol style, default style for TDE. ++ + Package: libreoffice-style-oxygen + Architecture: all + Enhances: libreoffice-core +@@ -4287,6 +4304,28 @@ * konqueror / kmail * libreoffice-kab: KDE Addressbook support @@ -68,7 +89,7 @@ diff -ruN a/debian/control b/debian/control 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 -@@ -4324,6 +4350,21 @@ +@@ -4337,6 +4376,21 @@ This package allows LibreOffice to access Evolution address books. You need to install evolution separately. @@ -91,8 +112,8 @@ diff -ruN a/debian/control b/debian/control Section: libs Priority: extra diff -ruN a/debian/control.in b/debian/control.in ---- a/debian/control.in 2015-07-24 15:41:35.000000000 +0000 -+++ b/debian/control.in 2015-08-09 00:13:24.992000000 +0000 +--- a/debian/control.in 2015-08-28 08:59:14.000000000 +0000 ++++ b/debian/control.in 2015-09-15 17:17:38.232000000 +0000 @@ -196,6 +196,7 @@ libreoffice-impress (<< ${binary:Version}), libreoffice-kab (<< 1:3.4.1~), @@ -101,9 +122,26 @@ diff -ruN a/debian/control.in b/debian/control.in libreoffice-officebean (<< ${binary:Version}), libreoffice-presentation-minimizer (<< 1:4.2~), libreoffice-sdbc-postgresql (<< 0.8.1~), +diff -ruN a/debian/control.style-crystal.in b/debian/control.style-crystal.in +--- a/debian/control.style-crystal.in 1970-01-01 00:00:00.000000000 +0000 ++++ b/debian/control.style-crystal.in 2015-09-15 17:19:36.556000000 +0000 +@@ -0,0 +1,13 @@ ++Package: libreofficeVER-style-crystal ++Architecture: all ++Enhances: libreofficeVER-core ++Depends: ${misc:Depends} ++Suggests: crystalcursors, kde-icons-crystal ++Provides: libreofficeVER-style ++Replaces: libreofficeVER-common (<< 1:3.3.0~rc4-2) ++Description: office productivity suite -- Crystal symbol style ++ LibreOffice is a full-featured office productivity suite that provides ++ a near drop-in replacement for Microsoft(R) Office. ++ . ++ This package contains the "crystal" symbol style, default style for TDE. ++ 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-08-09 00:13:24.992000000 +0000 ++++ b/debian/control.tdeab.in 2015-09-15 17:16:30.496000000 +0000 @@ -0,0 +1,15 @@ +Package: libreofficeVER-tdeab-trinity +Architecture: %OOO_BASE_ARCHS% @@ -122,7 +160,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-08-09 00:13:24.992000000 +0000 ++++ b/debian/control.trinity.in 2015-09-15 17:16:30.496000000 +0000 @@ -0,0 +1,23 @@ +Package: libreofficeVER-trinity +Architecture: %OOO_ARCHS% @@ -148,11 +186,11 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in + * libreoffice-tdeab-trinity: TDE Addressbook support + diff -ruN a/debian/rules b/debian/rules ---- a/debian/rules 2015-08-07 17:09:02.000000000 +0000 -+++ b/debian/rules 2015-08-09 00:13:24.992000000 +0000 -@@ -197,6 +197,13 @@ - QT_MINVER= (>= 4:4.5) - endif +--- a/debian/rules 2015-08-30 07:47:57.000000000 +0000 ++++ b/debian/rules 2015-09-15 17:20:21.872000000 +0000 +@@ -199,6 +199,13 @@ + # < 4.8 fails with gcc 4.7, see #667911 + QT_MINVER= (>= 4:4.8) KDELIBS_MINVER= (>= 4:4.3.4) +BUILD_TDE=y +ifeq "$(BUILD_TDE)" "y" @@ -164,7 +202,7 @@ diff -ruN a/debian/rules b/debian/rules BUILD_DBG_PACKAGE=y ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) BUILD_TEST_PACKAGE=y -@@ -561,6 +568,7 @@ +@@ -613,6 +620,7 @@ ENABLE_MYSQLNATIVE=n ENABLE_EVO2=n ENABLE_KDEAB=n @@ -172,14 +210,16 @@ diff -ruN a/debian/rules b/debian/rules ENABLE_REPORTDESIGN=n DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab -@@ -1191,6 +1199,22 @@ +@@ -1251,6 +1259,24 @@ endif endif +ifeq "$(BUILD_TDE)" "n" + CONFIGURE_FLAGS+= --disable-tde +else ++ IMAGES+= crystal + CONFIGURE_FLAGS+= --enable-tde ++ CONFIGURE_FLAGS+= --with-theme="$(IMAGES)" + TDE_ICONSET_DEP=libreoffice$(VER)-style-crystal + BUILD_DEPS += , tdelibs14-trinity-dev + @@ -195,19 +235,21 @@ diff -ruN a/debian/rules b/debian/rules ifeq "$(ENABLE_MYSQLNATIVE)" "y" CONFIGURE_FLAGS += --enable-ext-mariadb-connector ifneq "$(USE_MARIADB)" "y" -@@ -1677,6 +1701,11 @@ +@@ -1744,6 +1770,13 @@ 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 ++ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \ ++ >> debian/control < debian/control.style-crystal.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 -@@ -1689,6 +1718,10 @@ +@@ -1756,6 +1789,10 @@ ifeq "$(ENABLE_KDEAB)" "y" cat debian/control.kab.in >> debian/control endif @@ -218,7 +260,7 @@ diff -ruN a/debian/rules b/debian/rules ifeq "$(BUILD_TEST_PACKAGE)" "y" ifneq "$(OOO_JAVA_ARCHS)" "" cat debian/control.subsequentcheckbase.in >> debian/control -@@ -1768,6 +1801,9 @@ +@@ -1835,6 +1872,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 @@ -228,7 +270,7 @@ diff -ruN a/debian/rules b/debian/rules ifeq "$(USE_DBUS)" "y" perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control/' debian/control -@@ -2441,6 +2477,45 @@ +@@ -2553,6 +2593,45 @@ | sed -e "s/@TYPE@/drawing/" \ > $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop endif @@ -274,7 +316,7 @@ diff -ruN a/debian/rules b/debian/rules # split out gtk stuff rm -rf $(PKGDIR)-gtk -@@ -3021,6 +3096,12 @@ +@@ -3122,6 +3201,12 @@ # register technical.dic perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd @@ -287,7 +329,7 @@ diff -ruN a/debian/rules b/debian/rules #ifeq "$(PACKAGE_SDK)" "y" # # install gengal stuff into -dev # mkdir -p $(PKGDIR)-dev/$(OODIR)/program -@@ -3205,6 +3286,7 @@ +@@ -3317,6 +3402,7 @@ -V'Binary-Version=$(BINARY_VERSION)' \ -V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \ -V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \ @@ -296,8 +338,8 @@ diff -ruN a/debian/rules b/debian/rules -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-07-24 15:41:35.000000000 +0000 -+++ b/debian/scripts/gid2pkgdirs.sh 2015-08-09 00:13:24.992000000 +0000 +--- a/debian/scripts/gid2pkgdirs.sh 2015-08-08 13:48:52.000000000 +0000 ++++ b/debian/scripts/gid2pkgdirs.sh 2015-09-15 17:16:30.496000000 +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