[DRE-commits] [ruby-magic] 04/06: drop patches already applied 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-magic.

commit 8e21d294aa49ab7f74f461363d35e89f2b0b1629
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon May 26 10:53:35 2014 -0300

    drop patches already applied upstream
---
 debian/changelog                                   |  3 ++
 ...0001-Fix-Magic.guess_string_mime_encoding.patch | 44 ----------------------
 debian/patches/fix-against-new-libmagic.diff       | 28 --------------
 debian/patches/series                              |  2 -
 4 files changed, 3 insertions(+), 74 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9ce2e7..c7dbc5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 ruby-magic (0.2.8-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * patches dropped, already applied upstream:
+    - 0001-Fix-Magic.guess_string_mime_encoding.patch
+    - fix-against-new-libmagic.diff
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 26 May 2014 10:51:00 -0300
 
diff --git a/debian/patches/0001-Fix-Magic.guess_string_mime_encoding.patch b/debian/patches/0001-Fix-Magic.guess_string_mime_encoding.patch
deleted file mode 100644
index e4a86f3..0000000
--- a/debian/patches/0001-Fix-Magic.guess_string_mime_encoding.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 1d6c5770bd1cf107d3067c353689bda1634c97a4 Mon Sep 17 00:00:00 2001
-From: Antonio Terceiro <terceiro at softwarelivre.org>
-Date: Tue, 13 Aug 2013 11:39:16 +0200
-Forwarded: https://github.com/qoobaa/magic/pull/2
-Subject: [PATCH] Fix Magic.guess_string_mime_encoding
- This patch is sligthly modified from the version submitted upstream to disable
- the test on Ruby 1.8 (which upstream probably doesn not care at this point
- anymore)
-
----
- lib/magic.rb       | 2 +-
- test/test_magic.rb | 8 ++++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
---- a/lib/magic.rb
-+++ b/lib/magic.rb
-@@ -52,7 +52,7 @@ module Magic
-     #   Magic.guess_string_mime_encoding("Magic® File™")
-     #   # => "utf-8"
-     def guess_string_mime_encoding(string, *args)
--      guess(*args.unshift(:mime_type)) { |db| db.buffer(string) }
-+      guess(*args.unshift(:mime_encoding)) { |db| db.buffer(string) }
-     end
- 
-     # Guesses mime type of given string
---- a/test/test_magic.rb
-+++ b/test/test_magic.rb
-@@ -1,3 +1,5 @@
-+# encoding: UTF-8
-+
- require "helper"
- 
- class TestMagic < Test::Unit::TestCase
-@@ -44,4 +46,10 @@ class TestMagic < Test::Unit::TestCase
-     Magic.guess(:mime) { |db| result = db.file(fixture("filelogo.jpg")) }
-     assert_equal "image/jpeg; charset=binary", result
-   end
-+
-+  test "guess encoding from string" do
-+    utf8 = "utf-8".force_encoding(Encoding::ASCII_8BIT)
-+    assert_equal utf8, Magic.guess_string_mime_encoding('áéíóú')
-+  end if RUBY_VERSION > '1.9'
-+
- end
diff --git a/debian/patches/fix-against-new-libmagic.diff b/debian/patches/fix-against-new-libmagic.diff
deleted file mode 100644
index b64141d..0000000
--- a/debian/patches/fix-against-new-libmagic.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix assumptions that no longer hold with newer libmagic versions
-Author: Antonio Terceiro <terceiro at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741815
-Forwarded: https://github.com/qoobaa/magic/pull/3
----
---- a/lib/magic/database.rb
-+++ b/lib/magic/database.rb
-@@ -29,6 +29,9 @@ module Magic
- 
-     # Determine type of a file at given path
-     def file(filename)
-+      if !File.exists?(filename)
-+        raise Exception, "#{filename}: No such file or directory"
-+      end
-       result = Api.magic_file(@magic_set, filename.to_s)
-       if result.null?
-         raise Exception, error
---- a/test/test_magic.rb
-+++ b/test/test_magic.rb
-@@ -38,7 +38,7 @@ class TestMagic < Test::Unit::TestCase
-   end
- 
-   test "guess filelogo.jpg mime with empty database" do
--    assert_equal "application/octet-stream; charset=binary", Magic.guess_file_mime(fixture("filelogo.jpg"), :database => fixture("magic_empty"))
-+    assert_equal "binary; charset=binary", Magic.guess_file_mime(fixture("filelogo.jpg"), :database => fixture("magic_empty"))
-   end
- 
-   test "guess with block" do
diff --git a/debian/patches/series b/debian/patches/series
index 2f8b89c..7e9dc02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-remove-rubygems-usage-require-test_declarative.patch
-0001-Fix-Magic.guess_string_mime_encoding.patch
-fix-against-new-libmagic.diff

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