[DRE-commits] [ruby-sqlite3] 04/05: remove applied patch

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Mon Apr 7 09:49:56 UTC 2014


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

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

commit 25de34929f71a5452c453aad69c09a804e1f403e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Apr 7 14:01:48 2014 +0530

    remove applied patch
---
 debian/changelog                                   |  3 +-
 .../fix_test_insert_duplicate_records.patch        | 36 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc36107..e4aac22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ ruby-sqlite3 (1.3.9-1) UNRELEASED; urgency=low
 
   * Team upload.
   * New upstream release.
-  * Bump gem2deb build dep to 0.7.5~
+  * Bump gem2deb build dep to 0.7.5~.
     - Drop ruby 1.9
+  * Remove already applied patch.
 
  -- Pirate Praveen <praveen at debian.org>  Mon, 07 Apr 2014 13:46:26 +0530
 
diff --git a/debian/patches/fix_test_insert_duplicate_records.patch b/debian/patches/fix_test_insert_duplicate_records.patch
deleted file mode 100644
index bebf7e7..0000000
--- a/debian/patches/fix_test_insert_duplicate_records.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix for new unique constraint message of SQLite 3.8.2 in test
- SQlite 3.8,2 changed one of the error messages to have a capitalized word.
- The regexp in the test used to match this message should be updated
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735512
-Bug: https://github.com/sparklemotion/sqlite3-ruby/issues/116
-Origin: https://github.com/strzibny/sqlite3-ruby/commit/d860ce240fcafad4656014ecc84d3f89a38bc1a8.patch
-Forwarded: https://github.com/sparklemotion/sqlite3-ruby/pull/117
-d860ce240fcafad4656014ecc84d3f89a38bc1a8 Mon Sep 17 00:00:00 2001
-Author: Josef Stribny <jstribny at redhat.com>
-Reviewed-by: Cédric Boutillier <boutil at debian.org>
-Date: Thu, 12 Dec 2013 15:13:22 +0100
-
----
- test/test_statement.rb | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/test/test_statement.rb b/test/test_statement.rb
-index 8cb3d97..31b4c6b 100644
---- a/test/test_statement.rb
-+++ b/test/test_statement.rb
-@@ -30,7 +30,11 @@ def test_insert_duplicate_records
-       stmt.execute('ruby')
- 
-       exception = assert_raises(SQLite3::ConstraintException) { stmt.execute('ruby') }
--      assert_match /column(s)? .* (is|are) not unique/, exception.message
-+      # SQLite 3.8.2 returns new error message:
-+      #   UNIQUE constraint failed: *table_name*.*column_name*
-+      # Older versions of SQLite return:
-+      #   column *column_name* is not unique
-+      assert_match /(column(s)? .* (is|are) not unique|UNIQUE constraint failed: .*)/, exception.message
-     end
- 
-     ###
--- 
-1.8.5.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a163b6a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_test_insert_duplicate_records.patch

-- 
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