[DRE-commits] [SCM] ruby-haml.git branch, master, updated. debian/4.0.3-1
Gunnar Wolf
gwolf at debian.org
Thu May 23 21:32:23 UTC 2013
The following commit has been merged in the master branch:
commit 50492f53e25dc046cca15007abc9db93d504850e
Author: Gunnar Wolf <gwolf at debian.org>
Date: Thu May 23 11:42:33 2013 -0500
New major upstream release
* New major upstream release
* Upstream has split the 'html2haml' functionality into a different gem;
adding it as 'Recommends' (ITP filed). This change makes ruby-haml not
to have to depend on ruby-hpricot (Closes: #696834)
* No longer supports Rails <= 3; b-d-i and suggests updated from the
'rails' (2.x) to the 'rails3' packages.
* Added recommends: and b-d-i: on ruby-erubis
* Drop both the 003fix-root-path and remove_require_rubygems patches, as
they are no longer needed
diff --git a/debian/changelog b/debian/changelog
index f34bd3d..585f2d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ruby-haml (4.0.3-1) unstable; urgency=low
+
+ * New major upstream release
+ * Upstream has split the 'html2haml' functionality into a different gem;
+ adding it as 'Recommends' (ITP filed). This change makes ruby-haml not
+ to have to depend on ruby-hpricot (Closes: #696834)
+ * No longer supports Rails <= 3; b-d-i and suggests updated from the
+ 'rails' (2.x) to the 'rails3' packages.
+ * Added recommends: and b-d-i: on ruby-erubis
+ * Drop both the 003fix-root-path and remove_require_rubygems patches, as
+ they are no longer needed
+
+ -- Gunnar Wolf <gwolf at debian.org> Thu, 23 May 2013 11:20:02 -0500
+
ruby-haml (3.1.6-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 730cc9a..5f70182 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Uploaders: Paul van Tilburg <paulvt at debian.org>, Gunnar Wolf <gwolf at debian.org>
Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~)
-Build-Depends-Indep: rake, yard (>= 0.5.3), ruby-maruku (>= 0.5.9), ruby-sass,
- rails
+Build-Depends-Indep: rake, yard (>= 0.5.3), ruby-maruku (>= 0.5.9), ruby-sass, rails3, ruby-erubis
Standards-Version: 3.9.3
Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-haml.git
Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-haml.git;a=summary
@@ -16,8 +15,8 @@ Package: ruby-haml
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Recommends: ruby-sass
-Suggests: rails (>= 2.0.0)
+Recommends: ruby-sass, ruby-html2haml, ruby-erubis
+Suggests: rails3
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
diff --git a/debian/patches/003fix-root-path.patch b/debian/patches/003fix-root-path.patch
deleted file mode 100644
index ea1edeb..0000000
--- a/debian/patches/003fix-root-path.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Correct load paths of the haml library
-Author: Paul van Tilburg <paulvt at debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2011-12-18
-
-Index: ruby-haml/lib/haml/root.rb
-===================================================================
---- ruby-haml.orig/lib/haml/root.rb 2011-12-18 07:56:53.000000000 -0600
-+++ ruby-haml/lib/haml/root.rb 2011-12-18 07:57:43.000000000 -0600
-@@ -3,5 +3,5 @@
- # This may be overridden by the package manager
- # if the lib directory is separated from the main source tree.
- # @api public
-- ROOT_DIR = File.expand_path(File.join(__FILE__, "../../.."))
-+ ROOT_DIR = File.expand_path(File.join(__FILE__, "../.."))
- end
-Index: ruby-haml/lib/haml/version.rb
-===================================================================
---- ruby-haml.orig/lib/haml/version.rb 2011-12-18 07:56:53.000000000 -0600
-+++ ruby-haml/lib/haml/version.rb 2011-12-18 07:57:43.000000000 -0600
-@@ -42,9 +42,9 @@
- def version
- return @@version if defined?(@@version)
-
-- numbers = File.read(scope('VERSION')).strip.split('.').
-+ numbers = File.read(scope('haml/VERSION')).strip.split('.').
- map {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
-- name = File.read(scope('VERSION_NAME')).strip
-+ name = File.read(scope('haml/VERSION_NAME')).strip
- @@version = {
- :major => numbers[0],
- :minor => numbers[1],
-Index: ruby-haml/bin/html2haml
-===================================================================
---- ruby-haml.orig/bin/html2haml 2011-12-18 07:57:37.000000000 -0600
-+++ ruby-haml/bin/html2haml 2011-12-18 07:58:16.000000000 -0600
-@@ -1,6 +1,7 @@
- #!/usr/bin/env ruby
-
--require File.dirname(__FILE__) + '/../lib/haml'
-+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-+require 'haml'
- require 'haml/exec'
-
- opts = Haml::Exec::HTML2Haml.new(ARGV)
diff --git a/debian/patches/remove_require_rubygems.patch b/debian/patches/remove_require_rubygems.patch
deleted file mode 100644
index b53c8b2..0000000
--- a/debian/patches/remove_require_rubygems.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Remove rubygems require from library
-Author: Paul van Tilburg <paulvt at debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2012-06-24
-
---- a/lib/haml/filters.rb
-+++ b/lib/haml/filters.rb
-@@ -178,10 +178,6 @@
- end
- end
-
--begin
-- require 'rubygems'
--rescue LoadError; end
--
- module Haml
- module Filters
- # Does not parse the filtered text.
---- a/lib/haml/html.rb
-+++ b/lib/haml/html.rb
-@@ -1,7 +1,6 @@
- require File.dirname(__FILE__) + '/../haml'
-
- require 'haml/engine'
--require 'rubygems'
- require 'cgi'
- require 'hpricot'
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 01af81a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-003fix-root-path.patch
-remove_require_rubygems.patch
--
ruby-haml.git
More information about the Pkg-ruby-extras-commits
mailing list