[libreoffice] 02/06: move gengal move to -dev to install-common
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit d91708a359511f20b82a9ad34087cbbf5db1d39b
Author: Rene Engelhard <rene@debian.org>
Date: Thu May 29 15:11:35 2014 +0200
move gengal move to -dev to install-common
---
changelog | 1 +
rules | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/changelog b/changelog
index e0ae190..4c6ae4f 100644
--- a/changelog
+++ b/changelog
@@ -18,6 +18,7 @@ libreoffice (1:4.2.4-4) unstable; urgency=medium
for wheezy-backports
- 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)
-- Rene Engelhard <rene@debian.org> Thu, 29 May 2014 00:27:34 +0200
diff --git a/rules b/rules
index 857cd0a..2134dfd 100755
--- a/rules
+++ b/rules
@@ -2191,6 +2191,18 @@ else
rm -rf $(PKGDIR)-common/$(OODIR)/share/glade
endif
+ifeq "$(PACKAGE_SDK)" "y"
+ # move gengal stuff into -dev
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+ mv $(PKGDIR)-core/$(OODIR)/program/gengal.bin \
+ $(PKGDIR)-dev/$(OODIR)/program
+ mv $(PKGDIR)-common/$(OODIR)/program/gengal \
+ $(PKGDIR)-dev/$(OODIR)/program
+else
+ rm -f $(PKGDIR)-core/$(OODIR)/program/gengal.bin
+ rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
+endif
+
find debian/tmp ! -perm -200 | xargs -r chmod u+w
touch $@
@@ -2668,19 +2680,11 @@ ifeq "$(ENABLE_MEDIAWIKI)" "y"
endif
ifeq "$(PACKAGE_SDK)" "y"
- # move gengal stuff into -dev
- mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/gengal.bin \
- $(PKGDIR)-dev/$(OODIR)/program
- mv $(PKGDIR)-common/$(OODIR)/program/gengal \
- $(PKGDIR)-dev/$(OODIR)/program
# move ui-previewer into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/ui-previewer \
$(PKGDIR)-dev/$(OODIR)/program
else
- rm -f $(PKGDIR)-core/$(OODIR)/program/gengal.bin
- rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
rm -f $(PKGDIR)-core/$(OODIR)/program/ui-previewer
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: