The following commit has been merged in the master branch:
commit 81ea89123d659942531241080fd996e002043d5e
Author: Rene Engelhard <r...@debian.org>
Date: Sun Jun 5 20:51:04 2011 +0000
stop moving vbaevents*.uno.so to -calc. Move libvbaswobj*uno.so to -writer
diff --git a/changelog b/changelog
index e46de29..25a6c2f 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,8 @@ libreoffice (1:3.3.2-5) UNRELEASED; urgency=low
* debian/rules:
- disable -sdbc-postgresql until fixed (closes: #620100)
+ - stop moving vbaevents*.uno.so to -calc. Move libvbaswobj*uno.so
+ to -writer
-- Rene Engelhard <r...@debian.org> Sun, 29 May 2011 22:13:56 +0000
diff --git a/control b/control
index c6260ee..fb27637 100644
--- a/control
+++ b/control
@@ -143,6 +143,7 @@ Package: libreoffice-writer
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}) [!armel], ${shlibs:Depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, libreoffice-emailmerge, libreoffice-math
+Replaces: libreoffice-writer (<< 1:3.3.2-5)
Suggests: libreoffice-gcj, libreoffice-base
Description: office productivity suite -- word processor
LibreOffice is a full-featured office productivity suite that provides
@@ -153,6 +154,7 @@ Description: office productivity suite -- word processor
Package: libreoffice-calc
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}) [!armel], ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
+Replaces: libreoffice-calc (<< 1:3.3.2-5)
Description: office productivity suite -- spreadsheet
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 94160f7..882e821 100644
--- a/control.in
+++ b/control.in
@@ -260,6 +260,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, libreofficeVER-emailmerge, libreofficeVER-math
+Replaces: libreofficeVER-writer (<< 1:3.3.2-5)
Suggests: libreofficeVER-gcj,
libreofficeVER-base
Description: office productivity suite -- word processor
@@ -275,6 +276,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${shlibs:Depends},
${lpsolve-dep},
${misc:Depends}
+Replaces: libreofficeVER-calc (<< 1:3.3.2-5)
Description: office productivity suite -- spreadsheet
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 87390ce..3b83174 100755
--- a/rules
+++ b/rules
@@ -2322,12 +2322,12 @@ endif
mv $(PKGDIR)-calc/$(OODIR)/program/libcalc*so \
$(PKGDIR)-base/$(OODIR)/program; \
- # move vba stuff into -calc, they are calc-only and linked to
- # libsc*
- for i in libvbaobj vbaevents; do \
- mv $(PKGDIR)-core/$(OODIR)/program/$$i*uno.so \
- $(PKGDIR)-calc/$(OODIR)/program; \
- done
+ # linked (amongst others) to libsc*
+ mv $(PKGDIR)-core/$(OODIR)/program/libvbaobj*uno.so \
+ $(PKGDIR)-calc/$(OODIR)/program
+ # linked (amongst others) to libsw*
+ mv $(PKGDIR)-core/$(OODIR)/program/libvbaswobj*uno.so \
+ $(PKGDIR)-writer/$(OODIR)/program
ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qtki5-0008rk...@vasks.debian.org
