[DRE-commits] [SCM] ruby-ntlm.git branch, master, updated. debian/0.3.2-1

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 4a37a60e266782ef6961e09470b8c330d1e5f6f9
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Wed Jun 26 10:37:30 2013 -0500

    Patch to include kconv no longer needed — Dropped.
    
    * Patch to include kconv no longer needed — Dropped.
    * Tests are now located at spec/unit/ntlm_spec.rb. Modify build
      information to run that instead of old path.

diff --git a/debian/changelog b/debian/changelog
index 4a3d010..b3530c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ ruby-ntlm (0.3.2-1) unstable; urgency=low
 
   * New upstream release
   * Standards-version 3.9.2 → 3.9.4 (no changes needed)
+  * Patch to include kconv no longer needed — Dropped.
+  * Tests are now located at spec/unit/ntlm_spec.rb. Modify build
+    information to run that instead of old path.
 
  -- Gunnar Wolf <gwolf at debian.org>  Wed, 26 Jun 2013 10:08:19 -0500
 
diff --git a/debian/patches/include_kconv b/debian/patches/include_kconv
deleted file mode 100644
index 912809c..0000000
--- a/debian/patches/include_kconv
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Gunnar Wolf <gwolf at debian.org>
-Forwarded: no
-Last-updated: 2012-01-18
-Description: Explicitly require kconv for Ruby1.9.1
- This module was always loaded under 1.8, but broke the tests under
- 1.9.1. Including it if needed.
-
-Index: ruby-ntlm/lib/net/ntlm.rb
-===================================================================
---- ruby-ntlm.orig/lib/net/ntlm.rb	2012-01-18 13:56:57.000000000 -0600
-+++ ruby-ntlm/lib/net/ntlm.rb	2012-01-18 14:22:39.000000000 -0600
-@@ -45,6 +45,9 @@
- require 'base64'
- require 'openssl'
- require 'openssl/digest'
-+if RUBY_VERSION > '1.9.1'
-+  require 'kconv'
-+end
- 
- module Net  #:nodoc:
-   module NTLM
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 461a9e8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-include_kconv
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index f47ac7c..8c33459 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1 +1,3 @@
-require 'test/function_test.rb'
+require './lib/net/ntlm.rb'
+require 'rspec/autorun'
+require './spec/unit/ntlm_spec.rb'

-- 
ruby-ntlm.git