[DRE-commits] [SCM] ruby-graffiti.git branch, master, updated. upstream/1.0-6-g48b6c02

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit 48b6c025fb9ef9f2826e693f90d5ea462ba4702d
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Sun Dec 25 18:42:43 2011 +0300

    new upstream release 2.1

diff --git a/debian/changelog b/debian/changelog
index cc9171c..22d5aba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-graffiti (2.1-1) unstable; urgency=low
+
+  * New upstream release:
+    - migrated from DBI to Sequel.
+  * Dropped all patches merged upstream.
+  * Unit test now requires ruby-sqlite3 and ruby-sequel to run.
+  * Added Suggests: ruby-sequel-pg.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sun, 25 Dec 2011 18:34:25 +0300
+
 ruby-graffiti (1.0-1) unstable; urgency=low
 
   * Initial release. Closes: #573968 (ITP).
diff --git a/debian/control b/debian/control
index d7de7bf..7004b00 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Dmitry Borodaenko <angdraug at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.8~), syncache
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.8~), syncache, ruby-sequel, ruby-sqlite3
 Standards-Version: 3.9.2
 Vcs-Git: git://github.com/angdraug/graffiti.git
 Vcs-Browser: https://github.com/angdraug/graffiti
@@ -14,11 +14,12 @@ XS-Ruby-Versions: all
 Package: ruby-graffiti
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-dbd-pg | ruby-dbd-mysql | ruby-dbd-sqlite3, syncache
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, syncache, ruby-sequel, ruby-pg | ruby-mysql | ruby-sqlite3
+Suggests: ruby-sequel-pg
 Description: Relational RDF store for Ruby
  Graffiti is an RDF store based on dynamic translation of RDF queries into SQL.
  Graffiti allows one to map any relational database schema into RDF semantics
  and vice versa, to store any RDF data in a relational database.
  .
- Graffiti uses Ruby/DBI to connect to database backend and provides a DBI-like
+ Graffiti uses Sequel to connect to database backend and provides a DBI-like
  interface to run RDF queries in Squish query language from Ruby applications.
diff --git a/debian/patches/0001-SqlExpression-to_str-for-Ruby-1.9.patch b/debian/patches/0001-SqlExpression-to_str-for-Ruby-1.9.patch
deleted file mode 100644
index 27bd16e..0000000
--- a/debian/patches/0001-SqlExpression-to_str-for-Ruby-1.9.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Dmitry Borodaenko <angdraug at debian.org>
-Date: Thu, 15 Sep 2011 23:48:34 +0300
-Subject: SqlExpression#to_str for Ruby 1.9
-
----
- lib/graffiti/sql_mapper.rb |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/lib/graffiti/sql_mapper.rb b/lib/graffiti/sql_mapper.rb
-index 36b7f54..bb479d2 100644
---- a/lib/graffiti/sql_mapper.rb
-+++ b/lib/graffiti/sql_mapper.rb
-@@ -54,6 +54,8 @@ class SqlExpression < DelegateClass(Array)
-     '(' << self.join(' ') << ')'
-   end
- 
-+  alias :to_str :to_s
-+
-   def traverse(&block)
-     self.each do |part|
-       case part
--- 
diff --git a/debian/patches/0002-ordering-agnosting-query-matching-in-unit-tests.patch b/debian/patches/0002-ordering-agnosting-query-matching-in-unit-tests.patch
deleted file mode 100644
index cbc5b6c..0000000
--- a/debian/patches/0002-ordering-agnosting-query-matching-in-unit-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Dmitry Borodaenko <angdraug at debian.org>
-Date: Fri, 16 Sep 2011 21:27:16 +0300
-Subject: ordering-agnosting query matching in unit tests
-
----
- test/ts_graffiti.rb |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/test/ts_graffiti.rb b/test/ts_graffiti.rb
-index d173449..590645a 100644
---- a/test/ts_graffiti.rb
-+++ b/test/ts_graffiti.rb
-@@ -316,6 +316,13 @@ ORDER BY c.published_date DESC"
-     assert sql1 == sql2
- 
-     # transform result
--    assert_equal sql, query.to_sql.first
-+    assert_equal normalize(sql), normalize(sql1.first),
-+      "Query doesn't match. Expected:\n#{sql}\nReceived:\n#{sql1.first}"
-+  end
-+
-+  def normalize(sql)
-+    # alias labels and where conditions may be reordered, but the query string
-+    # length should remain the same
-+    sql.size
-   end
- end
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cdd8626..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-SqlExpression-to_str-for-Ruby-1.9.patch
-0002-ordering-agnosting-query-matching-in-unit-tests.patch

-- 
ruby-graffiti.git