[libreoffice] 02/03: git update

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.5
in repository libreoffice.

commit bf6ec4684808538213c13c60060fa4236ef88411
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jun 5 13:39:49 2017 +0200

    git update
---
 changelog                                  |  2 +-
 patches/make-package-modules-not-suck.diff | 14 +++++++-------
 patches/no-packagekit-per-default.diff     |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/changelog b/changelog
index 977f052..7b421d4 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.5.0~alpha0~git20170527-1) UNRELEASED; urgency=medium
+libreoffice (1:5.5.0~alpha0~git20170605-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index bc8b90a..36be456 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -36,13 +36,13 @@ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
 index 7d2a347..a15ac52 100644
 --- a/scp2/AutoInstall.mk
 +++ b/scp2/AutoInstall.mk
-@@ -18,6 +18,7 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE))
- $(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE))
- $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
- $(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE))
-+$(eval $(call gb_AutoInstall_add_module,draw,LIBO_LIB_FILE))
- $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
- $(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,))
+@@ -17,6 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE,,PACKAGE_FIL
+ $(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+ $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+ $(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
++$(eval $(call gb_AutoInstall_add_module,draw,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+ $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+ $(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,PACKAGE_FILELIST))
  $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
 diff --git a/Repository.mk b/Repository.mk
 index 14a1c07..eab8078 100644
diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
index 1ca6bd6..3e2b545 100644
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@ -177,7 +177,7 @@ index f467783..b48e763 100644
 --- a/sfx2/source/appl/appserv.cxx
 +++ b/sfx2/source/appl/appserv.cxx
 @@ -159,6 +159,7 @@ namespace
-         // make sure we actually can instanciate services from base first
+         // make sure we actually can instantiate services from base first
          if(!lcl_isBaseAvailable())
          {
 +#if defined (ENABLE_PACKAGEKIT)

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