./packages/openofficeorg/3.1/unstable r1535: make -emailmerge Pre-Depend on ${python:Depends}, python-uno
------------------------------------------------------------
revno: 1535
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2009-05-08 18:30:52 +0200
message:
make -emailmerge Pre-Depend on ${python:Depends}, python-uno
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-05-08 16:28:49 +0000
+++ b/changelog 2009-05-08 16:30:52 +0000
@@ -10,6 +10,8 @@
- allow flex again, bump build-dep for flex if we use gcc 4.4 for safety
* debian/control.in:
- update openclipart-openoffice.org conflicts to (<= 0.18+dfsg-7)
+ - make -emailmerge Pre-Depend on ${python:Depends}, python-uno
+ (closes: #522022, #527558)
* debian/copyright:
- actually add Files: section matching the upstream tarballs
=== modified file 'control'
--- a/control 2009-05-07 14:18:15 +0000
+++ b/control 2009-05-08 16:30:52 +0000
@@ -373,7 +373,8 @@
Package: openoffice.org-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno, ${misc:Depends}
+Pre-Depends: ${python:Depends}, python-uno
+Depends: ${misc:Depends}
Enhances: openoffice.org-writer
Replaces: python-uno (<< 1:2.4.1-5)
Description: full-featured office productivity suite -- email mail merge
=== modified file 'control.in'
--- a/control.in 2009-05-07 14:13:17 +0000
+++ b/control.in 2009-05-08 16:30:52 +0000
@@ -642,8 +642,8 @@
Package: openoffice.orgVER-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno,
- ${misc:Depends}
+Pre-Depends: ${python:Depends}, python-uno
+Depends: ${misc:Depends}
Enhances: openoffice.orgVER-writer
Replaces: python-uno (<< 1:2.4.1-5)
Description: full-featured office productivity suite -- email mail merge
Reply to: