[DRE-commits] [tmuxinator] 03/05: Drop obsolete patch

Youhei SASAKI uwabami-guest at moszumanska.debian.org
Wed Jun 1 12:33:55 UTC 2016


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

uwabami-guest pushed a commit to branch master
in repository tmuxinator.

commit 3b63a4220b72ee72eb6204c0f219748b5e4a5417
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Wed Jun 1 21:23:07 2016 +0900

    Drop obsolete patch
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/changelog                                   | 14 ++++
 .../0003-Opening-will-not-recreate-projects.patch  | 76 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 14 insertions(+), 77 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b4c034..43e6de1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+tmuxinator (0.8.1-1) UNRELEASED; urgency=medium
+
+  [ Cédric Boutillier ]
+  * Remove version in the gem2deb build-dependency
+  * Use https:// in Vcs-* fields
+  * Use https:// in Vcs-* fields
+  * Bump Standards-Version to 3.9.7 (no changes needed)
+  * Run wrap-and-sort on packaging files
+
+  [ Youhei SASAKI ]
+  * Imported Upstream version 0.8.1
+
+ -- Cédric Boutillier <boutil at moszumanska.debian.org>  Wed, 01 Jun 2016 21:19:36 +0900
+
 tmuxinator (0.7.0-2) unstable; urgency=medium
 
   * Import upstream bug fix #358 (Closes: #807510)
diff --git a/debian/patches/0003-Opening-will-not-recreate-projects.patch b/debian/patches/0003-Opening-will-not-recreate-projects.patch
deleted file mode 100644
index e06efab..0000000
--- a/debian/patches/0003-Opening-will-not-recreate-projects.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 902942dc7dca98fe17d4775426b29bcf9eb4d6cf Mon Sep 17 00:00:00 2001
-From: Jonathan Arnett <jonarnett90 at gmail.com>
-Date: Wed, 18 Nov 2015 11:56:23 -0500
-Subject: [PATCH 2/7] Opening will not recreate projects
-
----
- lib/tmuxinator/cli.rb           |  2 +-
- spec/lib/tmuxinator/cli_spec.rb | 13 +++++++------
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/lib/tmuxinator/cli.rb b/lib/tmuxinator/cli.rb
-index 5b0b383..8648b77 100644
---- a/lib/tmuxinator/cli.rb
-+++ b/lib/tmuxinator/cli.rb
-@@ -72,7 +72,7 @@ module Tmuxinator
-                      else
-                        Tmuxinator::Config.default_project(name)
-                      end
--      unless Tmuxinator::Config.exists?(project_file)
-+      unless File.exists?(project_file)
-         template = Tmuxinator::Config.default? ? :default : :sample
-         content = File.read(Tmuxinator::Config.send(template.to_sym))
-         erb = Erubis::Eruby.new(content).result(binding)
-diff --git a/spec/lib/tmuxinator/cli_spec.rb b/spec/lib/tmuxinator/cli_spec.rb
-index 8b7b9f1..30b78ad 100644
---- a/spec/lib/tmuxinator/cli_spec.rb
-+++ b/spec/lib/tmuxinator/cli_spec.rb
-@@ -164,7 +164,7 @@ describe Tmuxinator::Cli do
- 
-       context "existing project doesn't exist" do
-         before do
--          expect(Tmuxinator::Config).to receive_messages(exists?: false)
-+          expect(File).to receive_messages(exists?: false)
-         end
- 
-         it "creates a new tmuxinator project file" do
-@@ -174,14 +174,15 @@ describe Tmuxinator::Cli do
-       end
- 
-       context "files exists" do
--        let(:command) { "#{ENV['HOME']}\/\.tmuxinator\/#{name}\.yml" }
-+        let(:root_path) { "#{ENV['HOME']}\/\.tmuxinator\/#{name}\.yml" }
- 
-         before do
--          expect(Tmuxinator::Config).to receive_messages(exists?: true)
-+          allow(File).to receive(:exists?).with(anything).and_return(false)
-+          expect(File).to receive(:exists?).with(root_path).and_return(true)
-         end
- 
-         it "just opens the file" do
--          expect(Kernel).to receive(:system).with(%r{#{command}})
-+          expect(Kernel).to receive(:system).with(%r{#{root_path}})
-           capture_io { cli.start }
-         end
-       end
-@@ -194,7 +195,7 @@ describe Tmuxinator::Cli do
- 
-       context "existing project doesn't exist" do
-         before do
--          expect(Tmuxinator::Config).to receive(:exists?).at_least(:once) do
-+          allow(File).to receive(:exists?).at_least(:once) do
-             false
-           end
-         end
-@@ -208,7 +209,7 @@ describe Tmuxinator::Cli do
-       context "files exists" do
-         let(:path) { Tmuxinator::Config::LOCAL_DEFAULT }
-         before do
--          expect(Tmuxinator::Config).to receive(:exists?).with(path) { true }
-+          expect(File).to receive(:exists?).with(path) { true }
-         end
- 
-         it "just opens the file" do
--- 
-2.6.3
-
diff --git a/debian/patches/series b/debian/patches/series
index 8fd3b20..1db306d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0002-drop-bash-completion-shebang.patch
-0003-Opening-will-not-recreate-projects.patch

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



More information about the Pkg-ruby-extras-commits mailing list