[xml/sgml-commit] r1879 - in /packages/docbook-xsl-doc/trunk/debian: changelog control

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Sun Apr 24 16:30:41 2011
New Revision: 1879

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1879
Log:
* debian/control (Conflicts): Changed to breaks to fix conflicts-with-version.

Modified:
    packages/docbook-xsl-doc/trunk/debian/changelog
    packages/docbook-xsl-doc/trunk/debian/control

Modified: packages/docbook-xsl-doc/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-doc/trunk/debian/changelog?rev=1879&op=diff
==============================================================================
--- packages/docbook-xsl-doc/trunk/debian/changelog (original)
+++ packages/docbook-xsl-doc/trunk/debian/changelog Sun Apr 24 16:30:41 2011
@@ -4,6 +4,7 @@
   * New upstream release.
   * debian/control (Vcs-Browser, Vcs-Svn): Adjusted for unstable.
     (Standards-Version): Bumped to 3.9.2.
+    (Conflicts): Changed to breaks to fix conflicts-with-version.
   * debian/patches/series: Added.
   * debian/source/format: Added for format 3.0 (quilt).
 

Modified: packages/docbook-xsl-doc/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-doc/trunk/debian/control?rev=1879&op=diff
==============================================================================
--- packages/docbook-xsl-doc/trunk/debian/control (original)
+++ packages/docbook-xsl-doc/trunk/debian/control Sun Apr 24 16:30:41 2011
@@ -15,7 +15,7 @@
 Depends: ${misc:Depends}
 Recommends: lynx | www-browser
 Provides: docbook-xsl-doc
-Conflicts: docbook-xsl (<< 1.70.0), docbook-xsl-doc (<< 1.72.0)
+Breaks: docbook-xsl (<< 1.70.0), docbook-xsl-doc (<< 1.72.0)
 Replaces: docbook-xsl (<< 1.70.0), docbook-xsl-doc (<< 1.72.0)
 Enhances: docbook-xsl (>= ${source:Version}), docbook-xsl-ns (>= ${source:Version})
 Description: stylesheets for processing DocBook XML files (HTML documentation)