[DRE-commits] [SCM] ruby-activeldap.git branch, master, updated. debian/1.2.4-3-10-g4255806

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 92089aadc1e7ff9c6ebcb55843bb784c711257e9
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue May 28 16:16:51 2013 +0200

    Remove all patches; Upstream doesn't use gem nor gettext anymore

diff --git a/debian/patches/gem_sux b/debian/patches/gem_sux
deleted file mode 100644
index 92a92a8..0000000
--- a/debian/patches/gem_sux
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: activeldap-1.2.1/lib/active_ldap.rb
-===================================================================
---- activeldap-1.2.1.orig/lib/active_ldap.rb	2010-06-23 02:11:08.000000000 +0200
-+++ activeldap-1.2.1/lib/active_ldap.rb	2010-06-23 02:11:42.000000000 +0200
-@@ -890,9 +890,9 @@
- require_gem_if_need = Proc.new do |library_name, gem_name, *gem_args|
-   gem_name ||= library_name
-   begin
--    if !gem_args.empty? and Object.const_defined?(:Gem)
--      gem gem_name, *gem_args
--    end
-+    #if !gem_args.empty? and Object.const_defined?(:Gem)
-+    #  gem gem_name, *gem_args
-+    #end
-     require library_name
-   rescue LoadError
-     require 'rubygems'
diff --git a/debian/patches/gettext_misnamed_locale b/debian/patches/gettext_misnamed_locale
deleted file mode 100644
index a7ac4f8..0000000
--- a/debian/patches/gettext_misnamed_locale
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ruby-activeldap/lib/active_ldap/get_text_support.rb
-===================================================================
---- ruby-activeldap.orig/lib/active_ldap/get_text_support.rb	2013-02-18 01:53:36.122949120 +0100
-+++ ruby-activeldap/lib/active_ldap/get_text_support.rb	2013-02-18 01:54:26.370702741 +0100
-@@ -12,7 +12,7 @@
-           include(GetText::Translation)
-           po_dir = "/usr/share/ruby-activeldap/po"
-           GetText.add_text_domain('active-ldap', :path => po_dir, :type => :po)
--          GetText.default_available_locales = ['en', 'jp']
-+          GetText.default_available_locales = ['en', 'ja']
-           GetText.default_text_domain = "active-ldap"
-         end
-       end
diff --git a/debian/patches/gettext_po_path b/debian/patches/gettext_po_path
deleted file mode 100644
index de997b8..0000000
--- a/debian/patches/gettext_po_path
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: ruby-activeldap/lib/active_ldap/get_text_support.rb
-===================================================================
---- ruby-activeldap.orig/lib/active_ldap/get_text_support.rb	2013-02-18 00:29:52.000000000 +0100
-+++ ruby-activeldap/lib/active_ldap/get_text_support.rb	2013-02-18 01:43:07.658020919 +0100
-@@ -10,8 +10,7 @@
-       def included(base)
-         base.class_eval do
-           include(GetText::Translation)
--          po_dir = File.join(File.dirname(__FILE__), "..", "..", "po")
--          po_dir = File.expand_path(po_dir)
-+          po_dir = "/usr/share/ruby-activeldap/po"
-           GetText.add_text_domain('active-ldap', :path => po_dir, :type => :po)
-           GetText.default_available_locales = ['en', 'jp']
-           GetText.default_text_domain = "active-ldap"
diff --git a/debian/patches/series b/debian/patches/series
index 02b91b9..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-gem_sux
-gettext_po_path
-gettext_misnamed_locale

-- 
ruby-activeldap.git