[libreoffice] 04/06: rm share/extensions/wiki-publisher/registration/LICENSE in install-indep
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit c595e7c471e7eef3422c058cb614a3919795a37a
Author: Rene Engelhard <rene@debian.org>
Date: Thu May 29 15:53:24 2014 +0200
rm share/extensions/wiki-publisher/registration/LICENSE in install-indep
---
changelog | 4 ++--
rules | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index b04271a..f5210df 100644
--- a/changelog
+++ b/changelog
@@ -20,9 +20,9 @@ libreoffice (1:4.2.4-4) unstable; urgency=medium
- cleanup python build-deps: PYTHON_FOR_BUILD is python3 in "standard"
builds, so build-depend on that (and on python only when we build python2)
- move gengal move to -dev to install-common (fix debuild -A _all package
- difference)
+ difference); also remove -wiki-publishers LICENSE in install-indep
- -- Rene Engelhard <rene@debian.org> Thu, 29 May 2014 15:14:27 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 29 May 2014 15:51:32 +0200
libreoffice (1:4.2.4-3) unstable; urgency=low
diff --git a/rules b/rules
index 2134dfd..d916bcd 100755
--- a/rules
+++ b/rules
@@ -2675,10 +2675,6 @@ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
rm -f $(PKGDIR)-mysql-connector/$(OODIR)/share/extensions/mysql-connector-ooo/registration/LICENSE
endif
-ifeq "$(ENABLE_MEDIAWIKI)" "y"
- rm -f $(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/registration/LICENSE
-endif
-
ifeq "$(PACKAGE_SDK)" "y"
# move ui-previewer into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
@@ -3026,6 +3022,7 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
+ rm -f $(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/registration/LICENSE
rm -f $(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/license/THIRDPARTYLICENSEREADME.html
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: