From 63686eef772e4fc275e2a33a399ed9c1b48ddabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 30 Sep 2015 18:14:17 +0200 Subject: [PATCH] Update LibreOffice packaging patches: + add 5.0.2 - Debian 8.x - Jessie-backports (updated from 5.0.1) 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 | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) rename libreoffice/{5.0.1 => 5.0.2}/jessie-backports/debian.diff (91%) diff --git a/libreoffice/5.0.1/jessie-backports/debian.diff b/libreoffice/5.0.2/jessie-backports/debian.diff similarity index 91% rename from libreoffice/5.0.1/jessie-backports/debian.diff rename to libreoffice/5.0.2/jessie-backports/debian.diff index cf157fa..bbf3c68 100644 --- a/libreoffice/5.0.1/jessie-backports/debian.diff +++ b/libreoffice/5.0.2/jessie-backports/debian.diff @@ -1,20 +1,20 @@ diff -ruN a/debian/changelog b/debian/changelog ---- a/debian/changelog 2015-09-17 19:05:38.000000000 +0000 -+++ b/debian/changelog 2015-09-20 13:48:00.592000000 +0000 +--- a/debian/changelog 2015-09-24 08:24:40.000000000 +0000 ++++ b/debian/changelog 2015-09-29 18:36:22.368000000 +0000 @@ -1,3 +1,10 @@ -+libreoffice (1:5.0.1-2+tde0~bpo8+1) jessie-backports; urgency=medium ++libreoffice (1:5.0.2-1+tde0~bpo8+1) jessie-backports; urgency=medium + + * Enable TDE module + * Enable crystal icons + + -- Slávek Banko Sun, 20 Sep 2015 15:47:59 +0200 + - libreoffice (1:5.0.1-2~bpo8+1) jessie-backports; urgency=medium + libreoffice (1:5.0.2-1~bpo8+1) jessie-backports; urgency=medium * Rebuild for jessie-backports. diff -ruN a/debian/control b/debian/control ---- a/debian/control 2015-09-18 05:35:51.000000000 +0000 -+++ b/debian/control 2015-09-20 13:46:35.616000000 +0000 +--- a/debian/control 2015-09-24 08:38:14.000000000 +0000 ++++ b/debian/control 2015-09-29 18:36:22.372000000 +0000 @@ -126,6 +126,8 @@ pkg-config, python3, @@ -24,7 +24,7 @@ diff -ruN a/debian/control b/debian/control ucpp, unixodbc-dev (>= 2.2.11), unzip, -@@ -244,6 +246,7 @@ +@@ -240,6 +242,7 @@ * libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support, QuickStarter for GNOMEs notification are * libreoffice-gnome: GIO, GConf backend @@ -32,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 -@@ -357,6 +360,7 @@ +@@ -353,6 +356,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), @@ -40,7 +40,7 @@ diff -ruN a/debian/control b/debian/control libreoffice-writer (<< ${binary:Version}), mozilla-libreoffice (<< 1:3.5.0~beta~), mozilla-plugin-vlc (<< 1.0), -@@ -586,6 +590,19 @@ +@@ -582,6 +586,19 @@ . This package contains the database component for LibreOffice. @@ -60,7 +60,7 @@ diff -ruN a/debian/control b/debian/control Package: libreoffice-style-oxygen Architecture: all Enhances: libreoffice-core -@@ -4286,6 +4303,28 @@ +@@ -4269,6 +4286,28 @@ * konqueror / kmail * libreoffice-kab: KDE Addressbook support @@ -89,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 -@@ -4336,6 +4375,21 @@ +@@ -4319,6 +4358,21 @@ This package allows LibreOffice to access Evolution address books. You need to install evolution separately. @@ -112,9 +112,9 @@ 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-09-17 10:50:37.000000000 +0000 -+++ b/debian/control.in 2015-09-20 13:46:35.616000000 +0000 -@@ -196,6 +196,7 @@ +--- a/debian/control.in 2015-09-23 13:06:17.000000000 +0000 ++++ b/debian/control.in 2015-09-29 18:36:22.372000000 +0000 +@@ -194,6 +194,7 @@ libreoffice-impress (<< ${binary:Version}), libreoffice-kab (<< 1:3.4.1~), libreoffice-kde (<< ${binary:Version}), @@ -124,7 +124,7 @@ diff -ruN a/debian/control.in b/debian/control.in 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-20 13:46:35.616000000 +0000 ++++ b/debian/control.style-crystal.in 2015-09-29 18:36:22.372000000 +0000 @@ -0,0 +1,13 @@ +Package: libreofficeVER-style-crystal +Architecture: all @@ -141,7 +141,7 @@ diff -ruN a/debian/control.style-crystal.in b/debian/control.style-crystal.in + 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-09-20 13:46:35.616000000 +0000 ++++ b/debian/control.tdeab.in 2015-09-29 18:36:22.372000000 +0000 @@ -0,0 +1,15 @@ +Package: libreofficeVER-tdeab-trinity +Architecture: %OOO_BASE_ARCHS% @@ -160,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-09-20 13:46:35.616000000 +0000 ++++ b/debian/control.trinity.in 2015-09-29 18:36:22.372000000 +0000 @@ -0,0 +1,23 @@ +Package: libreofficeVER-trinity +Architecture: %OOO_ARCHS% @@ -186,8 +186,8 @@ 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-09-17 19:05:46.000000000 +0000 -+++ b/debian/rules 2015-09-20 13:46:35.620000000 +0000 +--- a/debian/rules 2015-09-24 08:24:13.000000000 +0000 ++++ b/debian/rules 2015-09-29 18:36:22.372000000 +0000 @@ -199,6 +199,13 @@ # < 4.8 fails with gcc 4.7, see #667911 QT_MINVER= (>= 4:4.8) @@ -202,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 -@@ -613,6 +620,7 @@ +@@ -620,6 +627,7 @@ ENABLE_MYSQLNATIVE=n ENABLE_EVO2=n ENABLE_KDEAB=n @@ -210,7 +210,7 @@ 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 -@@ -1251,6 +1259,24 @@ +@@ -1252,6 +1260,24 @@ endif endif @@ -235,7 +235,7 @@ diff -ruN a/debian/rules b/debian/rules ifeq "$(ENABLE_MYSQLNATIVE)" "y" CONFIGURE_FLAGS += --enable-ext-mariadb-connector ifneq "$(USE_MARIADB)" "y" -@@ -1746,6 +1772,13 @@ +@@ -1748,6 +1774,13 @@ ifeq "$(BUILD_KDE)" "y" cat debian/control.kde.in >> debian/control endif @@ -249,7 +249,7 @@ diff -ruN a/debian/rules b/debian/rules ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y" cat debian/control.postgresql.in >> debian/control endif -@@ -1758,6 +1791,10 @@ +@@ -1760,6 +1793,10 @@ ifeq "$(ENABLE_KDEAB)" "y" cat debian/control.kab.in >> debian/control endif @@ -260,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 -@@ -1837,6 +1874,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 @@ -270,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 -@@ -2555,6 +2595,45 @@ +@@ -2557,6 +2597,45 @@ | sed -e "s/@TYPE@/drawing/" \ > $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop endif @@ -316,7 +316,7 @@ diff -ruN a/debian/rules b/debian/rules # split out gtk stuff rm -rf $(PKGDIR)-gtk -@@ -3124,6 +3203,12 @@ +@@ -3123,6 +3202,12 @@ # register technical.dic perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd @@ -329,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 -@@ -3319,6 +3404,7 @@ +@@ -3317,6 +3402,7 @@ -V'Binary-Version=$(BINARY_VERSION)' \ -V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \ -V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \ @@ -338,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-09-06 21:13:00.000000000 +0000 -+++ b/debian/scripts/gid2pkgdirs.sh 2015-09-20 13:46:35.620000000 +0000 +--- a/debian/scripts/gid2pkgdirs.sh 2015-09-15 09:35:25.000000000 +0000 ++++ b/debian/scripts/gid2pkgdirs.sh 2015-09-29 18:36:22.372000000 +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