[DRE-commits] [SCM] ruby-odbc.git branch, master, updated. upstream/0.99994-6-gaf84c2d
Daigo Moriwaki
daigo at debian.org
Mon May 30 14:17:16 UTC 2011
The following commit has been merged in the master branch:
commit d18b0c03dbc509316619acc371a6a615e1defde0
Author: Daigo Moriwaki <daigo at debian.org>
Date: Mon May 30 22:52:16 2011 +0900
* Renamed packages to fit the new Debian Ruby Policy.
- Deprecated: libodbc-ruby, libodbc-ruby1.8, libodbc-ruby1.9.1,
libodbc-ruby1.8-dbg, libodbc-ruby1.9.1-dbg,
libodbc-ruby-doc
- New: ruby-odbc, ruby-odbc-dbg.
* Removed debian/libodbc-ruby-doc.docs, debian/libodbc-ruby-doc.examples
, which are merged into debian/rules.
diff --git a/debian/changelog b/debian/changelog
index 9ec53d8..f12d52e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
-libodbc-ruby (0.99994-1) unstable; urgency=low
+ruby-odbc (0.99994-1) unstable; urgency=low
* New upstream release.
* debian/control: Bumped up Standards-Version to 3.9.2.
+ * Renamed packages to fit the new Debian Ruby Policy.
+ - Deprecated: libodbc-ruby, libodbc-ruby1.8, libodbc-ruby1.9.1,
+ libodbc-ruby1.8-dbg, libodbc-ruby1.9.1-dbg,
+ libodbc-ruby-doc
+ - New: ruby-odbc, ruby-odbc-dbg.
+ * Removed debian/libodbc-ruby-doc.docs, debian/libodbc-ruby-doc.examples
+ , which are merged into debian/rules.
-- Daigo Moriwaki <daigo at debian.org> Thu, 19 May 2011 00:03:04 +0900
diff --git a/debian/control b/debian/control
index faa24fc..3b8d59b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,94 +1,87 @@
-Source: libodbc-ruby
+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>
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
Homepage: http://www.ch-werner.de/rubyodbc/
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libodbc-ruby/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libodbc-ruby/
-Package: libodbc-ruby1.8
+Package: ruby-odbc
Architecture: any
-Depends: libiodbc2 | unixodbc, ${shlibs:Depends}, ${misc:Depends}
-Suggests: libodbc-ruby1.8-doc, libdbi-ruby1.8
-Description: ODBC Binding for ruby1.8
+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
+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
Ruby language, an ODBC binding library and Ruby interface are required. This
- package provides both for Ruby 1.8.
+ package provides them for both Ruby 1.8 and 1.9.1.
.
This package includes both UTF-8 and non-UTF-8 versions.
-Package: libodbc-ruby1.8-dbg
+Package: ruby-odbc-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: libodbc-ruby1.8 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: ODBC Binding for ruby1.8
+Depends: ruby-odbc (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: libodbc-ruby1.8-dbg (<< 0.99994-1), libodbc-ruby1.9.1-dbg (<< 0.99994-1)
+Conflicts: libodbc-ruby1.8-dbg (<< 0.99994-1), libodbc-ruby1.9.1-dbg (<< 0.99994-1)
+Provides: libodbc-ruby1.8-dbg, libodbc-ruby1.9.1-dbg
+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
Ruby language, an ODBC binding library and Ruby interface are required. This
- package provides both for Ruby 1.8.
+ package provides them for both Ruby 1.8 and 1.9.1.
.
This package includes both UTF-8 and non-UTF-8 versions.
.
This package allows developers to interpret core dumps by providing
backtrace names for debuggers
+Package: libodbc-ruby
+Section: oldlibs
+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.
+
+Package: libodbc-ruby1.8
+Section: oldlibs
+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.
+
Package: libodbc-ruby1.9.1
-Architecture: any
-Depends: libiodbc2 | unixodbc, ${shlibs:Depends}, ${misc:Depends}
-Suggests: libodbc-ruby1.9.1-doc, libdbi-ruby1.9
-Description: ODBC Binding for ruby1.9.1
- 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
- Ruby language, an ODBC binding library and Ruby interface are required. This
- package provides both for Ruby 1.9.1.
- .
- This package includes both UTF-8 and non-UTF-8 versions.
+Section: oldlibs
+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.
-Package: libodbc-ruby1.9.1-dbg
-Section: debug
-Architecture: any
+Package: libodbc-ruby1.8-dbg
+Section: oldlibs
Priority: extra
-Depends: libodbc-ruby1.9.1 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: ODBC Binding for ruby1.9.1
- 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
- Ruby language, an ODBC binding library and Ruby interface are required. This
- package provides both for Ruby 1.9.1.
- .
- This package includes both UTF-8 and non-UTF-8 versions.
- .
- This package allows developers to interpret core dumps by providing
- backtrace names for debuggers
-
-Package: libodbc-ruby-doc
-Section: doc
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libodbc-ruby1.8
-Description: ODBC Binding for ruby1.8
- 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
- Ruby language, an ODBC binding library and Ruby interface are required. This
- package provides both for Ruby 1.8.
- .
- This package includes documentations for the libraries.
+Architecture: all
+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
-Architecture: any
-Depends: libodbc-ruby1.8, ${shlibs:Depends}, ${misc:Depends}
-Suggests: libdbi-ruby
-Description: ODBC Binding for ruby1.8
- 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
- Ruby language, an ODBC binding library and Ruby interface are required. This
- package provides both for Ruby 1.8.
- .
- This package includes both UTF-8 and non-UTF-8 versions.
- .
- This is a dummy package, which depends on the package containing the actual
- library for the default Ruby version.
+Package: libodbc-ruby1.9.1-dbg
+Section: oldlibs
+Priority: extra
+Architecture: all
+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.
diff --git a/debian/libodbc-ruby-doc.docs b/debian/libodbc-ruby-doc.docs
deleted file mode 100644
index f528701..0000000
--- a/debian/libodbc-ruby-doc.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-doc
diff --git a/debian/libodbc-ruby-doc.examples b/debian/libodbc-ruby-doc.examples
deleted file mode 100644
index 9daeafb..0000000
--- a/debian/libodbc-ruby-doc.examples
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/debian/rules b/debian/rules
index f647077..84de074 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,55 +6,38 @@
ruby_ver1.8 = 1.8
ruby_ver1.9.1 = 1.9.1
-DEB_DBG_PACKAGE_libodbc-ruby$(ruby_ver1.8) = libodbc-ruby$(ruby_ver1.8)-dbg
-DEB_DBG_PACKAGE_libodbc-ruby$(ruby_ver1.9.1) = libodbc-ruby$(ruby_ver1.9.1)-dbg
+DEB_DBG_PACKAGE_ruby-odbc = ruby-odbc-dbg
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+DEB_INSTALL_DOCS_ruby-odbc = README doc
+DEB_INSTALL_EXAMPLES_ruby-odbc = test
-configure/libodbc-ruby$(ruby_ver1.8)::
- cp -r ext ext$(ruby_ver1.8)
- ( cd ext$(ruby_ver1.8) && \
- ([ -e Makefile ] || ruby$(ruby_ver1.8) extconf.rb --enable-dlopen) )
- ( cd ext$(ruby_ver1.8) && \
- ([ -e utf8/Makefile ] || ruby$(ruby_ver1.8) -Cutf8 extconf.rb --enable-dlopen) )
-
-build/libodbc-ruby$(ruby_ver1.8)::
- ( cd ext$(ruby_ver1.8) && \
- ([ -e odbc.so ] || $(MAKE)) )
- ( cd ext$(ruby_ver1.8) && \
- ([ -e utf8/odbc_utf8.so ] || $(MAKE) -Cutf8) )
-
-install/libodbc-ruby$(ruby_ver1.8)::
- $(MAKE) -Cext$(ruby_ver1.8) install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.8) sitedir='$$(prefix)/lib/ruby'
- $(MAKE) -Cext$(ruby_ver1.8)/utf8 install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.8) sitedir='$$(prefix)/lib/ruby'
-
-cleanbuilddir/libodbc-ruby$(ruby_ver1.8)::
- [ ! -e ext$(ruby_ver1.8)/Makefile ] || $(MAKE) -C ext$(ruby_ver1.8) distclean
- [ ! -e ext$(ruby_ver1.8)/utf8/Makefile ] || $(MAKE) -C ext$(ruby_ver1.8)/utf8 distclean
-
-
-configure/libodbc-ruby$(ruby_ver1.9.1)::
- cp -r ext ext$(ruby_ver1.9.1)
- ( cd ext$(ruby_ver1.9.1) && \
- ([ -e Makefile ] || ruby$(ruby_ver1.9.1) extconf.rb --enable-dlopen) )
- ( cd ext$(ruby_ver1.9.1) && \
- ([ -e utf8/Makefile ] || ruby$(ruby_ver1.9.1) -Cutf8 extconf.rb --enable-dlopen) )
-
-build/libodbc-ruby$(ruby_ver1.9.1)::
- ( cd ext$(ruby_ver1.9.1) && \
- ([ -e odbc.so ] || $(MAKE)) )
- ( cd ext$(ruby_ver1.9.1) && \
- ([ -e utf8/odbc_utf8.so ] || $(MAKE) -Cutf8) )
-
-install/libodbc-ruby$(ruby_ver1.9.1)::
- $(MAKE) -Cext$(ruby_ver1.9.1) install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.9.1) sitedir='$$(prefix)/lib/ruby'
- $(MAKE) -Cext$(ruby_ver1.9.1)/utf8 install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver1.9.1) sitedir='$$(prefix)/lib/ruby'
-
-cleanbuilddir/libodbc-ruby$(ruby_ver1.9.1)::
- [ ! -e ext$(ruby_ver1.9.1)/Makefile ] || $(MAKE) -C ext$(ruby_ver1.9.1) distclean
- [ ! -e ext$(ruby_ver1.9.1)/utf8/Makefile ] || $(MAKE) -C ext$(ruby_ver1.9.1)/utf8 distclean
+configure/ruby-odbc::
+ for v in $(ruby_ver1.8) $(ruby_ver1.9.1) ; do \
+ cp -r ext ext$$v; \
+ ( cd ext$$v && ([ -e Makefile ] || ruby$$v extconf.rb --enable-dlopen) ); \
+ ( cd ext$$v && ([ -e utf8/Makefile ] || ruby$$v -Cutf8 extconf.rb --enable-dlopen) ); \
+ done
+
+build/ruby-odbc::
+ for v in $(ruby_ver1.8) $(ruby_ver1.9.1) ; do \
+ ( cd ext$$v && ([ -e odbc.so ] || $(MAKE)) ); \
+ ( cd ext$$v && ([ -e utf8/odbc_utf8.so ] || $(MAKE) -Cutf8) ); \
+ done
+
+install/ruby-odbc::
+ for v in $(ruby_ver1.8) $(ruby_ver1.9.1) ; do \
+ $(MAKE) -Cext$$v install DESTDIR=$(CURDIR)/debian/ruby-odbc sitedir='$$(prefix)/lib/ruby'; \
+ $(MAKE) -Cext$$v/utf8 install DESTDIR=$(CURDIR)/debian/ruby-odbc sitedir='$$(prefix)/lib/ruby'; \
+ done
+
+cleanbuilddir/ruby-odbc::
+ for v in $(ruby_ver1.8) $(ruby_ver1.9.1) ; do \
+ [ ! -e ext$$v/Makefile ] || $(MAKE) -C ext$$v distclean; \
+ [ ! -e ext$$v/utf8/Makefile ] || $(MAKE) -C ext$$v/utf8 distclean; \
+ done
clean::
for v in $(ruby_ver1.8) $(ruby_ver1.9.1) ; do \
--
ruby-odbc.git
More information about the Pkg-ruby-extras-commits
mailing list