[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-2-42-g3dd82a1
The following commit has been merged in the debian-experimental-4.0 branch:
commit 403a11e07e693a0d0f8143cd16f8022b72cec127
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 12 13:05:13 2013 +0100
stop building extra -emailmerge as stuff in -common (wizards) now need pyuno anyway
diff --git a/changelog b/changelog
index 57bdbfc..3aee903 100644
--- a/changelog
+++ b/changelog
@@ -15,6 +15,9 @@ libreoffice (1:4.0.1~rc2-1) UNRELEASED; urgency=low
- Standards-Version to 3.9.4 (no changes needed).
* debian/control.help.in:
- remove obsolete ${java-common-depends} Recommends
+ * debian/control*.in, debian/rules:
+ - stop building extra -emailmerge as stuff in -common (wizards) now
+ need pyuno anyway.
-- Rene Engelhard <rene@debian.org> Wed, 27 Feb 2013 17:18:53 +0100
diff --git a/control.in b/control.in
index 0859171..059998c 100644
--- a/control.in
+++ b/control.in
@@ -322,7 +322,7 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-style-tango (>= 1:${next-oover}~),
libtextcat-data (<< 2.2-8),
openoffice.org-common (<< 1:3.3.0~)
-Replaces: openoffice.org-common (<< 1:3.3.0~)
+Replaces: openoffice.org-common (<< 1:3.3.0~), libreoffice-emailmerge (<< 1:4.0.1~rc2)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -346,8 +346,7 @@ Depends: libreoffice-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreoffice-emailmerge,
- libreoffice-math,
+Recommends: libreoffice-math,
${java-common-depends},
${java-runtime-depends}
Replaces: libreoffice-core (<< 1:3.3.2-5)
@@ -578,22 +577,6 @@ Description: office productivity suite -- GNOME integration
* libreoffice-evolution: Evolution addressbook support
* evolution
-Package: libreoffice-emailmerge
-Architecture: all
-Depends: libreoffice-core,
- ${misc:Depends},
- ${python:Depends},
- ${pyuno-depends}
-Enhances: libreoffice-writer
-Breaks: ure (<< 1.5.1+OOo3.1.1-15)
-Replaces: python-uno (<< 1:2.4.1-5)
-Description: office productivity suite -- email mail merge
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains a component which allows LibreOffice to "mail merge"
- to E-Mail.
-
Package: python-uno
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
diff --git a/control.transitionals.in b/control.transitionals.in
index 6d6c702..21c3485 100644
--- a/control.transitionals.in
+++ b/control.transitionals.in
@@ -7,3 +7,13 @@ Description: transitional package for LibreOffice presenter's console
This package used to contain the LibreOffice presenter console. It has been
integrated with LibreOffice Impress 4.0. You can safely remove this package.
+Package: libreoffice-emailmerge
+Architecture: all
+Depends: libreoffice-common (>= 4.0.2~rc1)
+Section: oldlibs
+Priority: extra
+Description: transitional package for LibreOffices email meil merge
+ This package used to contain the email merge module for LibreOffice. It has
+ been integrated in libreoffice-common now.You can safely remove this
+ package.
+
diff --git a/rules b/rules
index f166819..69c43b9 100755
--- a/rules
+++ b/rules
@@ -2441,13 +2441,6 @@ $(STAMP_DIR)/install-indep: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install-common
dh_testdir
dh_testroot
- # split out emailmerge stuff
- mkdir -p $(PKGDIR)-emailmerge/$(OODIR)/program
- for i in mailmerge msgbox officehelper; do \
- mv $(PKGDIR)-common/$(OODIR)/program/$$i.py \
- $(PKGDIR)-emailmerge/$(OODIR)/program; \
- done
-
ifneq "$(USE_GSTREAMER)" "y"
# sound doesn't work anyway, remove the .wav files to save space
rm -rf $(PKGDIR)-common/$(OODIR)/share/gallery/sounds
--
LibreOffice packaging repository
Reply to: