This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 95bb5b413c6fd43965e141e0f276a4dd90bad200
Author: Rene Engelhard <r...@debian.org>
Date: Wed Sep 23 13:47:52 2015 +0200
use dh_installdocs --link-doc
---
changelog | 7 +++++++
rules | 18 ++++++------------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/changelog b/changelog
index 2f4b283..656cddd 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.0.2-1.1) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - use dh_installdocs --link-doc=libreoffice-{core,common}
+
+ -- Rene Engelhard <r...@debian.org> Wed, 23 Sep 2015 13:45:25 +0200
+
libreoffice (1:5.0.2-1) unstable; urgency=medium
* New upstream release
diff --git a/rules b/rules
index 32fa894..7ec4491 100755
--- a/rules
+++ b/rules
@@ -3151,12 +3151,9 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch
debian/control $(STAMP_DIR)/
rm -rf debian/$$pkg/DEBIAN;\
done
- dh_installdocs -s -A
- for p in $(ARCH_DEP_PACKAGES); do \
- mkdir -p debian/$$p/usr/share/doc/$$p; \
- cp workdir/CustomTarget/readlicense_oo/readme/README_en-US \
- debian/$$p/usr/share/doc/$$p/README; \
- done
+ dh_installdocs -s -A --link-doc=libreoffice-core
+ cp workdir/CustomTarget/readlicense_oo/readme/README_en-US \
+ $(PKGDIR)-core/usr/share/doc/libreoffice-core/README
dh_installdebconf -s
dh_installman -s
for i in writer calc draw base math impress; do \
@@ -3402,12 +3399,9 @@ ifeq "$(PACKAGE_SDK)" "y"
# But fix it..
perl -pi -e 's,html/,html /,g'
debian/libreoffice-dev-doc.doc-base.lo-idl-ref
endif
- dh_installdocs -i -A
- for p in $(ARCH_INDEP_PACKAGES); do \
- mkdir -p debian/$$p/usr/share/doc/$$p; \
- cp workdir/CustomTarget/readlicense_oo/readme/README_en-US \
- debian/$$p/usr/share/doc/$$p/README; \
- done
+ dh_installdocs -i -A -Nlibreoffice-librelogo
--link-doc=libreoffice-common
+ cp workdir/CustomTarget/readlicense_oo/readme/README_en-US \
+ $(PKGDIR)-common/usr/share/doc/libreoffice-common/README
dh_installman -i
for i in `find $(PKGDIR)-common -type l -name "lo*.1"`; do \
mv $$i $$i.gz; \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
