[libreoffice] 02/08: move pagein-* into the respective modules

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 6e2bf5f2ba9377d323737f16aeb22df8b9614e35
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Aug 28 22:46:06 2017 +0000

    move pagein-* into the respective modules
---
 control    | 12 ++++++++----
 control.in | 12 ++++++++----
 rules      |  6 ++++++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/control b/control
index c05789e..27b834d 100644
--- a/control
+++ b/control
@@ -425,6 +425,8 @@ Suggests: fonts-crosextra-caladea,
           libreoffice-base,
           ${java-common-depends},
           ${java-runtime-depends}
+Rplaces: libreoffice-common (<< 1:5.4.1)
+Breaks: libreoffice-common (<< 1:5.4.1)
 Description: office productivity suite -- word processor
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -439,8 +441,8 @@ Depends: libreoffice-base-core (= ${binary:Version}) [!hppa !ia64 !mips64 !s390
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: ocl-icd-libopencl1
-Replaces: libreoffice-common (<< 1:5.3.0~rc3)
-Breaks: libreoffice-common (<< 1:5.3.0~rc3)
+Replaces: libreoffice-common (<< 1:5.4.1)
+Breaks: libreoffice-common (<< 1:5.4.1)
 Description: office productivity suite -- spreadsheet
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -453,6 +455,8 @@ Depends: libreoffice-core (= ${binary:Version}),
          libreoffice-draw (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Replaces: libreoffice-common (<< 1:5.4.1)
+Breaks: libreoffice-common (<< 1:5.4.1)
 Recommends: ${avmedia-be-depends}
 Suggests: bluez
 Description: office productivity suite -- presentation
@@ -466,8 +470,8 @@ Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreeb
 Depends: libreoffice-core (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Replaces: libreoffice-impress (<< 1:5.2.0-2)
-Breaks: libreoffice-impress (<< 1:5.2.0-2)
+Replaces: libreoffice-common (<< 1:5.4.1), libreoffice-impress (<< 1:5.2.0-2)
+Breaks: libreoffice-common (<< 1:5.4.1), libreoffice-impress (<< 1:5.2.0-2)
 Description: office productivity suite -- drawing
  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 b99595b..bf42419 100644
--- a/control.in
+++ b/control.in
@@ -248,6 +248,8 @@ Suggests: fonts-crosextra-caladea,
           libreoffice-base,
           ${java-common-depends},
           ${java-runtime-depends}
+Rplaces: libreoffice-common (<< 1:5.4.1)
+Breaks: libreoffice-common (<< 1:5.4.1)
 Description: office productivity suite -- word processor
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -262,8 +264,8 @@ Depends: libreoffice-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: ocl-icd-libopencl1
-Replaces: libreoffice-common (<< 1:5.3.0~rc3)
-Breaks: libreoffice-common (<< 1:5.3.0~rc3)
+Replaces: libreoffice-common (<< 1:5.4.1)
+Breaks: libreoffice-common (<< 1:5.4.1)
 Description: office productivity suite -- spreadsheet
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -276,6 +278,8 @@ Depends: libreoffice-core (= ${binary:Version}),
          libreoffice-draw (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Replaces: libreoffice-common (<< 1:5.4.1)
+Breaks: libreoffice-common (<< 1:5.4.1)
 Recommends: ${avmedia-be-depends}
 Description: office productivity suite -- presentation
  LibreOffice is a full-featured office productivity suite that provides
@@ -288,8 +292,8 @@ Architecture: %OOO_ARCHS%
 Depends: libreoffice-core (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Replaces: libreoffice-impress (<< 1:5.2.0-2)
-Breaks: libreoffice-impress (<< 1:5.2.0-2)
+Replaces: libreoffice-impress (<< 1:5.2.0-2), libreoffice-common (<< 1:5.4.1)
+Breaks: libreoffice-impress (<< 1:5.2.0-2), libreoffice-common (<< 1:5.4.1)
 Description: office productivity suite -- drawing
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/rules b/rules
index a547b6e..d66fdc3 100755
--- a/rules
+++ b/rules
@@ -2260,6 +2260,12 @@ endif
 			$(PKGDIR)-$$i/usr/share/applications/libreoffice-$$i.desktop; \
 	done
 
+	# move pagein files
+	for i in calc draw impress writer; do \
+		mv $(PKGDIR)-common/$(OODIR)/program/pagein-$$i \
+			$(PKGDIR)-$$i/$(OODIR)/program; \
+	done
+
 	# move help to /usr/share
 	for iso in $(HELPISOS); do \
 		pkgiso=`echo $$iso | tr A-Z a-z`; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git