[DRE-commits] [ruby-dbd-odbc] 02/03: Refresh packaging with dh-make-ruby -w

zeha at debian.org zeha at debian.org
Tue Aug 18 13:33:13 UTC 2015


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

zeha pushed a commit to branch master
in repository ruby-dbd-odbc.

commit 1915126407cb0ae71c93302491538c6e0c2616b1
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Aug 18 13:21:24 2015 +0000

    Refresh packaging with dh-make-ruby -w
---
 debian/compat                                      |  2 +-
 debian/control                                     | 36 +++++----------
 debian/patches/0001-remove-usage-of-rubygems.patch | 52 ----------------------
 debian/patches/series                              |  1 -
 debian/ruby-dbd-odbc.docs                          |  1 +
 debian/ruby-test-files.yaml                        |  2 -
 debian/rules                                       | 11 -----
 debian/watch                                       |  2 +-
 8 files changed, 15 insertions(+), 92 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 443ee30..d16e52a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,38 +3,26 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Dmitry Borodaenko <angdraug at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.8~)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9~),
+               gem2deb,
+               ruby-dbi (>= 0.4.0)
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-dbd-odbc.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-dbd-odbc.git
 Homepage: http://www.rubyforge.org/projects/ruby-dbi
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-dbd-odbc
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-dbi, ruby-odbc
-Replaces: libdbd-odbc-ruby (<< 0.2.5+gem2deb-1~), libdbd-odbc-ruby1.8 (<< 0.2.5+gem2deb-1~)
-Breaks: libdbd-odbc-ruby (<< 0.2.5+gem2deb-1~), libdbd-odbc-ruby1.8 (<< 0.2.5+gem2deb-1~)
-Provides: libdbd-odbc-ruby, libdbd-odbc-ruby1.8
+Depends: ruby | ruby-interpreter,
+         ruby-dbi,
+         ruby-odbc,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Ruby/DBI ODBC driver
  Ruby/DBI is a database independent interface for accessing databases,
  similar to Perl's DBI.
  .
  This package contains Ruby/DBI driver for ODBC.
-
-Package: libdbd-odbc-ruby
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends}, ruby-dbd-odbc
-Description: Transitional package for ruby-dbd-odbc
- This is a transitional package to ease upgrades to the ruby-dbd-odbc
- package. It can safely be removed.
-
-Package: libdbd-odbc-ruby1.8
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends}, ruby-dbd-odbc
-Description: Transitional package for ruby-dbd-odbc
- This is a transitional package to ease upgrades to the ruby-dbd-odbc
- package. It can safely be removed.
diff --git a/debian/patches/0001-remove-usage-of-rubygems.patch b/debian/patches/0001-remove-usage-of-rubygems.patch
deleted file mode 100644
index 00fe2c3..0000000
--- a/debian/patches/0001-remove-usage-of-rubygems.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Dmitry Borodaenko <angdraug at debian.org>
-Date: Wed, 14 Sep 2011 01:17:04 +0300
-Subject: remove usage of rubygems
-
----
- lib/dbd/ODBC.rb |    6 ------
- test/ts_dbd.rb  |   10 +---------
- 2 files changed, 1 insertions(+), 15 deletions(-)
-
-diff --git a/lib/dbd/ODBC.rb b/lib/dbd/ODBC.rb
-index 2661bf4..c351175 100644
---- a/lib/dbd/ODBC.rb
-+++ b/lib/dbd/ODBC.rb
-@@ -34,12 +34,6 @@ $:.delete(".") # FIXME oh for the love of pete..
- require "odbc"
- $: << "."
- 
--begin
--    require 'rubygems'
--    gem 'dbi'
--rescue LoadError => e
--end
--
- require 'dbi'
- 
- module DBI
-diff --git a/test/ts_dbd.rb b/test/ts_dbd.rb
-index fcd301e..29339f3 100644
---- a/test/ts_dbd.rb
-+++ b/test/ts_dbd.rb
-@@ -1,5 +1,3 @@
--require 'rubygems'
--gem 'test-unit'
- # figure out what tests to run
- require 'yaml'
- require 'test/unit/testsuite'
-@@ -96,13 +94,7 @@ if __FILE__ == $0
-     begin
-         require 'dbi'
-     rescue LoadError => e
--        begin
--            require 'rubygems'
--            gem 'dbi'
--            require 'dbi'
--        rescue LoadError => e
--            abort "DBI must already be installed or must come with this package for tests to work."
--        end
-+        abort "DBI must already be installed or must come with this package for tests to work."
-     end
- 
-     Deprecate.set_action(proc { })
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a8bdcc3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-remove-usage-of-rubygems.patch
diff --git a/debian/ruby-dbd-odbc.docs b/debian/ruby-dbd-odbc.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/ruby-dbd-odbc.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index 49206f0..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
---- 
-[]
diff --git a/debian/rules b/debian/rules
index a5e7dc8..c6142f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,4 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
diff --git a/debian/watch b/debian/watch
index ff17fcf..b57318b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\+gem2deb// \
-http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/dbd-odbc .*/dbd-odbc-(.+).tar.gz
+http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/dbd-odbc .*/dbd-odbc-(.*).tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-dbd-odbc.git



More information about the Pkg-ruby-extras-commits mailing list