[xml/sgml-commit] r337 - packages/libxml/trunk/debian

[Mike Hommey]

Author: glandium-guest
Date: 2004-11-24 00:14:57 -0700 (Wed, 24 Nov 2004)
New Revision: 337

Modified:
   packages/libxml/trunk/debian/changelog
   packages/libxml/trunk/debian/control
Log:
Conflict with older libxml1

Modified: packages/libxml/trunk/debian/changelog
===================================================================
--- packages/libxml/trunk/debian/changelog	2004-11-22 15:14:36 UTC (rev 336)
+++ packages/libxml/trunk/debian/changelog	2004-11-24 07:14:57 UTC (rev 337)
@@ -2,13 +2,16 @@
 
   * debian/libxml-dev.install, debian/libxml1.install: Moved .pc file into
     libxml-dev package. Closes: #281580.
-  * debian/control: Put build-depends on one line.
+  * debian/control:
+    + Put build-depends on one line.
+    + libxml-dev conflicts with older versions of libxml1 (since the moved
+      file conflicts)
   * debian/rules: Remove loop link /usr/include/gnome-xml/libxml and change it
     into a directory containing links to the header files. Closes: #130184.
   * libxml-dev.preinst: Remove old /usr/include/gnome-xml/libxml on upgrade.
   * entities.h: Removed redeclaration of xmlCopyEntitiesTable. Closes: #279328.
 
- -- Mike Hommey <mh@glandium.org>  Mon, 22 Nov 2004 23:46:25 +0900
+ -- Mike Hommey <mh@glandium.org>  Wed, 24 Nov 2004 16:13:15 +0900
 
 libxml (1:1.8.17-9) unstable; urgency=high
 

Modified: packages/libxml/trunk/debian/control
===================================================================
--- packages/libxml/trunk/debian/control	2004-11-22 15:14:36 UTC (rev 336)
+++ packages/libxml/trunk/debian/control	2004-11-24 07:14:57 UTC (rev 337)
@@ -25,7 +25,7 @@
 Architecture: any
 Section: libdevel
 Depends: libxml1 (= ${Source-Version}), zlib1g-dev | libz-dev
-Conflicts: libxml2-dev (<< 2.6.10-2)
+Conflicts: libxml2-dev (<< 2.6.10-2), libxml1 (<< 1:1.8.17-10)
 Description: Development files for the GNOME XML library
  XML is a metalanguage to let you design your own markup language.
  A regular markup language defines a way to describe information in