------------------------------------------------------------
revno: 1052
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-04-23 22:05:59 +0200
message:
own -emailmerge package
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-04-23 19:40:46 +0000
+++ b/changelog 2008-04-23 20:05:59 +0000
@@ -4,7 +4,7 @@
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
* ooo-build:
- - update (r12313)
+ - update (r12314)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -19,6 +19,11 @@
extension
- remove scsolver conditionals, not disableabe in Suns version.
Remove obsolete mvs
+ * debian/rules, debian/control.in:
+ - split emailmerge out into an own package. Don't make -writer depend on
+ python-uno anymore so that -writer (and openoffice.org) still can be
+ installed when python-uno is not installable (like at python-defaults
+ changes)
* debian/rules, debian/control.in,
debian/control.{minimizer,presenter,mediawiki}.in,
debian/openoffice.org*.{preinst,prerm,postinst}.in,
@@ -33,7 +38,7 @@
- build-depend against libxrandr-dev
* debian/copyright: LGPL v3
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 23 Apr 2008 21:36:09 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 23 Apr 2008 22:02:49 +0200
openoffice.org (1:2.4.0-5) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-04-23 07:38:47 +0000
+++ b/control 2008-04-23 20:05:59 +0000
@@ -143,8 +143,8 @@
Package: openoffice.org-writer
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}, ${writer-pyuno-dep}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}, openoffice.org-emailmerge
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<<
1:2.3.1)
Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<<
${Source-Version}), openoffice.org-java-common (<= 1:2.3.1)
Provides: openoffice.org2-writer
@@ -392,6 +392,18 @@
This package allows OpenOffice.org to access Evolution address books.
You need to install evolution separately.
+Package: openoffice.org-emailmerge
+Architecture: all
+Depends: ${python:Depends}, python-uno
+Enhances: openoffice.org-writer
+Replaces: python-uno (<< 1:3.0.0~)
+Description: E-Mail Mailmerge component for OpenOffice.org
+ OpenOffice.org 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 OpenOffice.org to "mail merge"
+ to E-Mail.
+
Package: python-uno
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
=== modified file 'control.in'
--- a/control.in 2008-04-23 07:38:47 +0000
+++ b/control.in 2008-04-23 20:05:59 +0000
@@ -315,9 +315,8 @@
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-base-core (= ${Source-Version}),
- ${shlibs:Depends},
- ${writer-pyuno-dep}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}
+ ${shlibs:Depends}
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}, openoffice.orgVER-emailmerge
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}),
@@ -630,6 +629,18 @@
This package allows OpenOffice.org to access Evolution address books.
You need to install evolution separately.
+Package: openoffice.orgVER-emailmerge
+Architecture: all
+Depends: ${python:Depends}, python-uno
+Enhances: openoffice.orgVER-writer
+Replaces: python-uno (<< 1:3.0.0~)
+Description: E-Mail Mailmerge component for OpenOffice.org
+ OpenOffice.org 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 OpenOffice.org to "mail merge"
+ to E-Mail.
+
Package: python-uno
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
=== modified file 'rules'
--- a/rules 2008-04-23 19:40:46 +0000
+++ b/rules 2008-04-23 20:05:59 +0000
@@ -451,7 +451,6 @@
BUILD_DEPS += , python-central (>= 0.5) [$(OOO_ARCHS)]
endif
BUILD_DEPS += , python-dev (>= 2.4) [$(OOO_ARCHS)]
- WRITER_PYUNO_DEP = python-uno (>= $(UPSTREAM_VERSION))
DBG_DBG_SUGGESTS+= , python-dbg
else
BUILD_DEPS += , python [$(OOO_ARCHS)]
@@ -2442,8 +2441,10 @@
dh_testroot
# Copy files placed by ooo-build/bin/package-ooo/install
- rm -rf $(PKGDIR)-common $(PKGDIR)-common.*.debhelper; \
- cp -r --preserve=mode debian/tmp/pkg/openoffice.org-common
$(PKGDIR)-common || exit 1
+ for i in common emailmerge; do \
+ rm -rf $(PKGDIR)-$$i $(PKGDIR)-$$i.*.debhelper; \
+ cp -r --preserve=mode debian/tmp/pkg/openoffice.org-$$i
$(PKGDIR)-$$i || exit 1; \
+ done
ifeq "$(PACKAGE_SDK)" "y"
rm -rf $(PKGDIR)-dev-doc $(PKGDIR)-dev-doc.*.debhelper; \
cp -r --preserve=mode debian/tmp/pkg/openoffice.org-dev-doc
$(PKGDIR)-dev-doc || exit 1
@@ -2954,7 +2955,6 @@
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
- -V'writer-pyuno-dep=$(WRITER_PYUNO_DEP)' \
-V'writer-w2l-dep=$(WRITER_W2L_DEP)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
