[DRE-commits] [ruby-aws] 01/03: fix version.rb

[Praveen Arimbrathodiyil]

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

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

commit dadc9cea05db6103e014a1dd2ed1c6644ba2ad9a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Jun 6 14:26:46 2016 +0530

    fix version.rb
---
 debian/changelog                                  |  7 +++++++
 debian/patches/0011_fix_version_rb_conflict.patch | 11 +++++++++++
 debian/patches/series                             |  1 +
 debian/rules                                      | 10 ++++++++++
 4 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7feffaf..adf51e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-aws (2.10.2-4) unstable; urgency=medium
+
+  * Team upload
+  * Fix version.rb conflict (Closes: #826107)
+
+ -- Pirate Praveen <praveen at debian.org>  Mon, 06 Jun 2016 14:26:26 +0530
+
 ruby-aws (2.10.2-3) unstable; urgency=medium
 
   * debian/rules: Renamed aws gem from 'aws' to 'ruby-aws' due to the conflict
diff --git a/debian/patches/0011_fix_version_rb_conflict.patch b/debian/patches/0011_fix_version_rb_conflict.patch
new file mode 100644
index 0000000..47bb887
--- /dev/null
+++ b/debian/patches/0011_fix_version_rb_conflict.patch
@@ -0,0 +1,11 @@
+Index: ruby-aws/aws.gemspec
+===================================================================
+--- ruby-aws.orig/aws.gemspec
++++ ruby-aws/aws.gemspec
+@@ -1,5 +1,5 @@
+ 
+-require File.expand_path('../lib/version', __FILE__)
++require File.expand_path('../lib/ruby-aws/version', __FILE__)
+ 
+ Gem::Specification.new do |gem|
+   gem.authors       = ["Travis Reeder", "Chad Arimura", "RightScale"]
diff --git a/debian/patches/series b/debian/patches/series
index a66f2d2..ea220c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0010_update_readme_after_rename.patch
+0011_fix_version_rb_conflict.patch
diff --git a/debian/rules b/debian/rules
index 6044a6f..b6ea5e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,16 @@
 
 # We are renaming aws to ruby-aws and then cleaning up after the gem is installed
 override_dh_auto_install:
+	mkdir -p $(CURDIR)/lib/ruby-aws
+	cp $(CURDIR)/lib/version.rb $(CURDIR)/lib/ruby-aws
+	mv $(CURDIR)/lib/version.rb $(CURDIR)/debian
 	mv $(CURDIR)/lib/aws.rb $(CURDIR)/lib/ruby-aws.rb
 	dh_auto_install
 	mv $(CURDIR)/lib/ruby-aws.rb $(CURDIR)/lib/aws.rb
+
+clean:
+	mkdir -p $(CURDIR)/lib/ruby-aws
+	if [ -f $(CURDIR)/debian/version.rb ]; then mv $(CURDIR)/debian/version.rb $(CURDIR)/lib; fi
+	cp -f $(CURDIR)/lib/version.rb $(CURDIR)/lib/ruby-aws
+	dh_clean
+	rm -rf lib/ruby-aws/version.rb

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