[xml/sgml-commit] r589 - in packages/libxml2: . trunk/debian

[Mike Hommey]

Author: glandium
Date: 2006-10-04 15:17:33 +0000 (Wed, 04 Oct 2006)
New Revision: 589

Modified:
   packages/libxml2/
   packages/libxml2/trunk/debian/changelog
   packages/libxml2/trunk/debian/control
Log:
 r1136 at namakemono:  mh | 2006-10-04 16:53:56 +0200
 * debian/control: Added a conflict to the sarge version of libxslt1.1 to
   avoid upgrade problems. Closes: #390733.



Property changes on: packages/libxml2
___________________________________________________________________
Name: svk:merge
   - 85a06573-1206-0410-a182-ce9117885d71:/local/libxml2:296
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1132
   + 85a06573-1206-0410-a182-ce9117885d71:/local/libxml2:296
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1136

Modified: packages/libxml2/trunk/debian/changelog
===================================================================
--- packages/libxml2/trunk/debian/changelog	2006-10-04 14:44:47 UTC (rev 588)
+++ packages/libxml2/trunk/debian/changelog	2006-10-04 15:17:33 UTC (rev 589)
@@ -1,9 +1,12 @@
 libxml2 (2.6.26.dfsg-4) unstable; urgency=low
 
-  * debian/control: Bumped Standards-Version to 3.7.2.1. No changes required.
+  * debian/control:
+    + Bumped Standards-Version to 3.7.2.1. No changes required.
+    + Added a conflict to the sarge version of libxslt1.1 to avoid upgrade
+      problems. Closes: #390733.
   * debian/watch: Updated to mangle the Debian version.
 
- -- Mike Hommey <glandium at debian.org>  Sun, 27 Aug 2006 21:56:38 +0200
+ -- Mike Hommey <glandium at debian.org>  Wed,  4 Oct 2006 16:51:29 +0200
 
 libxml2 (2.6.26.dfsg-3) unstable; urgency=medium
 

Modified: packages/libxml2/trunk/debian/control
===================================================================
--- packages/libxml2/trunk/debian/control	2006-10-04 14:44:47 UTC (rev 588)
+++ packages/libxml2/trunk/debian/control	2006-10-04 15:17:33 UTC (rev 589)
@@ -10,6 +10,7 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libxslt1.1 (<= 1.1.12-8)
 Recommends: xml-core
 Description: GNOME XML library
  XML is a metalanguage to let you design your own markup language.