[DRE-commits] r3188 - packages/libhaml-ruby/trunk/debian

[gwolf at alioth.debian.org]

Author: gwolf
Date: 2009-01-06 23:37:45 +0000 (Tue, 06 Jan 2009)
New Revision: 3188

Modified:
   packages/libhaml-ruby/trunk/debian/changelog
   packages/libhaml-ruby/trunk/debian/control
Log:
Adding "Conflicts:" header


Modified: packages/libhaml-ruby/trunk/debian/changelog
===================================================================
--- packages/libhaml-ruby/trunk/debian/changelog	2009-01-06 02:04:22 UTC (rev 3187)
+++ packages/libhaml-ruby/trunk/debian/changelog	2009-01-06 23:37:45 UTC (rev 3188)
@@ -1,3 +1,11 @@
+libhaml-ruby (2.0.6-2) UNRELEASED; urgency=low
+
+  * Added "Conflicts: sufary" to binary package libhaml-ruby1.8, as both
+    packages provide (completely unrelated) /usr/bin/sass. (Closes:
+    #511032)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 06 Jan 2009 17:36:49 -0600
+
 libhaml-ruby (2.0.6-1) unstable; urgency=low
 
   * Initial upload (Closes: #509159)

Modified: packages/libhaml-ruby/trunk/debian/control
===================================================================
--- packages/libhaml-ruby/trunk/debian/control	2009-01-06 02:04:22 UTC (rev 3187)
+++ packages/libhaml-ruby/trunk/debian/control	2009-01-06 23:37:45 UTC (rev 3188)
@@ -14,6 +14,7 @@
 Architecture: all
 Depends: ${misc:Depends}, ruby1.8
 Recommends: rails (>= 2.0.0), libhpricot-ruby1.8
+Conflicts: sufary
 Description: Elegant, easy and powerful template engines for HTML and CSS
  Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or
  XML that's designed to express the structure of XHTML or XML