[libreoffice] 01/02: also mv control.reportdesign.in -> control.reportbuilder.in
Rene Engelhard
rene at moszumanska.debian.org
Thu Dec 14 23:29:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 9ffd13873c57349b63f99f244d9634fc6c5f212b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Thu Dec 14 23:27:51 2017 +0000
also mv control.reportdesign.in -> control.reportbuilder.in
---
changelog | 5 +++--
control.reportdesign.in => control.reportbuilder.in | 2 +-
rules | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index 0a77f58..f0efbcf 100644
--- a/changelog
+++ b/changelog
@@ -28,8 +28,9 @@ libreoffice (1:5.4.4~rc2-1) UNRELEASED; urgency=medium
- stop passing --disable-report-builder to build-archs configure since
even though it's built the report builder doesn't work then. Move
from Build-Depends-Indep: to Build-Depends: again (closes: #875688);
- * debian/rules, debian/control.in:
- s/REPORTDESIGN/REPORTBUILDER/ while we're at it
+ * debian/rules, debian/control*.in:
+ s/REPORTDESIGN/REPORTBUILDER/ and
+ control.reportdesign.in -> control.reportbuilder.in while we're at it
* debian/control.in: add gnupg to Suggests
* debian/copyright:
- mention sysui/desktop/apparmor/* copyright/license
diff --git a/control.reportdesign.in b/control.reportbuilder.in
similarity index 97%
rename from control.reportdesign.in
rename to control.reportbuilder.in
index 51c4e2e..055b0a6 100644
--- a/control.reportdesign.in
+++ b/control.reportbuilder.in
@@ -21,7 +21,7 @@ Description: LibreOffice component for building database reports
Package: libreoffice-report-builder-bin
Section: misc
-Architecture: %OOO_REPORTDESIGN_ARCHS%
+Architecture: %OOO_REPORTBUILDER_ARCHS%
Depends: libreoffice-core,
libreoffice-base,
${misc:Depends},
diff --git a/rules b/rules
index bfc859d..e83fa88 100755
--- a/rules
+++ b/rules
@@ -1808,7 +1808,7 @@ ifeq "$(ENABLE_JAVA)" "y"
cat debian/control.mediawiki.in >> debian/control
endif
ifeq "$(ENABLE_REPORTBUILDER)" "y"
- cat debian/control.reportdesign.in >> debian/control
+ cat debian/control.reportbuilder.in >> debian/control
endif
ifeq "$(ENABLE_NLPSOLVER)" "y"
cat debian/control.nlpsolver.in >> debian/control
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list