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

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 1f8db32ebe7f3c7f73b43e4961dd136882aae8a1
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Thu May 23 16:27:40 2013 -0500

    Updating several minor details for packaging 4.0.x

diff --git a/debian/changelog b/debian/changelog
index 585f2d8..2cd76ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ruby-haml (4.0.3-1) unstable; urgency=low
   * 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
+  * Added suggests: on yard, in order to skip including duplicated
+    Javascript files found there (and added by it during the build)
 
  -- Gunnar Wolf <gwolf at debian.org>  Thu, 23 May 2013 11:20:02 -0500
 
diff --git a/debian/control b/debian/control
index 5f70182..2eb0121 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 Recommends: ruby-sass, ruby-html2haml, ruby-erubis
-Suggests: rails3
+Suggests: rails3, yard
 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/html2haml.1 b/debian/html2haml.1
deleted file mode 100644
index 9ea2932..0000000
--- a/debian/html2haml.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH html2haml 1 "December 18, 2008"
-.SH NAME
-html2haml - Transforms an HTML file into corresponding Haml code.
-.SH SYNOPSIS
-.B html2haml
-[options] [INPUT] [OUTPUT]
-.SH DESCRIPTION
-Transforms an HTML file into corresponding Haml code.
-.SH OPTIONS
-.TP 8
-.B \-e, \-\-erb
-Parse ERb tags.
-.TP 8
-.B \-\-no\-erb
-Don't parse ERb tags.
-.B \-r, \-\-rhtml
-Parse RHTML tags.
-.TP 8
-.B \-\-no\-rhtml
-Don't parse RHTML tags.
-.TP 8
-.B \-x, \-\-xhtml
-Parse the input using the more strict XHTML parser.
-.TP 8
-.B \-s, \-\-stdin
-Read input from standard input instead of an input file
-.TP 8
-.B \-\-trace
-Show a full traceback on error
-.TP 8
-.B \-?, \-h, \-\-help
-Show this message
-.TP 8
-.B \-v, \-\-version
-Print version
-.PP
-Please note this program's function is to make a \fIfirst approach\fR
-towards converting your HTML. Although usually it will give you a
-nearly good result, it will often need tweaking \- This is specially
-true when you are parsing RHTML, as it can include parsable and
-conditional tags which can be misinterpreted and break nesting.
-.SH SEE ALSO
-This program is shipped as part of the libhaml-ruby1.8 library
-package, you can check its corresponding documentation can be found in
-the libhaml-ruby-doc package.
-.SH AUTHOR
-This manual page was written by Gunnar Wolf <gwolf at debian.org>, based
-on the command-line output of this program, for the Debian GNU/Linux
-system (but may be freely used by others).
diff --git a/debian/install b/debian/install
deleted file mode 100644
index c9def05..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-VERSION*        /usr/lib/ruby/vendor_ruby/haml
diff --git a/debian/manpages b/debian/manpages
index 225609a..fc4ab3b 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1,2 +1 @@
-debian/html2haml.1
 debian/haml.1
diff --git a/debian/patches/avoid_rake_early_death b/debian/patches/avoid_rake_early_death
new file mode 100644
index 0000000..47e1e84
--- /dev/null
+++ b/debian/patches/avoid_rake_early_death
@@ -0,0 +1,25 @@
+Author: Gunnar Wolf <gwolf at debian.org>
+Forwarded: no
+Last-Update: 2013-05-23
+Description: The 'silence_warnings' function in Rakefile makes the
+ build fail, as it gives a nonfunctioning $stderr. We just comment out
+ its call.
+
+Index: ruby-haml/Rakefile
+===================================================================
+--- ruby-haml.orig/Rakefile	2013-05-23 14:31:24.000000000 -0500
++++ ruby-haml/Rakefile	2013-05-23 14:32:57.000000000 -0500
+@@ -48,9 +48,11 @@
+ end
+ 
+ begin
+-  silence_warnings do
++  # While clever, 'silence_warnings' makes the Debian build fail.
++  # We prefer having the warnings and having the build succeed.
++  #silence_warnings do
+     require 'yard'
+-  end
++  #end
+ 
+   namespace :doc do
+     desc "List all undocumented methods and classes."
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..42802a3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+avoid_rake_early_death
diff --git a/debian/rules b/debian/rules
index 236c5b7..5800730 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,11 +18,13 @@ override_dh_auto_build:
 	dh_auto_build
 	rake doc && mv doc yardoc
 
-override_dh_auto_install:
-	dh_auto_install
-	# Sass is installed via ruby-sass and not mandatory anyway.
-	rm debian/ruby-haml/usr/lib/ruby/vendor_ruby/sass.rb
-	rm debian/ruby-haml/usr/lib/ruby/vendor_ruby/sass/plugin.rb
+# override_dh_auto_install:
+# 	dh_auto_install
+override_dh_installdocs:
+	dh_installdocs
+	rm -r debian/ruby-haml/usr/share/doc/ruby-haml/yardoc/js debian/ruby-haml/usr/share/doc/ruby-haml/yardoc/css
+	ln -s ../../../../yard/templates/default/fulldoc/html/js debian/ruby-haml/usr/share/doc/ruby-haml/yardoc/js
+	ln -s ../../../../yard/templates/default/fulldoc/html/css debian/ruby-haml/usr/share/doc/ruby-haml/yardoc/css
 
 override_dh_auto_test:
 	dh_auto_test

-- 
ruby-haml.git