[DRE-commits] [SCM] ruby-tilt.git branch, master, updated. debian/1.2.2-1-3-g2080e34

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 2080e34b438a0df6570a23cffb11a8822f661d22
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Jul 26 04:16:17 2011 +0900

    New upstream release, closes #628271
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/changelog b/debian/changelog
index f3968fa..e9fe0c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-tilt (1.3.2-1) unstable; urgency=low
+
+  * New Upstream version: 1.3.2
+  * Fix FTBTS: add Encoding.default_external in ruby-tests.rb (Closes: #628271)
+  * Bump Standard Version: 3.9.2
+  * Add manpage for /usr/bin/tilt
+  * Add me to Uploaders
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Tue, 26 Jul 2011 04:10:13 +0900
+
 ruby-tilt (1.2.2-1) unstable; urgency=low
 
   * Initial release.
diff --git a/debian/control b/debian/control
index 50a4b26..303c2fd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,12 @@ Source: ruby-tilt
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>
+Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>, Youhei SASAKI <uwabami at gfd-dennou.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1),
+ libnokogiri-ruby1.8 | ruby-nokogiri, libnokogiri-ruby1.9.1 | ruby-nokogiri
 # contest (>= 0, development), builder (>= 0, development), erubis (>= 0, development), haml (>= 2.2.11, development), rdiscount (>= 0, development), liquid (>= 0, development), less (>= 0, development), radius (>= 0, development), nokogiri (>= 0, development), markaby (>= 0, development), coffee-script (>= 0, development)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-tilt.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-tilt.git;a=summary
 Homepage: http://github.com/rtomayko/tilt/
@@ -15,7 +16,7 @@ XS-Ruby-Versions: all
 Package: ruby-tilt
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 Description: Generic interface to multiple Ruby template engines
  Tilt is a thin interface over a bunch of different Ruby template engines in an
  attempt to make their usage as generic possible. This is useful for web
diff --git a/debian/copyright b/debian/copyright
index 6a53995..16d3069 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,7 +18,7 @@ License: MIT
  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 BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+ THE AUTHORS 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.
 
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index 03b1487..8cffe7b 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,2 +1,5 @@
+if RUBY_VERSION >= '1.9.1'
+  Encoding.default_external = "UTF-8"
+end
 $: << 'lib' << 'test' << '.'
 Dir['test/**/*.rb'].each { |f| require f }
diff --git a/debian/ruby-tilt.manpages b/debian/ruby-tilt.manpages
new file mode 100644
index 0000000..68ed002
--- /dev/null
+++ b/debian/ruby-tilt.manpages
@@ -0,0 +1 @@
+debian/tilt.1
diff --git a/debian/tilt.1 b/debian/tilt.1
new file mode 100644
index 0000000..26d3a28
--- /dev/null
+++ b/debian/tilt.1
@@ -0,0 +1,43 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
+.TH TILT "1" "July 2011" "tilt 1.3.2" "tilt"
+.SH NAME
+tilt \- Generic interface to multiple Ruby template engines
+.SH SYNOPSIS
+.B tilt
+\fI<options> <file>\fR
+.SH DESCRIPTION
+Process template <file> and write output to stdout. With no <file> or
+when <file> is '\-', read template from stdin and use the \fB\-\-type\fR option
+to determine the template's type.
+.PP
+Options
+.TP
+\fB\-l\fR, \fB\-\-list\fR
+List template engines + file patterns and exit
+.HP
+\fB\-t\fR, \fB\-\-type=\fR<pattern> Use this template engine; required if no <file>
+.TP
+\fB\-y\fR, \fB\-\-layout=\fR<file>
+Use <file> as a layout template
+.TP
+\fB\-D\fR<name>=<value>
+Define variable <name> as <value>
+.TP
+\fB\-o\fR, \fB\-\-vars=\fR<ruby>
+Evaluate <ruby> to Hash and use for variables
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show this help message
+.SS "Convert markdown to HTML:"
+.IP
+$ tilt foo.markdown > foo.html
+.SS "Process ERB template:"
+.IP
+$ echo "Answer: <%= 2 + 2 %>" | tilt \fB\-t\fR erb
+Answer: 4
+.SS "Define variables:"
+.IP
+$ echo "Answer: <%= 2 + n %>" | tilt \fB\-\-locals=\fR"{:n=>40, :x=>0}"
+Answer: 42
+$ echo "Answer: <%= 2 + n %>" | tilt \fB\-Dn\fR=\fI40\fR \fB\-Dx\fR=\fI0\fR
+Answer: 42

-- 
ruby-tilt.git