[libreoffice] 01/02: git update; update make-package-modules-not-suck.diff; fix changelog
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 53167531942f688e5dd2adca356fffd88fc999fd
Author: Rene Engelhard <rene@debian.org>
Date: Sat Sep 26 13:56:34 2015 +0200
git update; update make-package-modules-not-suck.diff; fix changelog
---
changelog | 5 ++---
patches/make-package-modules-not-suck.diff | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index 7f2d0ae..136b3fb 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,9 @@
-libreoffice (1:5.1.0~alpha1~git20150922-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~alpha1~git20150925-1) UNRELEASED; urgency=medium
* New upstream snapshot
* debian/patches/series, debian/patches/disable-tiledrendering-test.diff:
- remove again, seems to work again, and we need the functionality for
- liblibreofficekitgtk.so
+ remove again, we need the functionality for liblibreofficekitgtk.so
* debian/rules, debian/vars.mips64*:
- add mips64{el,eb} architecture stuff which is now added upstream
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index fb4cfa2..d6a8625 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -45,7 +45,7 @@ index 7d2a347..a15ac52 100644
$(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
diff --git a/Repository.mk b/Repository.mk
-index 9a7c31d..09eda0c 100644
+index 7e39aab..82d059a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -196,13 +196,28 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
@@ -112,7 +112,7 @@ index 9a7c31d..09eda0c 100644
+ dbtools) \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
- $(if $(filter unx,$(GUIBASE)),desktop_detector) \
+ $(if $(USING_X11),desktop_detector) \
@@ -322,10 +342,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
exp \
expwrap \
@@ -187,7 +187,7 @@ index 9a7c31d..09eda0c 100644
index_data \
@@ -591,7 +599,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
package2 \
- $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),recentfile) \
+ $(if $(USING_X11),recentfile) \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
- sdbc2 \
sofficeapp \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: