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

./packages/libreoffice/3.3.0/unstable r2367: conflict against openoffice.org-dev-doc (closes: #612494)



------------------------------------------------------------
revno: 2367
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2011-02-08 22:41:05 +0100
message:
  conflict against openoffice.org-dev-doc (closes: #612494)
modified:
  changelog
  control
  control.sdk.in
=== modified file 'changelog'
--- a/changelog	2011-02-07 19:12:27 +0000
+++ b/changelog	2011-02-08 21:41:05 +0000
@@ -2,8 +2,10 @@
 
   * debian/rules:
     - allow squeeze backports 
+  * debian/control.sdk.in:
+    - conflict against openoffice.org-dev-doc (closes: #612494) 
 
- -- Rene Engelhard <rene@debian.org>  Mon, 07 Feb 2011 20:09:44 +0100
+ -- Rene Engelhard <rene@debian.org>  Tue, 08 Feb 2011 22:37:50 +0100
 
 libreoffice (1:3.3.0-2) unstable; urgency=low
 

=== modified file 'control'
--- a/control	2011-02-07 19:12:27 +0000
+++ b/control	2011-02-08 21:41:05 +0000
@@ -3399,6 +3399,7 @@
 Depends: ${misc:Depends}
 Recommends: www-browser
 Suggests: libreoffice-dtd-officedocument1.0
+Conflicts: openoffice.org-dev-doc
 Description: office productivity suite -- SDK documentation
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

=== modified file 'control.sdk.in'
--- a/control.sdk.in	2010-12-28 10:06:04 +0000
+++ b/control.sdk.in	2011-02-08 21:41:05 +0000
@@ -26,6 +26,7 @@
 Depends: ${misc:Depends}
 Recommends: www-browser
 Suggests: libreofficeVER-dtd-officedocument1.0
+Conflicts: openoffice.org-dev-doc
 Description: office productivity suite -- SDK documentation
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.


Reply to: