Final changes for release 1.25.

6 files changed, 22 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 6783796..5dfc000 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,16 +2,20 @@ Gemfile.lock
 spec/ldap.yml
 .rvmrc
 pkg/
-*.swp
 *.pyc
 *.rbc
-html/
+*.swp
+*~
+.DS_Store
+.rake_tasks~
+.source_index
+Gemfile.lock
+coverage.info
+coverage/
 doc/
+html/
 publish/
-coverage/
-coverage.info
-.rake_tasks~
-.DS_Store
-website/index.html
 research/
-.source_index
+website/index.html
+pkg/
+publish/
diff --git a/Gemfile b/Gemfile
index bdc83af..174f15f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,6 @@ gem "hoe-rubygems", "~>1.0", :group => [:development, :test]
 gem "hoe-travis", "~>1.2", :group => [:development, :test]
 gem "rake", "~>10.0", :group => [:development, :test]
 gem "rspec", "~>2.0", :group => [:development, :test]
-gem "hoe", "~>3.6", :group => [:development, :test]
+gem "hoe", "~>3.7", :group => [:development, :test]
 
 # vim: syntax=ruby
diff --git a/History.rdoc b/History.rdoc
index 27ce620..69e5ddc 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -1,4 +1,4 @@
-== 1.2.5 / 2013-11-07
+== 1.2.5 / 2013-11-08
 
 * Bugs fixed:
   * Comparing arrays flattened them too far, especially with Diff::LCS.sdiff.
diff --git a/README.rdoc b/README.rdoc
index fcb0998..fd6964e 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,9 +1,9 @@
 = Diff::LCS
 
-home  :: http://diff-lcs.rubyforge.org/
-code  :: https://github.com/halostatue/diff-lcs
-bugs  :: https://github.com/halostatue/diff-lcs/issues
-rdoc  :: http://rubydoc.info/github/halostatue/diff-lcs
+home :: http://diff-lcs.rubyforge.org/
+code :: https://github.com/halostatue/diff-lcs
+bugs :: https://github.com/halostatue/diff-lcs/issues
+rdoc :: http://rubydoc.info/github/halostatue/diff-lcs
 
 == Description
 
diff --git a/Rakefile b/Rakefile
index f8330bc..5186800 100644
--- a/Rakefile
+++ b/Rakefile
@@ -22,6 +22,8 @@ Hoe.spec 'diff-lcs' do
   self.readme_file = 'README.rdoc'
   self.extra_rdoc_files = FileList["*.rdoc"].to_a
 
+  %w(MIT Perl\ Artistic\ v2 GNU\ GPL\ v2).each { |l| self.license l }
+
   self.extra_dev_deps << ['hoe-bundler', '~> 1.2']
   self.extra_dev_deps << ['hoe-doofus', '~> 1.0']
   self.extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
diff --git a/diff-lcs.gemspec b/diff-lcs.gemspec
index 530d81f..016a7b4 100644
--- a/diff-lcs.gemspec
+++ b/diff-lcs.gemspec
@@ -6,14 +6,14 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Austin Ziegler"]
-  s.date = "2013-11-07"
+  s.date = "2013-11-08"
   s.description = "Diff::LCS computes the difference between two Enumerable sequences using the\nMcIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities\nto create a simple HTML diff output format and a standard diff-like tool.\n\nThis is release 1.2.4, fixing a bug introduced after diff-lcs 1.1.3 that did\nnot properly prune common sequences at the beginning of a comparison set.\nThanks to Paul Kunysch for fixing this issue.\n\nCoincident with the release of diff-lcs 1.2.3, we reported an issue with\nRubinius in 1.9 mode\n({rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268]).\nWe are happy to report that this issue has been resolved."
   s.email = ["austin@rubyforge.org"]
   s.executables = ["htmldiff", "ldiff"]
   s.extra_rdoc_files = ["Contributing.rdoc", "History.rdoc", "License.rdoc", "Manifest.txt", "README.rdoc", "docs/COPYING.txt", "docs/artistic.txt", "Contributing.rdoc", "History.rdoc", "License.rdoc", "README.rdoc"]
   s.files = [".autotest", ".gemtest", ".hoerc", ".rspec", ".travis.yml", "Contributing.rdoc", "Gemfile", "History.rdoc", "License.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "autotest/discover.rb", "bin/htmldiff", "bin/ldiff", "docs/COPYING.txt", "docs/artistic.txt", "lib/diff-lcs.rb", "lib/diff/lcs.rb", "lib/diff/lcs/array.rb", "lib/diff/lcs/block.rb", "lib/diff/lcs/callbacks.rb", "lib/diff/lcs/change.rb", "lib/diff/lcs/htmldiff.rb", "lib/diff/lcs/hunk.rb", "lib/diff/lcs/internals.rb", "lib/diff/lcs/ldiff.rb", "lib/diff/lcs/string.rb", "spec/change_spec.rb", "spec/diff_spec.rb", "spec/hunk_spec.rb", "spec/issues_spec.rb", "spec/lcs_spec.rb", "spec/patch_spec.rb", "spec/sdiff_spec.rb", "spec/spec_helper.rb", "spec/traverse_balanced_spec.rb", "spec/traverse_sequences_spec.rb"]
   s.homepage = "http://diff-lcs.rubyforge.org/"
-  s.licenses = ["MIT"]
+  s.licenses = ["MIT", "Perl Artistic v2", "GNU GPL v2"]
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "diff-lcs"