[libreoffice] 02/02: git update; make-package-modules-not-suck.diff apply again

[Rene Engelhard]

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

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

commit 6d5b279db660a19e9caf649e2c2227d3d7e8790b
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 23 23:52:46 2016 +0100

    git update; make-package-modules-not-suck.diff apply again
---
 changelog                                  | 2 +-
 patches/make-package-modules-not-suck.diff | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index de8bee5..ef40dab 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.0~alpha0~git20161215-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~alpha0~git20161223-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 701a5f6..381a783 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -106,19 +106,18 @@ index 14a1c07..eab8078 100644
  ))
  
  $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
-@@ -301,11 +324,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -307,10 +307,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
  	ctl \
  	cui \
  	$(call gb_Helper_optional,DBCONNECTIVITY, \
 -		dba \
 -		dbase \
- 		dbmm \
--		dbtools \
+-		dbmm \
 -		dbaxml) \
-+		dbtools) \
++		dbmm) \
+ 	dbtools \
  	deploymentmisc \
  	$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
- 	$(if $(USING_X11),desktop_detector) \
 @@ -318,10 +338,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
  	evtatt \
  	expwrap \

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