[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.1.1/unstable r1717: conflict against libhsqldb-java (>= 1.9~)



------------------------------------------------------------
revno: 1717
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sat 2009-10-24 22:31:28 +0200
message:
  conflict against libhsqldb-java (>= 1.9~)
modified:
  changelog
  control
  control.in
=== modified file 'changelog'
--- a/changelog	2009-10-23 18:29:53 +0000
+++ b/changelog	2009-10-24 20:31:28 +0000
@@ -5,8 +5,10 @@
       - fixes wrong filter texts in KDE4 fpicker (closes: #551774)
       - Correct fix for the mirrored range selection bug in RTL mode.
         (closes: #548767)
+  * debian/control.in:
+    - conflict against libhsqldb-java (>= 1.9~)
 
- -- Rene Engelhard <rene@debian.org>  Wed, 21 Oct 2009 20:25:54 +0200
+ -- Rene Engelhard <rene@debian.org>  Sat, 24 Oct 2009 22:29:13 +0200
 
 openoffice.org (1:3.1.1-5) unstable; urgency=low
 

=== modified file 'control'
--- a/control	2009-10-16 21:35:07 +0000
+++ b/control	2009-10-24 20:31:28 +0000
@@ -222,7 +222,7 @@
 Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends}
 Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libjtds-java, openoffice.org-gcj, openoffice.org-report-builder
 Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-java, openoffice.org-java-common (= 1:2.3.1-2~bpo40+1), openoffice.org-java-common (= 1:2.4.0-4~bpo40+1), openoffice.org-java-common (= 1:2.4.1-3~bpo40+1), openoffice.org-java-common (= 2.2.0-6~bpo.1), openoffice.org-java-common (= 2.2.1-1~bpo.1), openoffice.org-java-common (= 2.2.1-9~bpo40+1)
-Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-common (= 2.0.4-4)
+Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-common (= 2.0.4-4), libhsqldb-java (>= 1.9~)
 Provides: openoffice.org2-base
 Description: full-featured office productivity suite -- database
  OpenOffice.org is a full-featured office productivity suite that provides

=== modified file 'control.in'
--- a/control.in	2009-10-16 11:43:31 +0000
+++ b/control.in	2009-10-24 20:31:28 +0000
@@ -475,7 +475,8 @@
  openoffice.org-java-common (= 2.2.1-9~bpo40+1)
 Conflicts: openoffice.org-debian-files,
  openoffice.org2-base (<< ${binary:Version}),
- openoffice.org-common (= 2.0.4-4)
+ openoffice.org-common (= 2.0.4-4),
+ libhsqldb-java (>= 1.9~)
 Provides: openoffice.org2-base
 Description: full-featured office productivity suite -- database
  OpenOffice.org is a full-featured office productivity suite that provides


Reply to: