[DRE-commits] [SCM] ruby-odbc.git branch, master, updated. debian/0.99994-1-4-gcc42f61

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 0f176ca70a36426ced2adaea00cf9714298dd37a
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 8 15:37:31 2012 +0200

    debian/control: add libodbc-ruby-doc transitional package
    
    * debian/control:
      - Switched the Maintainer/Uploaders fields (as per team convention).
      - Added myself to Uploaders.
      - Added the missing libodbc-ruby-doc transitional package.
      - Updated the replaces/breaks/provides fields of the main package.

diff --git a/debian/changelog b/debian/changelog
index 8e0e62d..ff1510e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-odbc (0.99994-2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Switched the Maintainer/Uploaders fields (as per team convention).
+    - Added myself to Uploaders.
+    - Added the missing libodbc-ruby-doc transitional package.
+    - Updated the replaces/breaks/provides fields of the main package.
+
+ -- Paul van Tilburg <paulvt at debian.org>  Tue, 08 May 2012 15:32:26 +0200
+
 ruby-odbc (0.99994-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 3b8d59b..3ddeed5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: ruby-odbc
 Section: ruby
 Priority: optional
-Maintainer: Daigo Moriwaki <daigo at debian.org>
-Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Deepak Tripathi <apenguinlinux at gmail.com>
+Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Deepak Tripathi <apenguinlinux at gmail.com>
+Uploaders: Daigo Moriwaki <daigo at debian.org>, Paul van Tilburg <paulvt at debian.org>
 Build-Depends: debhelper (>= 7.0.0), cdbs, quilt, ruby-pkg-tools, libiodbc2-dev, ruby1.8-dev, ruby1.8, ruby1.9.1, ruby1.9.1-dev
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.2
@@ -14,9 +14,9 @@ Package: ruby-odbc
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libiodbc2 | unixodbc, ruby1.8 | ruby-interpreter
 Suggests: libdbi-ruby1.8, libdbi-ruby1.9
-Replaces: libodbc-ruby (<< 0.99994-1), libodbc-ruby1.8 (<< 0.99994-1), libodbc-ruby1.9.1 (<< 0.99994-1), libodbc-ruby-doc (<< 0.99994-1)
-Conflicts: libodbc-ruby (<< 0.99994-1), libodbc-ruby1.8 (<< 0.99994-1), libodbc-ruby1.9.1 (<< 0.99994-1), libodbc-ruby-doc (<< 0.99994-1)
-Provides: libodbc-ruby, libodbc-ruby1.8, libodbc-ruby1.9.1, libodbc-ruby-doc
+Replaces: libodbc-ruby (<< 0.99994-1), libodbc-ruby1.8 (<< 0.99994-1), libodbc-ruby1.9.1 (<< 0.99994-1), libodbc-ruby-doc (<< 0.99994-1), libodbc-ruby-doc (<< 0.99994-2~)
+Conflicts: libodbc-ruby (<< 0.99994-1), libodbc-ruby1.8 (<< 0.99994-1), libodbc-ruby1.9.1 (<< 0.99994-1), libodbc-ruby-doc (<< 0.99994-1), libodbc-ruby-doc (<< 0.99994-2~)
+Provides: libodbc-ruby, libodbc-ruby1.8, libodbc-ruby1.9.1, libodbc-ruby-doc, libodbc-ruby-doc
 Description: ODBC Binding for Ruby
  ODBC is a standard API for connecting to ODBC data sources such as Relational
  Database Management Systems (RDBMSs). For accessing ODBC data sources from the
@@ -85,3 +85,12 @@ Depends: ${misc:Depends}, ruby-odbc-dbg
 Description: Transitional package for ruby-odbc-dbg
  This is a transitional package to ease upgrades to the ruby-odbc-dbg
  package. It can safely be removed.
+
+Package: libodbc-ruby-doc
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, ruby-odbc
+Description: Transitional package for ruby-odbc
+ This is a transitional package to ease upgrades to the ruby-odbc
+ package. It can safely be removed.

-- 
ruby-odbc.git