[libreoffice] 106/152: fix and reenable packagekit

[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 d1822e20e6ca769780b3dc798b12f936a5c71707
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Aug 31 12:05:32 2016 +0200

    fix and reenable packagekit
---
 changelog | 3 ++-
 rules     | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 21a79d5..9672ab6 100644
--- a/changelog
+++ b/changelog
@@ -5,8 +5,9 @@ libreoffice (1:5.2.1~rc2-0ubuntu1~yakkety2) 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
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 30 Aug 2016 20:43:35 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 31 Aug 2016 12:03:42 +0200
 
 libreoffice (1:5.2.0-0ubuntu2) yakkety; urgency=medium
 
diff --git a/rules b/rules
index add7910..3f183c5 100755
--- a/rules
+++ b/rules
@@ -728,6 +728,7 @@ 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)
@@ -2476,8 +2477,6 @@ ifeq "$(BUILD_GTK)" "y"
   ifeq "$(ENABLE_PACKAGEKIT)" "y"
 	mv $(PKGDIR)-gtk/$(OODIR)/program/liblosessioninstalllo.so \
 		$(PKGDIR)-gnome/$(OODIR)/program/
-	mv $(PKGDIR)-gtk/$(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