[DRE-commits] [ruby-hikidoc] 03/10: Copyright fixups, including patch for gemspec

[Caitlin Matos]

This is an automated email from the git hooks/post-receive script.

cm-guest pushed a commit to branch master
in repository ruby-hikidoc.

commit a514456bb14396e71f3040b5875d862e42dcd5fc
Author: Caitlin Matos <caitlin.matos at zoho.com>
Date:   Tue Jul 29 15:22:13 2014 -0400

    Copyright fixups, including patch for gemspec
    
    - updated d/copyright
    - gemspec uses an incorrect licence. See the header for
      01_correct_licence for more details.
    - added .pc to .gitignore
---
 .gitignore                        |  1 +
 debian/copyright                  |  9 ++++++---
 debian/patches/01_correct_licence | 18 ++++++++++++++++++
 debian/patches/series             |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d87d4be..6d96952 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.pc
 *.gem
 *.rbc
 .bundle
diff --git a/debian/copyright b/debian/copyright
index b93a434..9b9fe4e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,16 +3,19 @@ Upstream-Name: hikidoc
 Source: http://rubyforge.org/frs/?group_id=4649&release_id=44465
 
 Files: *
-Copyright: 2005 Kazuhiko <kazuhiko at fdiary.net>
+Copyright: 2013-2014 SHIBATA Hiroshi <shibata.hiroshi at gmail.com>
+           2005-2010 Kazuhiko <kazuhiko at fdiary.net>
 License: BSD-3-clause
 
 Files: lib/hikidoc.rb
-Copyright: 2005 Kazuhiko <kazuhiko at fdiary.net>
+Copyright: 2013 SHIBATA Hiroshi <shibata.hiroshi at gmail.com>
            2007 Minero Aoki
+           2005 Kazuhiko <kazuhiko at fdiary.net>
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2011 Youhei SASAKI <uwabami at gfd-dennou.org>
+Copyright: 2014 Caitlin Matos <caitlin.matos at zoho.com>
+           2011 Youhei SASAKI <uwabami at gfd-dennou.org>
 License: BSD-3-clause
 
 License: BSD-3-clause
diff --git a/debian/patches/01_correct_licence b/debian/patches/01_correct_licence
new file mode 100644
index 0000000..04778b0
--- /dev/null
+++ b/debian/patches/01_correct_licence
@@ -0,0 +1,18 @@
+Description: specify correct license in gemspec
+ This package is licensed under the 3-clause BSD licence, and the appropriate licence is included (in COPYING). However, the gemspec states it is under the MIT licence. This has been corrected upstream, but the change did not make it into the 0.1.0 release.
+ This patch can be safely removed when a new upstream release (> 0.1.0) is imported.
+Author: Caitlin Matos <caitlin.matos at zoho.com> 
+Last-Update: 2014-07-29 
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/hikidoc.gemspec
++++ b/hikidoc.gemspec
+@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
+   spec.description   = %q{'HikiDoc' is a text-to-HTML conversion tool for web writers.}
+   spec.summary       = %q{'HikiDoc' is a text-to-HTML conversion tool for web writers. HikiDoc allows you to write using an easy-to-read, easy-to-write plain text format, then convert it to structurally valid HTML (or XHTML).}
+   spec.homepage      = "https://github.com/hiki/hikidoc"
+-  spec.license       = "MIT"
++  spec.license       = "3-clause BSD license"
+ 
+   spec.files         = `git ls-files`.split($/)
+   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..dd42090
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_correct_licence

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-hikidoc.git