[DRE-commits] [rabbit] 03/03: drop unnecessary patches, merged upstream

[Hideki Yamane]

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

henrich pushed a commit to branch master
in repository rabbit.

commit a2b8e956c60a989fe1413705a51db91c34cef24d
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Apr 22 23:25:07 2014 +0900

    drop unnecessary patches, merged upstream
---
 debian/changelog                                   |  4 ++
 .../0002-Import-upstream-8cd4741-Fix-a-typo.patch  | 28 ----------
 ...ream-58be9-Info-Window-support-auto-sourc.patch | 60 ----------------------
 debian/patches/series                              |  2 -
 4 files changed, 4 insertions(+), 90 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5c5ce3..19c2938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ rabbit (2.1.2-1) unstable; urgency=medium
 
   * Team upload.
   * Imported Upstream version 2.1.2
+  * debian/patches
+    - drop 0002-Import-upstream-8cd4741-Fix-a-typo.patch, merged upstream
+    - drop 0003-Import-upstream-58be9-Info-Window-support-auto-sourc.patch,
+      merged upstream
 
  -- Hideki Yamane <henrich at debian.org>  Tue, 22 Apr 2014 23:16:22 +0900
 
diff --git a/debian/patches/0002-Import-upstream-8cd4741-Fix-a-typo.patch b/debian/patches/0002-Import-upstream-8cd4741-Fix-a-typo.patch
deleted file mode 100644
index e65fe37..0000000
--- a/debian/patches/0002-Import-upstream-8cd4741-Fix-a-typo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Sat, 29 Jun 2013 04:54:30 +0900
-Subject: Import upstream:8cd4741, Fix a typo
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- lib/rabbit/command/rabbit-slide.rb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/rabbit/command/rabbit-slide.rb b/lib/rabbit/command/rabbit-slide.rb
-index 572fa21..2424a07 100644
---- a/lib/rabbit/command/rabbit-slide.rb
-+++ b/lib/rabbit/command/rabbit-slide.rb
-@@ -1,4 +1,4 @@
--# Copyright (C) 2012  Kouhei Sutou <kou at cozmixng.org>
-+# Copyright (C) 2012-2013  Kouhei Sutou <kou at cozmixng.org>
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -229,7 +229,7 @@ module Rabbit
-       end
- 
-       def default_command
--        if File.file("config.yaml")
-+        if File.file?("config.yaml")
-           "change"
-         else
-           "new"
diff --git a/debian/patches/0003-Import-upstream-58be9-Info-Window-support-auto-sourc.patch b/debian/patches/0003-Import-upstream-58be9-Info-Window-support-auto-sourc.patch
deleted file mode 100644
index 1fcc650..0000000
--- a/debian/patches/0003-Import-upstream-58be9-Info-Window-support-auto-sourc.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Sat, 29 Jun 2013 04:55:20 +0900
-Subject: Import upstream:58be9 Info Window support auto source reload
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- lib/rabbit/info-window.rb           | 16 +++++++++++++---
- lib/rabbit/renderer/display/info.rb |  5 +++++
- 2 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/lib/rabbit/info-window.rb b/lib/rabbit/info-window.rb
-index 6513a01..c045f33 100644
---- a/lib/rabbit/info-window.rb
-+++ b/lib/rabbit/info-window.rb
-@@ -58,9 +58,13 @@ module Rabbit
- 
-     def moved(index)
-       return unless showing?
--      check_timer
--      update_note_text if on_note_mode?
--      adjust_slide(index)
-+      update(index)
-+    end
-+
-+    def parsed
-+      return unless showing?
-+      update_source
-+      update
-     end
- 
-     def index_mode_on
-@@ -192,6 +196,12 @@ module Rabbit
-       @note_label.set_size_request(width, height)
-     end
- 
-+    def update(index=nil)
-+      check_timer
-+      update_note_text if on_note_mode?
-+      adjust_slide(index)
-+    end
-+
-     def update_note_text
-       @note_label.markup = markupped_note_text
-     end
-diff --git a/lib/rabbit/renderer/display/info.rb b/lib/rabbit/renderer/display/info.rb
-index cb8fa5b..4aa52c7 100644
---- a/lib/rabbit/renderer/display/info.rb
-+++ b/lib/rabbit/renderer/display/info.rb
-@@ -25,6 +25,11 @@ module Rabbit
-           @info_window.hide
-         end
- 
-+        def post_parse
-+          super
-+          @info_window.parsed
-+        end
-+
-         def post_move(old_index, index)
-           super
-           @info_window.moved(index)
diff --git a/debian/patches/series b/debian/patches/series
index 25be96f..42fba08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 0001-Remove-RubyGems-Depends.patch
-0002-Import-upstream-8cd4741-Fix-a-typo.patch
-0003-Import-upstream-58be9-Info-Window-support-auto-sourc.patch
 0004-Drop-test-unit-notify-for-package-build.patch
 Import-testfixturesimage

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