[libreoffice] 09/13: support packaging NLPSolver from here
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 2ede141bb85b968cbd541691fa61d1ab811c4ff6
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 18 17:39:15 2016 +0200
support packaging NLPSolver from here
---
changelog | 3 +++
control.nlpsolver.in | 13 +++++++++++++
rules | 31 ++++++++++++++++++++++++-------
scripts/gid2pkgdirs.sh | 1 +
4 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/changelog b/changelog
index 8459b72..4ea157e 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,9 @@ libreoffice (1:5.2.0~rc1~git20160615-1) UNRELEASED; urgency=medium
* debian/vars.sparc64: add
* debian/rules: add sparc64 support again
+ * debian/control.nlpsolver.in, debian/rules, debian/scripts/gid2pkgdirs.sh:
+ support packaging NLPSolver from here
+
-- Rene Engelhard <rene@debian.org> Wed, 15 Jun 2016 13:52:09 +0200
libreoffice (1:5.2.0~beta2-1) experimental; urgency=medium
diff --git a/control.nlpsolver.in b/control.nlpsolver.in
new file mode 100644
index 0000000..5e8129e
--- /dev/null
+++ b/control.nlpsolver.in
@@ -0,0 +1,13 @@
+Package: libreoffice-nlpsolver
+Architecture: all
+Depends: ${misc:Depends}, libreoffice-calc (>= 1:3.0~), libreoffice-core (>= 1:3.3~), libreoffice-java-common, default-jre-headless | java5-runtime | java6-runtime
+Description: "Solver for Nonlinear Programming" extension for LibreOffice
+ By default LibreOffice Calc ships with a solver engine for linear
+ programming only. This allows the optimization of models to a certain degree.
+ However, if the formulas or constraints become more complex,
+ nonlinear programming is required. That missing gap is now filled by the
+ Solver for Nonlinear Programming extension.
+ .
+ Currently it incorporates two Evolutionary Algorithms which are able to
+ handle floating point and integer variables as well as nonlinear constraints.
+
diff --git a/rules b/rules
index da0cb64..7a49b83 100755
--- a/rules
+++ b/rules
@@ -374,11 +374,13 @@ ifeq "$(ENABLE_JAVA)" "y"
SYSTEM_STUFF += apache-commons
ENABLE_SCRIPT_PROVIDER_BSH=y
ENABLE_SCRIPT_PROVIDER_JS=y
+ ENABLE_NLPSOLVER=n
else
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
ENABLE_SCRIPT_PROVIDER_BSH=n
ENABLE_SCRIPT_PROVIDER_JS=n
+ ENABLE_NLPSOLVER=n
endif
ENABLE_SDBC_POSTGRESQL=y
BUILD_GTK=y
@@ -643,7 +645,8 @@ endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
ENABLE_MEDIAWIKI=n
ENABLE_REPORTDESIGN=n
- DEBHELPER_OPTIONS += -Nlibreoffice-wiki-publisher -Nlibreoffice-script-provider-python
+ ENABLE_NLPSOLVER=n
+ DEBHELPER_OPTIONS += -Nlibreoffice-wiki-publisher -Nlibreoffice-script-provider-python -Nlibreoffice-nlpsolver
CONFIGURE_FLAGS += --disable-extension-integration --disable-extensions
else
CONFIGURE_FLAGS += --enable-extension-integration
@@ -653,16 +656,19 @@ ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
+ ENABLE_NLPSOLVER=n
DEBHELPER_OPTIONS += -Nlibreoffice-wiki-publisher
DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
+ DEBHELPER_OPTIONS += -Nlibreoffice-nlpsolver
endif
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_GCJ_JDK_ARCHS)))
ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_OPENJDK_ARCHS)))
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
+ ENABLE_NLPSOLVER=n
SYSTEM_STUFF := $(filter-out jfreereport apache-commons, $(SYSTEM_STUFF))
- DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder -Nlibreoffice-wiki-publisher
+ DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder -Nlibreoffice-wiki-publisher -Nlibreoffice-nlpsolver
endif
endif
# disable SRB on ia64 when building with internal jfreereport.
@@ -1079,7 +1085,7 @@ export JAVA_HOME
endif
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
- CONFIGURE_FLAGS += --enable-ext-wiki-publisher
+ CONFIGURE_FLAGS_INDEP += --enable-ext-wiki-publisher
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
# report-builder
@@ -1092,11 +1098,14 @@ export JAVA_HOME
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
- CONFIGURE_FLAGS += --with-commons-logging-jar=/usr/share/java/commons-logging.jar
+ CONFIGURE_FLAGS_INDEP += --with-commons-logging-jar=/usr/share/java/commons-logging.jar
endif
else
CONFIGURE_FLAGS += --disable-report-builder
endif
+ ifeq "$(ENABLE_NLPSOLVER)" "y"
+ CONFIGURE_FLAGS_INDEP += --enable-ext-nlpsolver
+ endif
OOO_OFFICEBEAN_DEP = libreoffice-officebean
BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)
else
@@ -1777,6 +1786,9 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(ENABLE_REPORTDESIGN)" "y"
cat debian/control.reportdesign.in >> debian/control
endif
+ ifeq "$(ENABLE_NLPSOLVER)" "y"
+ cat debian/control.nlpsolver.in >> debian/control
+ endif
endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
cat debian/control.fonts.in >> debian/control
@@ -3489,9 +3501,9 @@ endif
# And libreofficekit gets an own README
# libreoffice-dev-doc installs directly into /usr/share/doc/libreoffice-dev...
dh_installdocs -i -A -Nlibreoffice-librelogo -Nfonts-opensymbol \
- -Nlibreoffice-wiki-publisher -Nlibreofficekit-dev \
- -Nlibreoffice-dev-doc --link-doc=libreoffice-common
- dh_installdocs -plibreoffice-librelogo -pfonts-opensymbol -plibreoffice-wiki-publisher \
+ -Nlibreoffice-wiki-publisher -Nlibreoffice-nlpsolver \
+ -Nlibreofficekit-dev -Nlibreoffice-dev-doc --link-doc=libreoffice-common
+ dh_installdocs -plibreoffice-librelogo -pfonts-opensymbol -plibreoffice-wiki-publisher -plibreoffice-nlpsolver \
-plibreofficekit-dev -plibreoffice-dev-doc
cp workdir/CustomTarget/readlicense_oo/readme/README_en-US \
$(PKGDIR)-common/usr/share/doc/libreoffice-common/README
@@ -3536,6 +3548,7 @@ ifeq "$(BUILD_TEST_PACKAGE)" "y"
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice-wiki-publisher \
+ -Nlibreoffice-nlpsolver \
-Nfonts-opensymbol -- \
-V'base-version=$(BASE_VERSION)' \
-V'oover=$(OOVER)' \
@@ -3557,6 +3570,10 @@ ifeq "$(ENABLE_MEDIAWIKI)" "y"
-V'java-runtime-depends=$(MEDIAWIKI_JAVA_RUNTIME_DEPENDS)' \
-v$(shell grep "<version" $(SOURCE_TREE)/swext/mediawiki/src/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
+ifeq "$(ENABLE_NLPSOLVER)" "y"
+ dh_gencontrol -plibreoffice-nlpsolver -- \
+ -v$(shell grep "<version" $(SOURCE_TREE)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
dh_gencontrol -plibreoffice-report-builder -- \
-V'base-version=$(BASE_VERSION)' \
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 3eb21c4..0c226ce 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -110,6 +110,7 @@ create_package_directory gid_Module_Optional_Extensions_Script_Provider_For_JS
create_package_directory gid_Module_Optional_Extensions_MEDIAWIKI pkg/libreoffice-wiki-publisher
create_package_directory gid_Module_Optional_Extensions_MINIMIZER pkg/libreoffice-presentation-minimizer
create_package_directory gid_Module_Optional_Extensions_MySQLConnector pkg/libreoffice-mysql-connector
+create_package_directory gid_Module_Optional_Extensions_NLPSolver pkg/libreoffice-nlpsolver
create_package_directory gid_Module_Pdfimport pkg/libreoffice-pdfimport
create_package_directory gid_Module_Optional_Extensions_PRESENTER_SCREEN pkg/libreoffice-presenter-console
create_package_directory gid_Module_Reportbuilder pkg/libreoffice-report-builder
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: