[DRE-commits] [ruby-rspec] 05/05: simplify even more the process of a new upstream

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-rspec.

commit c9fcfa238b1b5c030a63b711076967ffc03e6fa2
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Sep 19 12:40:48 2016 -0300

    simplify even more the process of a new upstream
    
    at least from my POV :-p
---
 debian/README.source | 17 ++++++++++++-----
 debian/rules         |  5 +++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 13197cd..fb057c4 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -35,13 +35,20 @@ tarball:
 
 Then use `gbp import-orig` as you normally would.
 
-Then use:
+Then do:
+
+- quilt push
+
+  will push the first patch, which modifies the gemspecs
 
 - debian/rules gen-gemspecs:
     interpret upstream 'source' gemspec to real ones, with shell commands
-    (calls to git), and store them in the debian/ directory
-    to be committed to the master branch
-    update then debian/patches/gemspecs.patch with the diff between upstream
-    source gemspecs and the generated ones.
+    (calls to git), and store replace the original ones
+
+- quilt refresh
+
+- then continue with `quilt push`, hack, `quilt refresh`, etc, until all the
+  patchs are refreshed.
 
  -- Cédric Boutillier <boutil at debian.org> 2015-06-15
+ -- Antonio Terceiro <terceiro at debian.org> 2016-09-19
diff --git a/debian/rules b/debian/rules
index 40db10d..5d0d63f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,11 +77,12 @@ get-orig-sources:
 
 gen-gemspecs:
 	# Let's create a static version of the gemspec as we don't build with git
-	ruby -rrubygems -e ' \
+	ruby -rrubygems -rfileutils -e ' \
 		%w{rspec rspec-core rspec-expectations rspec-mocks rspec-support}.each do |gem| \
 			Dir.chdir(gem) do \
 				spec = Gem::Specification.load("#{gem}.gemspec"); \
-				File.write("../debian/#{gem}.gemspec", spec.to_ruby); \
+				File.write("#{gem}.gemspec.new", spec.to_ruby); \
+				FileUtils.mv("#{gem}.gemspec.new", "#{gem}.gemspec"); \
 			end; \
 		end \
 		'

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