[DRE-commits] [SCM] ruby-highline.git branch, master, updated. debian/1.6.12-1-4-gc9af24a

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 7e1f385a7d5832283e00546e2404b172ff26f52d
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Jun 21 00:02:32 2012 +0200

    Drop patches (merged upstream)

diff --git a/debian/patches/change-shebangs-in-examples.patch b/debian/patches/change-shebangs-in-examples.patch
deleted file mode 100644
index 0ea8aa0..0000000
--- a/debian/patches/change-shebangs-in-examples.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Description: change shebangs in examples to use /usr/bin/env ruby
-From: Cédric Boutillier <cedric.boutillier at gmai.com>
-Last-Update: 2012-05-16
-
---- a/examples/ansi_colors.rb
-+++ b/examples/ansi_colors.rb
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/env ruby -w
- 
- # ansi_colors.rb
- #
---- a/examples/asking_for_arrays.rb
-+++ b/examples/asking_for_arrays.rb
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/env ruby -w
- 
- # asking_for_arrays.rb
- #
---- a/examples/basic_usage.rb
-+++ b/examples/basic_usage.rb
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/env ruby -w
- 
- # basic_usage.rb
- #
---- a/examples/menus.rb
-+++ b/examples/menus.rb
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/env ruby -w
- 
- require "rubygems"
- require "highline/import"
---- a/examples/overwrite.rb
-+++ b/examples/overwrite.rb
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/env ruby -w
- 
- # overwrite.rb
- # 
---- a/examples/page_and_wrap.rb
-+++ b/examples/page_and_wrap.rb
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/env ruby -w
- 
- # page_and_wrap.rb
- #
---- a/examples/password.rb
-+++ b/examples/password.rb
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/env ruby -w
- 
- require "rubygems"
- require "highline/import"
---- a/examples/trapping_eof.rb
-+++ b/examples/trapping_eof.rb
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/env ruby -w
- 
- # trapping_eof.rb
- #
---- a/examples/using_readline.rb
-+++ b/examples/using_readline.rb
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/env ruby -w
- 
- # using_readline.rb
- #
diff --git a/debian/patches/remove-shebangs.patch b/debian/patches/remove-shebangs.patch
deleted file mode 100644
index e0b771e..0000000
--- a/debian/patches/remove-shebangs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Remove shebangs from files in lib/ to avoid a lintian warning
-Author: Lucas Nussbaum <lucas at debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2012-05-16
-
---- a/lib/highline.rb
-+++ b/lib/highline.rb
-@@ -1,5 +1,3 @@
--#!/usr/local/bin/ruby -w
--
- # highline.rb
- #
- #  Created by James Edward Gray II on 2005-04-26.
---- a/lib/highline/system_extensions.rb
-+++ b/lib/highline/system_extensions.rb
-@@ -1,5 +1,3 @@
--#!/usr/local/bin/ruby -w
--
- # system_extensions.rb
- #
- #  Created by James Edward Gray II on 2006-06-14.
---- a/lib/highline/menu.rb
-+++ b/lib/highline/menu.rb
-@@ -1,5 +1,3 @@
--#!/usr/local/bin/ruby -w
--
- # menu.rb
- #
- #  Created by Gregory Thomas Brown on 2005-05-10.
---- a/lib/highline/question.rb
-+++ b/lib/highline/question.rb
-@@ -1,5 +1,3 @@
--#!/usr/local/bin/ruby -w
--
- # question.rb
- #
- #  Created by James Edward Gray II on 2005-04-26.
---- a/lib/highline/color_scheme.rb
-+++ b/lib/highline/color_scheme.rb
-@@ -1,5 +1,3 @@
--#!/usr/local/bin/ruby -w
--
- # color_scheme.rb
- #
- # Created by Jeremy Hinegardner on 2007-01-24
---- a/lib/highline/import.rb
-+++ b/lib/highline/import.rb
-@@ -1,5 +1,3 @@
--#!/usr/local/bin/ruby -w
--
- # import.rb
- #
- #  Created by James Edward Gray II on 2005-04-26.
---- a/lib/highline/style.rb
-+++ b/lib/highline/style.rb
-@@ -1,5 +1,3 @@
--#!/usr/local/bin/ruby -w
--
- # color_scheme.rb
- #
- # Created by Richard LeBer on 2011-06-27.
---- a/lib/highline/simulate.rb
-+++ b/lib/highline/simulate.rb
-@@ -1,5 +1,3 @@
--#!/usr/local/bin/ruby -w
--
- # simulate.rb
- #
- #  Created by Andy Rossmeissl on 2012-04-29.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ff8f9c6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-remove-shebangs.patch
-change-shebangs-in-examples.patch

-- 
ruby-highline.git