[DRE-commits] [SCM] ruby-haml.git branch, master, updated. debian/3.1.4-1-1-g28df620

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 28df620e75d012cf8d750cede363a90430d8ef7c
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Fri Jan 6 11:07:15 2012 -0600

    Stop building and providing/conflicting/replacing the (empty) haml- elisp package, as it has become an independent package of its own

diff --git a/debian/changelog b/debian/changelog
index d338407..55eced4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-haml (3.1.4-2) unstable; urgency=low
+
+  * Stop building and providing/conflicting/replacing the (empty) haml-
+    elisp package, as it has become an independent package of its own
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 06 Jan 2012 11:07:12 -0600
+
 ruby-haml (3.1.4-1) unstable; urgency=low
 
   [ Paul van Tilburg ]
diff --git a/debian/control b/debian/control
index 267fee4..5eaf0fc 100644
--- a/debian/control
+++ b/debian/control
@@ -19,9 +19,9 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 Recommends: ruby-sass
 Suggests: rails (>= 2.0.0)
-Replaces: libhaml-ruby1.8 (<< 3.1.4-1~), libhaml-ruby (<< 3.1.4-1~), libhaml-ruby-doc (<< 3.1.4-1~), haml-elisp (<< 3.1.4-1~)
-Breaks: libhaml-ruby1.8 (<< 3.1.4-1~), libhaml-ruby (<< 3.1.4-1~), libhaml-ruby-doc (<< 3.1.4-1~), haml-elisp (<< 3.1.4-1~)
-Provides: libhaml-ruby1.8, libhaml-ruby, libhaml-ruby-doc, haml-elisp
+Replaces: libhaml-ruby1.8 (<< 3.1.4-1~), libhaml-ruby (<< 3.1.4-1~), libhaml-ruby-doc (<< 3.1.4-1~)
+Breaks: libhaml-ruby1.8 (<< 3.1.4-1~), libhaml-ruby (<< 3.1.4-1~), libhaml-ruby-doc (<< 3.1.4-1~)
+Provides: libhaml-ruby1.8, libhaml-ruby, libhaml-ruby-doc
 Description: Elegant, structured XHTML/XML templating engine
  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 documents in a
@@ -57,13 +57,3 @@ Depends: ${misc:Depends}, ruby-haml
 Description: Transitional package for ruby-haml
  This is a transitional package to ease upgrades to the ruby-haml
  package. It can safely be removed.
-
-Package: haml-elisp
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends}, ruby-haml
-Description: Transitional package for ruby-haml
- This is a transitional package to ease upgrades to the ruby-haml package. 
- Haml unfortunately no longer includes syntax-highlighting for Haml (and
- Sass) modes.  It can safely be removed.
diff --git a/debian/haml-elisp.NEWS b/debian/haml-elisp.NEWS
deleted file mode 100644
index 00ead47..0000000
--- a/debian/haml-elisp.NEWS
+++ /dev/null
@@ -1,10 +0,0 @@
-ruby-haml (3.1.4-1) unstable; urgency=low
-
-  The old source package, libhaml-ruby, used to provide syntax-highlighting
-  for Emacs (haml and sass modes) in the haml-elisp package.
-  While transitioning to the ruby-haml source package that follows the Ruby
-  policy, new upstream was included that unfortunately longer includes these
-  modes.  As a result, I have decided to let ruby-haml provide the empty,
-  transitional haml-elisp packages that can be safely removed.
-
- -- Paul van Tilburg <paulvt at debian.org>  Fri, 16 Dec 2011 15:48:29 +0100

-- 
ruby-haml.git