[DRE-commits] [SCM] ruby-haml.git branch, master, updated. upstream/3.1.4-5-g60354fe

Paul van Tilburg paulvt at debian.org
Fri Dec 16 14:55:19 UTC 2011


The following commit has been merged in the master branch:
commit 7960e862614ae3e5ecf088787197593654b8633e
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Dec 16 15:42:02 2011 +0100

    New upstream release;  merged changes from the old libhaml-ruby package.
    
    * New upstream release.
    * Source packages adapted according to the new Ruby policy:
      - Build for both ruby1.8 and ruby1.9.1.
      - Migrated to pkg-ruby-extras git repos; changed the Vcs-* fields in
        debian/control accordingly.
      - Changed the depends and recommends to follow the new Ruby library
        naming scheme.
    * debian/control:
      - Added a default DM-Upload-Allowed field set to yes.
      - Standards-Version bumped to 3.9.2; no changes required.
      - Set XS-Ruby-Versions to all.
      - Changed the build-depends for using gem2deb instead of ruby-pkg-tools.
      - Switched the maintainer with the uploaders field as per new
        convention the team is the default maintainer.
      - Added a build-depend-indep on rake, yard (>= 0.5.3), ruby-sass and
        ruby-maruku (>= 0.5.9) for documentation generation.
      - Added a build-deped-indep on rails for the tests.
      - Added a recommend on ruby-sass as it is no longer included in Haml
        upstream (not even from the vendor dir).
      - Added libhaml-ruby, libhaml-ruby1.8, libhaml-ruby-doc and haml-elisb
        as transitional packages.
    * debian/copyright: reworked to fit the DEP5 format.
    * debian/docs: install generated docs
    * debian/manpages: install manpages debian/html2haml.1 and debian/haml.1.
    * debian/rules:
      - Call `rake doc` to generate documentation using yard.
      - Disable tests for now... it doesn't seem to work at all with our
        Rails 2.0 setup.
      - Remove the installed sass.rb dummy library that loads Sass via
        a gem/from the vendor dir.

diff --git a/debian/changelog b/debian/changelog
index 305611a..df69e14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,309 @@
 ruby-haml (3.1.4-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * New upstream release.
+  * Source packages adapted according to the new Ruby policy:
+    - Build for both ruby1.8 and ruby1.9.1.
+    - Migrated to pkg-ruby-extras git repos; changed the Vcs-* fields in
+      debian/control accordingly.
+    - Changed the depends and recommends to follow the new Ruby library
+      naming scheme.
+  * debian/control:
+    - Added a default DM-Upload-Allowed field set to yes.
+    - Standards-Version bumped to 3.9.2; no changes required.
+    - Set XS-Ruby-Versions to all.
+    - Changed the build-depends for using gem2deb instead of ruby-pkg-tools.
+    - Switched the maintainer with the uploaders field as per new
+      convention the team is the default maintainer.
+    - Added a build-depend-indep on rake, yard (>= 0.5.3), ruby-sass and
+      ruby-maruku (>= 0.5.9) for documentation generation.
+    - Added a build-deped-indep on rails for the tests.
+    - Added a recommend on ruby-sass as it is no longer included in Haml
+      upstream (not even from the vendor dir).
+    - Added libhaml-ruby, libhaml-ruby1.8, libhaml-ruby-doc and haml-elisb
+      as transitional packages.
+  * debian/copyright: reworked to fit the DEP5 format.
+  * debian/docs: install generated docs
+  * debian/manpages: install manpages debian/html2haml.1 and debian/haml.1. 
+  * debian/rules:
+    - Call `rake doc` to generate documentation using yard.
+    - Disable tests for now... it doesn't seem to work at all with our
+      Rails 2.0 setup.
+    - Remove the installed sass.rb dummy library that loads Sass via
+      a gem/from the vendor dir.
 
- -- Paul van Tilburg <paulvt at debian.org>  Fri, 16 Dec 2011 14:21:50 +0100
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 16 Dec 2011 15:38:21 +0100
+
+libhaml-ruby (3.0.25-2) unstable; urgency=low
+
+  * Squeeze freeze is over - Reupload, targetting at unstable instead of
+    experimental
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 08 Feb 2011 21:02:36 -0600
+
+libhaml-ruby (3.0.25-1) unstable; urgency=low
+
+  * New upstream release
+  * Targetting experimental in order not to interfere with Squeeze's
+    freeze
+
+ -- Gunnar Wolf <gwolf at debian.org>  Mon, 20 Dec 2010 12:32:14 -0600
+
+libhaml-ruby (3.0.24-1) experimental; urgency=low
+
+  * New upstream release
+  * Targetting experimental in order not to interfere with Squeeze's
+    freeze
+
+ -- Gunnar Wolf <gwolf at debian.org>  Wed, 24 Nov 2010 09:05:39 -0600
+
+libhaml-ruby (3.0.22-1) experimental; urgency=low
+
+  * New upstream release
+  * Targetting experimental in order not to interfere with Squeeze's freeze
+
+ -- Gunnar Wolf <gwolf at debian.org>  Sat, 23 Oct 2010 10:46:11 -0500
+
+libhaml-ruby (3.0.21-1) experimental; urgency=low
+
+  * New upstream release
+  * Targetting experimental in order not to interfere with Squeeze's freeze
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 12 Oct 2010 11:49:04 -0500
+
+libhaml-ruby (3.0.18-1) experimental; urgency=low
+
+  * New upstream release
+  * Targetting experimental in order not to interfere with Squeeze's freeze
+
+ -- Gunnar Wolf <gwolf at debian.org>  Sun, 12 Sep 2010 21:23:41 -0500
+
+libhaml-ruby (3.0.15-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated the upstream homepage
+  * Added "Recommends: libfssm-ruby1.8" to libhaml-ruby1.8 binary
+    package (Closes: #586613)
+  * Standards-version: 3.8.4→3.9.1 (no changes needed)
+  * Updated man pages to match current options (Closes: #589119)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 29 Jul 2010 17:14:47 -0400
+
+libhaml-ruby (3.0.12-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Deepak Tripathi <apenguinlinux at gmail.com>  Sat, 12 Jun 2010 21:41:58 +0530
+
+libhaml-ruby (3.0.10-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Mon, 07 Jun 2010 19:24:24 -0500
+
+libhaml-ruby (3.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Deepak Tripathi <apenguinlinux at gmail.com>  Thu, 03 Jun 2010 11:51:08 +0530
+
+libhaml-ruby (3.0.6-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control
+ 	+ added DMUA flag.
+
+ -- Deepak Tripathi <apenguinlinux at gmail.com>  Thu, 27 May 2010 10:59:02 +0530
+
+libhaml-ruby (3.0.4-1) unstable; urgency=low
+
+  * New upstream release (Closes: #581677)
+  * debian/copyright
+       + updated copyright information.
+       + added debian related copyright information.
+  * debian/rules
+       + removed patchsys-quilt.mk.
+       + removed rdoc from rules.it is provided as virtual package
+         with standard ruby.
+  * debian/control
+       + added myself to uploaders.
+  * debian/patches
+       + added patches for hard coded gem path.
+  * debian/haml.1
+       + removed hyphen-used-as-minus-sign.
+  * debian/
+       + update README.source.
+       + created man page for sass-convert.
+
+ -- Deepak Tripathi <apenguinlinux at gmail.com>  Mon, 17 May 2010 17:03:04 -0400
+
+libhaml-ruby (2.2.24-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 29 Apr 2010 21:00:21 -0500
+
+libhaml-ruby (2.2.23-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 22 Apr 2010 00:13:36 -0500
+
+libhaml-ruby (2.2.22-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated debian/watch to ignore versions with nonnumeric components
+    (i.e. 'beta')
+  * Set source format to 3.0 (quilt), lintian looks happier
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 09 Apr 2010 08:19:19 -0500
+
+libhaml-ruby (2.2.21-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Sun, 14 Mar 2010 19:04:18 -0600
+
+libhaml-ruby (2.2.20-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 16 Feb 2010 11:07:32 -0600
+
+libhaml-ruby (2.2.19-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove debian/patches/fix-emacs-mode, change included upstream
+  * Bump Standards-Version (no changes)
+
+ -- Micah Anderson <micah at debian.org>  Fri, 12 Feb 2010 12:23:49 -0500
+
+libhaml-ruby (2.2.17-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 28 Jan 2010 14:24:49 -0600
+
+libhaml-ruby (2.2.16-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Sun, 20 Dec 2009 18:37:44 -0600
+
+libhaml-ruby (2.2.15-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Wed, 02 Dec 2009 16:20:12 -0600
+
+libhaml-ruby (2.2.14-1) unstable; urgency=low
+
+  * New upstream release
+  * Moved binary package ruby-elisp to section: lisp
+  * Binary package ruby-elisp now also depends on emacs23 | ruby-elisp (as
+    emacs23 provides ruby-mode) (Closes: #557190)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Wed, 11 Nov 2009 22:39:00 -0600
+
+libhaml-ruby (2.2.13-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Wed, 11 Nov 2009 11:49:08 -0600
+
+libhaml-ruby (2.2.10-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Sat, 31 Oct 2009 19:37:38 -0600
+
+libhaml-ruby (2.2.8-2) unstable; urgency=low
+
+  * Include haml-elisp.emacsen-startup so the Emacs modes do not have to
+    be explicitly called (Closes: #551258)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 16 Oct 2009 17:51:58 -0500
+
+libhaml-ruby (2.2.8-1) unstable; urgency=medium
+
+  * New upstream release; fixes potential XSS isue due to incomplete
+    HTML/Unicode escaping —
+    http://github.com/nex3/haml/commit/fcf0d8ff743e947d0f4f563b07770310132d4fc6
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 13 Oct 2009 14:15:30 -0500
+
+libhaml-ruby (2.2.6-1) unstable; urgency=low
+
+  [ Joshua Timberman ]
+  * Suggest, not recommend, rails and hpricot so they are not auto installed
+
+  [ Gunnar Wolf ]
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 29 Sep 2009 18:41:06 -0500
+
+libhaml-ruby (2.2.5-1) unstable; urgency=low
+
+  * New upstream release
+  * Standards-version → 3.8.3 (no changes)
+  * Added README.source, keeping lintian at ease
+  * Actually do the right thing to avoid being compiled with emacs21,
+    instead of just conflicting with the whole package. Thanks to Aaron
+    M. Ucko for pestering me in the right direction! (Closes: #536091)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 18 Sep 2009 17:56:25 -0500
+
+libhaml-ruby (2.2.0-2) unstable; urgency=low
+
+  [ Ryan Niebur ]
+  * Add myself to Uploaders
+  * install VERSION_NAME, fixing the errors during load
+
+  [ Gunnar Wolf ]
+  * Patched haml-mode.el to avoid compile-time (and thus, install-time)
+    error. Had to also declare Conflicts: on emacs21 (which is going
+    away soon anyway) as author will explicitly not support it. (Closes:
+    #536091)
+  * Thanks to Axel Beckert for his help with elisp!
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 04 Aug 2009 16:19:07 -0500
+
+libhaml-ruby (2.2.0-1) unstable; urgency=low
+
+  [ Ryan Niebur ]
+  * fix watch file
+
+  [ Gunnar Wolf ]
+  * Changed section to Ruby as per ftp-masters' request
+  * New upstream release
+  * Updated standards-version 3.8.0→3.8.2 (no changes needed)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Mon, 06 Jul 2009 17:02:01 -0500
+
+libhaml-ruby (2.0.9-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 24 Feb 2009 07:45:50 -0600
+
+libhaml-ruby (2.0.8-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixed debian/watch, which included "/" as part of the directory name
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 13 Feb 2009 18:56:19 -0600
+
+libhaml-ruby (2.0.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Added missing misc:Depends to haml-elisp
+  * 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)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 19 Dec 2008 15:12:11 -0600
diff --git a/debian/control b/debian/control
index 81b3be2..db5b1d5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,14 @@ Source: ruby-haml
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders:  <paulvt at debian.org>
+Uploaders: Paul van Tilburg <paulvt at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.12~)
+Build-Depends-Indep: rake, yard (>= 0.5.3), ruby-maruku (>= 0.5.9), ruby-sass,
+ rails
 Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-haml.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-haml.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-haml.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-haml.git;a=summary
 Homepage: http://haml-lang.com/
 XS-Ruby-Versions: all
 
@@ -15,12 +17,53 @@ Package: ruby-haml
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# yard (>= 0.5.3, development), maruku (>= 0.5.9, development)
-Description: An elegant, structured XHTML/XML templating engine.
+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
+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 non-repetitive, elegant, easy way,
- using indentation rather than closing tags
- and allowing Ruby to be embedded with ease.
- It was originally envisioned as a plugin for Ruby on Rails,
- but it can function as a stand-alone templating engine.
+ that's designed to express the structure of XHTML or XML documents in a
+ non-repetitive, elegant, easy way, using indentation rather than closing
+ tags and allowing Ruby to be embedded with ease.
+ .
+ It was originally envisioned as a plugin for Ruby on Rails, but it can
+ function as a stand-alone templating engine.
+
+Package: libhaml-ruby1.8
+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. It can safely be removed.
+
+Package: libhaml-ruby
+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. It can safely be removed.
+
+Package: libhaml-ruby-doc
+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. 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/copyright b/debian/copyright
index 1c6f3bb..81ac7d6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,53 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: haml
-Source: FIXME <http://example.com/>
+Source: https://github.com/nex3/haml
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+Copyright: 2006–2009, Hampton Catlin and Nathan Weizenbaum
+License: MIT
+
+Files: vendor/fssm/*
+Copyright: 2009, Travis Tilley
+License: MIT
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Files: debian/*
-Copyright: 2011  <paulvt at debian.org>
-License:
- [LICENSE TEXT]
+Copyright: 2011, Paul van Tilburg <paulvt at debian.org>
+           2010, Deepak Tripathi <apenguinlinux at gmail.com>
+           2008–2010, Gunnar Wolf <gwolf at debian.org>
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, version 2 of the License, or (at your opinion)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this package; if not, write to the Free Software Foundation, Inc., 
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..3c6b174
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+yardoc/
diff --git a/debian/haml.1 b/debian/haml.1
new file mode 100644
index 0000000..ae5fb68
--- /dev/null
+++ b/debian/haml.1
@@ -0,0 +1,57 @@
+.TH haml 1 "December 18, 2008"
+.SH NAME
+haml \- Translates Haml markup into its HTML equivalent
+.SH SYNOPSIS
+.B haml
+[options] [INPUT] [OUTPUT]
+.SH DESCRIPTION
+Uses the Haml engine to parse the selected template and outputs the
+result to the specified file. 
+.SH OPTIONS
+.TP 8
+.B \-\-rails RAILS_DIR
+Install Haml and Sass to a Rails project
+.TP 8
+.B \-c, \-\-check
+Just check syntax, don't evaluate.
+.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 \-t, \-\-style NAME                 
+Output style. Can be indented (default) or ugly.
+.TP 8
+.B \-f, \-\-format NAME                
+Output format. Can be xhtml (default), html4, or html5.
+.TP 8
+.B \-e, \-\-escape\-html                
+Escape HTML characters (like ampersands and angle brackets) by default.
+.TP 8
+.B \-q, \-\-double\-quote\-attributes
+Set attribute wrapper to double-quotes (default is single).
+.TP 8
+.B \-r, \-\-require FILE               
+Same as 'ruby \-r'.
+.TP 8
+.B \-I, \-\-load-path PATH             
+Same as 'ruby \-I'.
+.TP 8
+.B \-\-debug                      
+Print out the precompiled Ruby source.
+.TP 8
+.B \-?, \-h, \-\-help                   
+Show a usage summary
+.TP 8
+.B \-v, \-\-version                    
+Print version
+.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/html2haml.1 b/debian/html2haml.1
new file mode 100644
index 0000000..9ea2932
--- /dev/null
+++ b/debian/html2haml.1
@@ -0,0 +1,49 @@
+.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/manpages b/debian/manpages
new file mode 100644
index 0000000..225609a
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,2 @@
+debian/html2haml.1
+debian/haml.1
diff --git a/debian/ruby-haml.docs b/debian/ruby-haml.docs
deleted file mode 100644
index 07b3c9e..0000000
--- a/debian/ruby-haml.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-# FIXME: READMEs found
-# README.md
diff --git a/debian/rules b/debian/rules
index a5e7dc8..e68ba45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 #export DH_VERBOSE=1
 #
 # Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
+export DH_RUBY_IGNORE_TESTS=all
 #
 # Uncomment to ignore some test failures (but the tests will run anyway).
 # Valid values:
@@ -13,3 +13,16 @@
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+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
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf .yardoc yardoc

-- 
ruby-haml.git



More information about the Pkg-ruby-extras-commits mailing list