diff options
| -rw-r--r-- | libreoffice/4.4.5/jessie-bacports/debian.diff (renamed from libreoffice/4.4.2/jessie-backports/debian.diff) | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/libreoffice/4.4.2/jessie-backports/debian.diff b/libreoffice/4.4.5/jessie-bacports/debian.diff index 08dd2bd..09f51d7 100644 --- a/libreoffice/4.4.2/jessie-backports/debian.diff +++ b/libreoffice/4.4.5/jessie-bacports/debian.diff @@ -1,20 +1,20 @@ diff -ruN a/debian/changelog b/debian/changelog ---- a/debian/changelog 2015-05-01 16:04:58.000000000 +0000 -+++ b/debian/changelog 2015-05-13 13:01:03.576000000 +0000 +--- 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.2-1+tde1~bpo8+1) jessie-backports; urgency=medium ++libreoffice (1:4.4.5-2+tde0~bpo8+2) jessie-backports; urgency=medium + + * Enable TDE module + -+ -- Slávek Banko <slavek.banko@axis.cz> Tue, 12 May 2015 19:08:29 +0200 ++ -- Slávek Banko <slavek.banko@axis.cz> Sun, 09 Aug 2015 00:14:24 +0200 + - libreoffice (1:4.4.2-1~bpo8+1) jessie-backports; urgency=medium + libreoffice (1:4.4.5-2~bpo8+2) jessie-backports; urgency=medium - * Rebuild for jessie-backports. + * debian/rules: diff -ruN a/debian/control b/debian/control ---- a/debian/control 2015-05-04 00:03:52.000000000 +0000 -+++ b/debian/control 2015-05-13 13:00:17.656000000 +0000 -@@ -131,6 +131,8 @@ +--- 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 @@ pkg-config, python3, python3-dev (>= 3.3), @@ -23,7 +23,7 @@ diff -ruN a/debian/control b/debian/control ucpp, unixodbc-dev (>= 2.2.11), unzip, -@@ -250,6 +252,7 @@ +@@ -247,6 +249,7 @@ * libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support, QuickStarter for GNOMEs notification are * libreoffice-gnome: GIO, GConf backend @@ -31,7 +31,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 -@@ -363,6 +366,7 @@ +@@ -360,6 +363,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 +39,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), -@@ -4292,6 +4296,28 @@ +@@ -4274,6 +4278,28 @@ * konqueror / kmail * libreoffice-kab: KDE Addressbook support @@ -68,7 +68,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 -@@ -4342,6 +4368,21 @@ +@@ -4324,6 +4350,21 @@ This package allows LibreOffice to access Evolution address books. You need to install evolution separately. @@ -91,8 +91,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-04-07 17:56:48.000000000 +0000 -+++ b/debian/control.in 2015-05-13 13:00:17.656000000 +0000 +--- a/debian/control.in 2015-07-24 15:41:35.000000000 +0000 ++++ b/debian/control.in 2015-08-09 00:13:24.992000000 +0000 @@ -196,6 +196,7 @@ libreoffice-impress (<< ${binary:Version}), libreoffice-kab (<< 1:3.4.1~), @@ -103,7 +103,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-05-13 13:00:17.656000000 +0000 ++++ b/debian/control.tdeab.in 2015-08-09 00:13:24.992000000 +0000 @@ -0,0 +1,15 @@ +Package: libreofficeVER-tdeab-trinity +Architecture: %OOO_BASE_ARCHS% @@ -122,7 +122,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-05-13 13:00:17.656000000 +0000 ++++ b/debian/control.trinity.in 2015-08-09 00:13:24.992000000 +0000 @@ -0,0 +1,23 @@ +Package: libreofficeVER-trinity +Architecture: %OOO_ARCHS% @@ -148,8 +148,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-04-12 10:25:41.000000000 +0000 -+++ b/debian/rules 2015-05-13 13:00:17.656000000 +0000 +--- 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 @@ -164,7 +164,7 @@ diff -ruN a/debian/rules b/debian/rules BUILD_DBG_PACKAGE=y ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) BUILD_TEST_PACKAGE=y -@@ -558,6 +565,7 @@ +@@ -561,6 +568,7 @@ ENABLE_MYSQLNATIVE=n ENABLE_EVO2=n ENABLE_KDEAB=n @@ -172,13 +172,12 @@ 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 -@@ -1183,6 +1191,23 @@ +@@ -1191,6 +1199,22 @@ endif endif +ifeq "$(BUILD_TDE)" "n" + CONFIGURE_FLAGS+= --disable-tde -+ CONFIGURE_FLAGS+= --with-images="$(IMAGES)" +else + CONFIGURE_FLAGS+= --enable-tde + TDE_ICONSET_DEP=libreoffice$(VER)-style-crystal @@ -196,7 +195,7 @@ diff -ruN a/debian/rules b/debian/rules ifeq "$(ENABLE_MYSQLNATIVE)" "y" CONFIGURE_FLAGS += --enable-ext-mariadb-connector ifneq "$(USE_MARIADB)" "y" -@@ -1671,6 +1696,11 @@ +@@ -1677,6 +1701,11 @@ ifeq "$(BUILD_KDE)" "y" cat debian/control.kde.in >> debian/control endif @@ -208,7 +207,7 @@ diff -ruN a/debian/rules b/debian/rules ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y" cat debian/control.postgresql.in >> debian/control endif -@@ -1683,6 +1713,10 @@ +@@ -1689,6 +1718,10 @@ ifeq "$(ENABLE_KDEAB)" "y" cat debian/control.kab.in >> debian/control endif @@ -219,7 +218,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 -@@ -1762,6 +1796,9 @@ +@@ -1768,6 +1801,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 @@ -229,7 +228,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 -@@ -2433,6 +2470,45 @@ +@@ -2441,6 +2477,45 @@ | sed -e "s/@TYPE@/drawing/" \ > $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop endif @@ -275,7 +274,7 @@ diff -ruN a/debian/rules b/debian/rules # split out gtk stuff rm -rf $(PKGDIR)-gtk -@@ -3028,6 +3104,12 @@ +@@ -3021,6 +3096,12 @@ # register technical.dic perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd @@ -288,7 +287,7 @@ diff -ruN a/debian/rules b/debian/rules #ifeq "$(PACKAGE_SDK)" "y" # # install gengal stuff into -dev # mkdir -p $(PKGDIR)-dev/$(OODIR)/program -@@ -3212,6 +3294,7 @@ +@@ -3205,6 +3286,7 @@ -V'Binary-Version=$(BINARY_VERSION)' \ -V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \ -V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \ @@ -297,8 +296,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-04-02 21:01:25.000000000 +0000 -+++ b/debian/scripts/gid2pkgdirs.sh 2015-05-13 13:02:34.128000000 +0000 +--- 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 @@ -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 |