[DRE-commits] [SCM] ruby-html2haml.git branch, master, updated. upstream/1.0.1-5-g9b6db54

Thu May 23 22:36:08 UTC 2013

The following commit has been merged in the master branch:
commit 601c13184eb148d2e40894cf5122fdb206125d97
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Thu May 23 17:04:56 2013 -0500

    Initial packaging adequations

diff --git a/debian/changelog b/debian/changelog
index 1f11764..53b410b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-html2haml (1.0.1-1) UNRELEASED; urgency=low
+ruby-html2haml (1.0.1-1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * Initial release (Closes: #709507)
 
  -- Gunnar Wolf <gwolf at debian.org>  Thu, 23 May 2013 16:38:22 -0500
diff --git a/debian/control b/debian/control
index 7bc038d..f154bb7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,23 @@ Source: ruby-html2haml
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders:  <gwolf at debian.org>
+Uploaders: Gunnar Wolf <gwolf at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.1~)
+Build-Depends-Indep: ruby-hpricot (>= 0.8.6), ruby-erubis (>= 2.7.0), ruby-parser, ruby-haml (>= 4.0.0), ruby-minitest (>= 4.4.0), rake
 Standards-Version: 3.9.4
-#Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-html2haml.git
-#Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-html2haml.git;a=summary
-Homepage: http://haml.info
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-html2haml.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-html2haml.git;a=summary
+Homepage: https://github.com/haml/html2haml
 XS-Ruby-Versions: all
 
 Package: ruby-html2haml
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# hpricot (~> 0.8.6), erubis (~> 2.7.0), ruby_parser (~> 3.1.1), haml (>= 4.0.0.rc.1), simplecov (~> 0.7.1, development), minitest (~> 4.4.0, development), rake (>= 0, development)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-hpricot (>= 0.8.6), ruby-parser, ruby-haml (>= 4.0.0)
+Recommends: ruby-erubis (>= 2.7.0)
 Description: Converts HTML into Haml
- Converts HTML into Haml
+ This package was split by its upstream author from the 'Haml' gem
+ (package ruby-haml). It allows converting between HTML and HAML
+ markups, and while mainly aimed at being used within Ruby code,
+ includes an executable wrapper that allows it to be called from the
+ command line.
diff --git a/debian/copyright b/debian/copyright
index 3e745b3..17ebdca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,47 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: html2haml
-Source: FIXME <http://example.com/>
+Source: https://github.com/haml/html2haml
 
 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.
+	   2006-2013 Hampton Catlin, Nathan Weizenbaum and Norman Clarke <norman at njclarke.com>
+License: MIT
+  Copyright (c) 2006-2013 Hampton Catlin, Nathan Weizenbaum and Norman Clarke
+  .
+  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:
+  .
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+  .
+  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: 2013 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.
+ 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
+ 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'.
-
-Files: debian/*
-Copyright: 2013  <gwolf at debian.org>
-License:
- [LICENSE TEXT]
+ 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/patches/fix_test_path b/debian/patches/fix_test_path
new file mode 100644
index 0000000..44d7c52
--- /dev/null
+++ b/debian/patches/fix_test_path
@@ -0,0 +1,20 @@
+Description: Explicitly declare 'test' in the tests' search path
+Author: Gunnar Wolf <gwolf at debian.org>
+Bug-Debian: http://bugs.debian.org/709507
+Forwarded: not-needed
+Last-Update: 2013-05-23
+
+--- ruby-html2haml-1.0.1.orig/test/html2haml_test.rb
++++ ruby-html2haml-1.0.1/test/html2haml_test.rb
+@@ -1,3 +1,4 @@
++$: << './test'
+ require 'test_helper'
+ 
+ class Html2HamlTest < MiniTest::Unit::TestCase
+--- ruby-html2haml-1.0.1.orig/test/erb_test.rb
++++ ruby-html2haml-1.0.1/test/erb_test.rb
+@@ -1,3 +1,4 @@
++$: << './test'
+ require 'test_helper'
+ 
+ class ErbTest < MiniTest::Unit::TestCase
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a2958e4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_test_path
diff --git a/debian/ruby-html2haml.docs b/debian/ruby-html2haml.docs
index 07b3c9e..b43bf86 100644
--- a/debian/ruby-html2haml.docs
+++ b/debian/ruby-html2haml.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README.md
+README.md
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
index 6c92cb5..a3d628b 100644
--- a/debian/ruby-test-files.yaml
+++ b/debian/ruby-test-files.yaml
@@ -1,4 +1,3 @@
 ---
 - test/erb_test.rb
 - test/html2haml_test.rb
-- test/test_helper.rb

-- 
ruby-html2haml.git

