[DRE-commits] [ruby-charlock-holmes] 03/04: remove already applied patch

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-charlock-holmes.

commit f594c1502aa2751fef9d7d52944d97447f51dab8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Nov 27 15:08:12 2015 +0530

    remove already applied patch
---
 debian/changelog                         |  1 +
 debian/patches/series                    |  1 -
 debian/patches/use-system-libmagic.patch | 42 --------------------------------
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 41b4bf0..204145c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-charlock-holmes (0.7.3-1) UNRELEASED; urgency=medium
 
   * Team upload
   * New upstream release
+  * Remove patch use-system-libmagic.patch (already applied) 
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 27 Nov 2015 15:01:57 +0530
 
diff --git a/debian/patches/series b/debian/patches/series
index 256b4c7..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-use-system-libmagic.patch
diff --git a/debian/patches/use-system-libmagic.patch b/debian/patches/use-system-libmagic.patch
deleted file mode 100644
index 770375a..0000000
--- a/debian/patches/use-system-libmagic.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/ext/charlock_holmes/extconf.rb
-+++ b/ext/charlock_holmes/extconf.rb
-@@ -45,39 +45,6 @@ unless have_library 'icui18n' and have_h
-   exit(1)
- end
- 
--##
--# libmagic dependency
--#
--
--src = File.basename('file-5.08.tar.gz')
--dir = File.basename(src, '.tar.gz')
--
--Dir.chdir("#{CWD}/src") do
--  FileUtils.rm_rf(dir) if File.exists?(dir)
--
--  sys("tar zxvf #{src}")
--  Dir.chdir(dir) do
--    sys("./configure --prefix=#{CWD}/dst/ --disable-shared --enable-static --with-pic")
--    sys("patch -p0 < ../file-soft-check.patch")
--    sys("make -C src install")
--    sys("make -C magic install")
--  end
--end
--
--FileUtils.cp "#{CWD}/dst/lib/libmagic.a", "#{CWD}/libmagic_ext.a"
--
--$INCFLAGS[0,0] = " -I#{CWD}/dst/include "
--$LDFLAGS << " -L#{CWD} "
--
--dir_config 'magic'
--unless have_library 'magic_ext' and have_header 'magic.h'
--  STDERR.puts "\n\n"
--  STDERR.puts "***************************************************************************************"
--  STDERR.puts "********* error compiling and linking libmagic. please report issue on github *********"
--  STDERR.puts "***************************************************************************************"
--  exit(1)
--end
--
- $CFLAGS << ' -Wall -funroll-loops'
- $CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']
- 

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