[libreoffice] 02/05: fix -dev and -dev-doc upgrade
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 96685511612c3842c01523932fdb9158d8956598
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 30 20:46:46 2015 +0100
fix -dev and -dev-doc upgrade
---
changelog | 6 ++++++
control | 5 ++++-
control.in | 1 +
control.sdk.in | 3 ++-
libreoffice-dev-doc.links | 2 +-
rules | 23 ++++++-----------------
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/changelog b/changelog
index 2bca92a..9845869 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,12 @@ libreoffice (1:5.0.3~rc2-1) UNRELEASED; urgency=medium
* debian/rules:
- remove l10ntools build hack again, now obsolete
+ * debian/control{.sdk}.in, debian/rules, debian/libreoffice-dev-doc.links:
+ - stop moving the SDK docs into libreoffice-devs /usr/share/doc (and move the
+ stuff installed into /usr/share/doc/libreoffice/sdk in libreoffice-dev to
+ to /usr/share/doc/libreoffice-dev, too) and conflict against
+ libreoffice-dev / libreoffice-dev-doc (<< 1:5.0.3~rc1-2) where needed
+ (closes: #803272, #803306)
-- Rene Engelhard <rene@debian.org> Sat, 24 Oct 2015 18:48:10 +0200
diff --git a/control b/control
index 392537a..6727562 100644
--- a/control
+++ b/control
@@ -230,6 +230,8 @@ Suggests: cups-bsd,
${gstreamer-plugins-suggests},
${java-runtime-depends},
${ooo-officebean-dep}
+Conflicts: libreoffice-dev (<< 1:5.0.3~rc1-2),
+ libreoffice-dev-doc (<< 1:5.0.3~rc1-2)
Description: office productivity suite (metapackage)
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -4218,6 +4220,7 @@ Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
Suggests: libmythes-dev, libreoffice-dev-doc, libreofficekit-dev
Replaces: libreoffice-common (<< 1:4.1.0~beta1),
libreoffice-core (<< 1:4.1.0~beta1)
+Conflicts: libreoffice-dev-doc (<< 1:5.0.3~rc1-2)
Description: office productivity suite -- SDK
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -4232,7 +4235,7 @@ Architecture: all
Depends: ${misc:Depends}
Recommends: libreoffice-dev (= ${binary:Version}), www-browser
Suggests: libreoffice-dtd-officedocument1.0
-Conflicts: openoffice.org-dev-doc
+Conflicts: libreoffice-dev (<< 1:5.0.3~rc1-2), openoffice.org-dev-doc
Description: office productivity suite -- SDK documentation
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.in b/control.in
index 12fd330..2c8c1d9 100644
--- a/control.in
+++ b/control.in
@@ -69,6 +69,7 @@ Suggests: cups-bsd,
${java-runtime-depends},
${ooo-officebean-dep},
%LO-DESKTOP-INTEGRATION%
+Conflicts: libreoffice-dev (<< 1:5.0.3~rc1-2), libreoffice-dev-doc (<< 1:5.0.3~rc1-2)
Description: office productivity suite (metapackage)
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.sdk.in b/control.sdk.in
index 5538244..4cbba6d 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -8,6 +8,7 @@ Depends: libreoffice-core (= ${binary:Version}),
Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
Suggests: libmythes-dev, libreofficekit-dev, libreoffice-dev-doc
Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1)
+Conflicts: libreoffice-dev-doc (<< 1:5.0.3~rc1-2)
Description: office productivity suite -- SDK
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -23,7 +24,7 @@ Depends: ${misc:Depends}
Recommends: libreoffice-dev (= ${binary:Version}),
www-browser
Suggests: libreoffice-dtd-officedocument1.0
-Conflicts: openoffice.org-dev-doc
+Conflicts: openoffice.org-dev-doc, libreoffice-dev (<< 1:5.0.3~rc1-2)
Description: office productivity suite -- SDK documentation
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/libreoffice-dev-doc.links b/libreoffice-dev-doc.links
index c41bd4b..42ed301 100644
--- a/libreoffice-dev-doc.links
+++ b/libreoffice-dev-doc.links
@@ -1 +1 @@
-usr/share/doc/libreoffice-dev/docs usr/share/doc/libreoffice-dev/api
+usr/share/doc/libreoffice-dev-doc/docs usr/share/doc/libreoffice-dev-doc/api
diff --git a/rules b/rules
index 68bbf9c..a173211 100755
--- a/rules
+++ b/rules
@@ -2213,12 +2213,12 @@ endif
ifeq "$(PACKAGE_SDK)" "y"
# move SDK documentation into own package
rm -rf $(PKGDIR)-dev-doc
- mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev/docs
- mv $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk/docs/* \
- $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev/docs
- rmdir $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk/docs
+ mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev-doc
+ mv $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk/* \
+ $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev-doc
+ rmdir $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk
mkdir -p $(PKGDIR)-dev-doc/$(OOSDKDIR)
- ln -sf /usr/share/doc/libreoffice-dev/docs \
+ ln -sf /usr/share/doc/libreoffice-dev-doc/docs \
$(PKGDIR)-dev/$(OOSDKDIR)/docs
mv $(PKGDIR)-dev/$(OOSDKDIR)/examples \
$(PKGDIR)-dev-doc/$(OOSDKDIR)
@@ -2974,18 +2974,7 @@ ifeq "$(PACKAGE_SDK)" "y"
# add symlinks for docs and examples
cd $(PKGDIR)-dev-doc/$(OOSDKDIR) && \
rm -rf docs && \
- ln -sf /usr/share/doc/libreoffice-dev/docs docs
- mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev
- mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev-doc
- cd $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev-doc && \
- ln -s /usr/share/doc/libreoffice-dev/docs docs
- cd $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev-doc && \
- ln -s /$(OOSDKDIR)/examples examples
- cd $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev && \
- ln -s /$(OOSDKDIR)/examples examples
- # and the index
- cd $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev && \
- ln -s /$(OOSDKDIR)/index.html index.html
+ ln -sf /usr/share/doc/libreoffice-dev-doc/docs docs
endif
ifeq "$(ENABLE_JAVA)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: