[libreoffice] 108/152: kill packagekit var as did upstream and trigger on gio instead (as does upstream)

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit c8b0023bd774594e0a84c38aa4572cd6e864a2a3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Aug 31 18:40:55 2016 +0200

    kill packagekit var as did upstream and trigger on gio instead (as does upstream)
---
 changelog | 4 ++--
 rules     | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/changelog b/changelog
index ef07bbc..4ae44b2 100644
--- a/changelog
+++ b/changelog
@@ -5,10 +5,10 @@ libreoffice (1:5.2.1~rc2-0ubuntu1~yakkety6) yakkety; urgency=medium
   * make libreoffice-gnome depend on -gtk3 by default
   * update gtk3 toolbar theming patch and re-enable it (LP: #1580537)
   * update gdrive auth details
-  * fix and reenable packagekit
+  * kill packagekit var as did upstream and trigger on gio instead (as does upstream)
   * update C/R for liblosessioninstallerlo.so move
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 31 Aug 2016 12:06:55 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Thu, 01 Sep 2016 00:07:07 +0200
 
 libreoffice (1:5.2.0-0ubuntu2) yakkety; urgency=medium
 
diff --git a/rules b/rules
index 3f183c5..ec05853 100755
--- a/rules
+++ b/rules
@@ -249,7 +249,6 @@ ifeq "$(USE_DBUS)" "y"
     ENABLE_BLUETOOTH=y
     SYSTEM_STUFF += bluez
   endif
-    ENABLE_PACKAGEKIT=n
 endif
 ENABLE_AVAHI=n
 USE_GSTREAMER=y
@@ -728,7 +727,6 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   IMAGES+=human
   CONFIGURE_FLAGS_INDEP+= --with-theme="$(IMAGES)"
   ENABLE_FIREBIRD=n
-  ENABLE_PACKAGEKIT=y
   # lp#1034560: MIR troubles make it easier to use internal jfreereport
   SYSTEM_STUFF := $(filter-out jfreereport npapi-headers, $(SYSTEM_STUFF))
   ifeq ($(shell echo "$(DEB_VERSION)" | grep -c ppa),1)
@@ -1506,9 +1504,6 @@ ifeq "$(USE_DBUS)" "y"
   else
 	CONFIGURE_FLAGS += --disable-sdremote-bluetooth
   endif
-  ifeq "$(ENABLE_PACKAGEKIT)" "y"
-	CONFIGURE_FLAGS += --enable-packagekit
-  endif
 endif
 
 ifeq "$(ENABLE_AVAHI)" "y"
@@ -2473,9 +2468,7 @@ ifeq "$(BUILD_GTK)" "y"
   ifeq "$(ENABLE_GIO)" "y"
 	mv $(PKGDIR)-gtk2/$(OODIR)/program/libucpgio1lo.so \
 		$(PKGDIR)-gnome/$(OODIR)/program/
-  endif
-  ifeq "$(ENABLE_PACKAGEKIT)" "y"
-	mv $(PKGDIR)-gtk/$(OODIR)/program/liblosessioninstalllo.so \
+	mv $(PKGDIR)-gtk2/$(OODIR)/program/liblosessioninstalllo.so \
 		$(PKGDIR)-gnome/$(OODIR)/program/
   endif
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git