[DRE-commits] [SCM] gem2deb.git branch, master, updated. 0.3.1-23-ge069485

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit d374e2c498177df300d05219db0562e537528c31
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu May 30 16:15:54 2013 -0300

    Install CHANGELOG* as upstream changelog
    
    Closes: #702160

diff --git a/lib/gem2deb/installer.rb b/lib/gem2deb/installer.rb
index 710b357..21fd2ff 100644
--- a/lib/gem2deb/installer.rb
+++ b/lib/gem2deb/installer.rb
@@ -47,6 +47,7 @@ module Gem2Deb
       end
 
       install_symlinks
+      install_changelog
     end
 
     def update_shebangs
@@ -271,6 +272,13 @@ module Gem2Deb
       Dir["debian/#{binary_package}/usr/lib/ruby/vendor_ruby/**/*.rb"]
     end
 
+    def install_changelog
+      Dir.glob(File.join(root, 'CHANGELOG*')).each do |changelog|
+        changelog = File.basename(changelog)
+        run("dh_installchangelogs -p#{binary_package} #{changelog} upstream")
+      end
+    end
+
   end
 
 end
diff --git a/test/integration/gem2deb_test.rb b/test/integration/gem2deb_test.rb
index 9ac6e70..d32e7ec 100644
--- a/test/integration/gem2deb_test.rb
+++ b/test/integration/gem2deb_test.rb
@@ -55,10 +55,17 @@ class Gem2DebTest < Gem2DebTestCase
   end
 
   self.build_tree('test/sample/examples') do |dir|
+
     should 'not compress *.rb files installed as examples' do
       assert_no_file_exists "#{dir}/debian/ruby-examples/usr/share/doc/ruby-examples/examples/test.rb.gz"
       assert_file_exists "#{dir}/debian/ruby-examples/usr/share/doc/ruby-examples/examples/test.rb"
     end
+
+    should 'install CHANGELOG.rdoc as upstream changelog' do
+      changelog = "#{dir}/debian/ruby-examples/usr/share/doc/ruby-examples/changelog.gz"
+      assert_file_exists changelog
+    end
+
   end
 
 end
diff --git a/test/sample/examples/CHANGELOG.rdoc b/test/sample/examples/CHANGELOG.rdoc
new file mode 100644
index 0000000..5bb306c
--- /dev/null
+++ b/test/sample/examples/CHANGELOG.rdoc
@@ -0,0 +1 @@
+upstream changelog here
diff --git a/test/sample/examples/debian/changelog b/test/sample/examples/debian/changelog
index 6ad6d79..3fb95f6 100644
--- a/test/sample/examples/debian/changelog
+++ b/test/sample/examples/debian/changelog
@@ -1,4 +1,4 @@
-ruby-examples (0.1) UNRELEASED; urgency=low
+ruby-examples (0.1-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #nnnn)
 

-- 
gem2deb.git