[DRE-commits] [ruby-sqlite3] 05/06: dropped handle-big-endian.diff, already applied upstream
Antonio Terceiro
terceiro at moszumanska.debian.org
Mon Nov 23 20:06:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository ruby-sqlite3.
commit e1a3446e597b853bdcf2bfd66b77c5e18cd1037f
Author: Antonio Terceiro <terceiro at debian.org>
Date: Mon Nov 23 18:01:31 2015 -0200
dropped handle-big-endian.diff, already applied upstream
---
debian/changelog | 1 +
debian/patches/handle-big-endian.diff | 49 -----------------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7a4d0a1..2cfbdc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
ruby-sqlite3 (1.3.11-1) UNRELEASED; urgency=medium
* New upstream release.
+ - dropped handle-big-endian.diff, already applied upstream
* Add Recommends: on sqlite3
* Add myself to Uploaders:
* Update packaging with a new dh-make-ruby run
diff --git a/debian/patches/handle-big-endian.diff b/debian/patches/handle-big-endian.diff
deleted file mode 100644
index 99f3eba..0000000
--- a/debian/patches/handle-big-endian.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: handle big endian architectures
-Author: David Suárez <david.sephirot at gmail.com>
-Reviewed-By: Antonio Terceiro <terceiro at debian.org>
-Bug-Debian: http://bugs.debian.org/745929
-
---- a/ext/sqlite3/statement.c
-+++ b/ext/sqlite3/statement.c
-@@ -240,7 +240,7 @@ static VALUE bind_param(VALUE self, VALU
-
-
- #ifdef HAVE_RUBY_ENCODING_H
-- if (UTF16_LE_P(value)) {
-+ if (UTF16_LE_P(value) || UTF16_BE_P(value)) {
- status = sqlite3_bind_text16(
- ctx->st,
- index,
---- a/test/test_encoding.rb
-+++ b/test/test_encoding.rb
-@@ -13,12 +13,13 @@ module SQLite3
-
- def test_select_encoding_on_utf_16
- str = "foo"
-- db = SQLite3::Database.new(':memory:'.encode('UTF-16LE'))
-+ utf16 = ([1].pack("I") == [1].pack("N")) ? "UTF-16BE" : "UTF-16LE"
-+ db = SQLite3::Database.new(':memory:'.encode(utf16))
- db.execute @create
- db.execute "insert into ex (id, data) values (1, \"#{str}\")"
-
- stmt = db.prepare 'select * from ex where data = ?'
-- ['US-ASCII', 'UTF-16LE', 'EUC-JP', 'UTF-8'].each do |enc|
-+ ['US-ASCII', utf16, 'EUC-JP', 'UTF-8'].each do |enc|
- stmt.bind_param 1, str.encode(enc)
- assert_equal 1, stmt.to_a.length
- stmt.reset!
-@@ -27,11 +28,12 @@ module SQLite3
-
- def test_insert_encoding
- str = "foo"
-- db = SQLite3::Database.new(':memory:'.encode('UTF-16LE'))
-+ utf16 = ([1].pack("I") == [1].pack("N")) ? "UTF-16BE" : "UTF-16LE"
-+ db = SQLite3::Database.new(':memory:'.encode(utf16))
- db.execute @create
- stmt = db.prepare @insert
-
-- ['US-ASCII', 'UTF-16LE', 'UTF-16BE', 'EUC-JP', 'UTF-8'].each_with_index do |enc,i|
-+ ['US-ASCII', utf16, 'EUC-JP', 'UTF-8'].each_with_index do |enc,i|
- stmt.bind_param 1, i
- stmt.bind_param 2, str.encode(enc)
- stmt.to_a
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3a38c2e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-handle-big-endian.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-sqlite3.git
More information about the Pkg-ruby-extras-commits
mailing list