[DRE-commits] [ruby-base32] 01/04: fix version.rb conflict

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-base32.

commit 2c67d2be8bdf1663342a13798f6e173daec94dc4
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Jun 6 12:41:47 2016 +0530

    fix version.rb conflict
---
 debian/changelog                 |  6 ++++++
 debian/patches/fix-version.patch | 14 ++++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     | 13 +++++++++++++
 4 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 395caa0..fa0a671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-base32 (0.3.2-3) UNRELEASED; urgency=medium
+
+  * Fix version.rb conflict (Closes: #826108) 
+
+ -- Pirate Praveen <praveen at debian.org>  Mon, 06 Jun 2016 12:38:26 +0530
+
 ruby-base32 (0.3.2-2) unstable; urgency=medium
 
   * Remove git usage in gemspec 
diff --git a/debian/patches/fix-version.patch b/debian/patches/fix-version.patch
new file mode 100644
index 0000000..967d0e5
--- /dev/null
+++ b/debian/patches/fix-version.patch
@@ -0,0 +1,14 @@
+https://github.com/stesla/base32/pull/11
+
+Index: ruby-base32/base32.gemspec
+===================================================================
+--- ruby-base32.orig/base32.gemspec
++++ ruby-base32/base32.gemspec
+@@ -1,5 +1,5 @@
+-$:.push File.expand_path('../lib', __FILE__)
+-require 'version'
++$:.unshift File.expand_path('../lib', __FILE__)
++require 'base32/version'
+ 
+ Gem::Specification.new do |s|
+   s.name    = 'base32'
diff --git a/debian/patches/series b/debian/patches/series
index 0a1e876..b661f58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove-git-in-gemspec.patch
+fix-version.patch
diff --git a/debian/rules b/debian/rules
index 3454d59..438cbb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,16 @@ export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_install:
+	mkdir -p lib/base32
+	cp lib/version.rb lib/base32
+	mv lib/version.rb debian
+	dh_auto_install
+
+clean:
+	mkdir -p lib/base32
+	cp -f lib/version.rb lib/base32
+	dh_clean
+	rm -rf lib/base32/version.rb
+	test -f debian/version.rb && mv debian/version.rb .

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