[DRE-commits] r3334 - packages/libodbc-ruby/trunk/debian

daigo at alioth.debian.org daigo at alioth.debian.org
Tue Mar 24 03:13:46 UTC 2009 

Author: daigo
Date: 2009-03-24 03:13:46 +0000 (Tue, 24 Mar 2009)
New Revision: 3334

Added:
   packages/libodbc-ruby/trunk/debian/libodbc-ruby-doc.docs
   packages/libodbc-ruby/trunk/debian/libodbc-ruby-doc.examples
Removed:
   packages/libodbc-ruby/trunk/debian/libodbc-ruby1.8-doc.docs
   packages/libodbc-ruby/trunk/debian/libodbc-ruby1.8-doc.examples
Modified:
   packages/libodbc-ruby/trunk/debian/changelog
   packages/libodbc-ruby/trunk/debian/control
   packages/libodbc-ruby/trunk/debian/rules
Log:
  - Separate a documentation package. 
  - Add a debug package.

Modified: packages/libodbc-ruby/trunk/debian/changelog
===================================================================
--- packages/libodbc-ruby/trunk/debian/changelog	2009-03-24 02:38:07 UTC (rev 3333)
+++ packages/libodbc-ruby/trunk/debian/changelog	2009-03-24 03:13:46 UTC (rev 3334)
@@ -4,8 +4,8 @@
   * The libraries load a ODBC manager dynamically (i.e. runtime). Consult
     debina/README.Debian in details.
   * debian/control:
-    - Separate into five packages: Non-UTF-8 and UTF-8 libraries, debug
-      libraries and a documentation package.
+    - Separate a documentation package. 
+    - Add a debug package.
     - Bump up Standards-Version to 3.8.1.
   * debian/rules
     - Move to the CDBS style.

Modified: packages/libodbc-ruby/trunk/debian/control
===================================================================
--- packages/libodbc-ruby/trunk/debian/control	2009-03-24 02:38:07 UTC (rev 3333)
+++ packages/libodbc-ruby/trunk/debian/control	2009-03-24 03:13:46 UTC (rev 3334)
@@ -12,14 +12,14 @@
 Package: libodbc-ruby1.8
 Architecture: any
 Depends: libiodbc2 | unixodbc, ${shlibs:Depends}, ${misc:Depends}
-Suggests: libodbc-ruby1.8-doc, libodbc-utf8-ruby1.8, libdbi-ruby1.8
+Suggests: libodbc-ruby1.8-doc, libdbi-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 a non-UTF-8 version.
+ This package includes both UTF-8 and non-UTF-8 versions.
 
 Package: libodbc-ruby1.8-dbg
 Section: debug
@@ -32,44 +32,16 @@
  Ruby language, an ODBC binding library and Ruby interface are required. This
  package provides both for Ruby 1.8. 
  .
- This package includes a non-UTF-8 version.
+ 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-utf8-ruby1.8
-Architecture: any
-Depends: libiodbc2 | unixodbc, ${shlibs:Depends}, ${misc:Depends}
-Suggests: libodbc-ruby1.8-doc, libodbc-ruby1.8, libdbi-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 a UTF-8 version.
-
-Package: libodbc-utf8-ruby1.8-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libodbc-utf8-ruby1.8 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-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 a UTF-8 version.
- .
- This package allows developers to interpret core dumps by providing
- backtrace names for debuggers 
-
-Package: libodbc-ruby1.8-doc
+Package: libodbc-ruby-doc
 Section: doc
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libodbc-ruby1.8, libodbc-utf8-ruby1.8
+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

Copied: packages/libodbc-ruby/trunk/debian/libodbc-ruby-doc.docs (from rev 3321, packages/libodbc-ruby/trunk/debian/libodbc-ruby1.8-doc.docs)
===================================================================
--- packages/libodbc-ruby/trunk/debian/libodbc-ruby-doc.docs	                        (rev 0)
+++ packages/libodbc-ruby/trunk/debian/libodbc-ruby-doc.docs	2009-03-24 03:13:46 UTC (rev 3334)
@@ -0,0 +1,2 @@
+README
+doc

Copied: packages/libodbc-ruby/trunk/debian/libodbc-ruby-doc.examples (from rev 3321, packages/libodbc-ruby/trunk/debian/libodbc-ruby1.8-doc.examples)
===================================================================
--- packages/libodbc-ruby/trunk/debian/libodbc-ruby-doc.examples	                        (rev 0)
+++ packages/libodbc-ruby/trunk/debian/libodbc-ruby-doc.examples	2009-03-24 03:13:46 UTC (rev 3334)
@@ -0,0 +1,2 @@
+test.rb
+test

Deleted: packages/libodbc-ruby/trunk/debian/libodbc-ruby1.8-doc.docs
===================================================================
--- packages/libodbc-ruby/trunk/debian/libodbc-ruby1.8-doc.docs	2009-03-24 02:38:07 UTC (rev 3333)
+++ packages/libodbc-ruby/trunk/debian/libodbc-ruby1.8-doc.docs	2009-03-24 03:13:46 UTC (rev 3334)
@@ -1,2 +0,0 @@
-README
-doc

Deleted: packages/libodbc-ruby/trunk/debian/libodbc-ruby1.8-doc.examples
===================================================================
--- packages/libodbc-ruby/trunk/debian/libodbc-ruby1.8-doc.examples	2009-03-24 02:38:07 UTC (rev 3333)
+++ packages/libodbc-ruby/trunk/debian/libodbc-ruby1.8-doc.examples	2009-03-24 03:13:46 UTC (rev 3334)
@@ -1,2 +0,0 @@
-test.rb
-test

Modified: packages/libodbc-ruby/trunk/debian/rules
===================================================================
--- packages/libodbc-ruby/trunk/debian/rules	2009-03-24 02:38:07 UTC (rev 3333)
+++ packages/libodbc-ruby/trunk/debian/rules	2009-03-24 03:13:46 UTC (rev 3334)
@@ -6,43 +6,23 @@
 ruby_ver = 1.8
 
 DEB_DBG_PACKAGE_libodbc-ruby$(ruby_ver) = libodbc-ruby$(ruby_ver)-dbg
-DEB_DBG_PACKAGE_libodbc-utf8-ruby$(ruby_ver) = libodbc-utf8-ruby$(ruby_ver)-dbg
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
-#
-# Non-UTF-8 library
-#
-
 configure/libodbc-ruby$(ruby_ver)::
 	[ -e Makefile ] || ruby$(ruby_ver) extconf.rb --enable-dlopen
+	[ -e utf8/Makefile ] || ruby$(ruby_ver) -Cutf8 extconf.rb --enable-dlopen
 
 build/libodbc-ruby$(ruby_ver)::
 	[ -e odbc.so ] || $(MAKE)
+	[ -e utf8/odbc_utf8.so ] || $(MAKE) -Cutf8
 
 install/libodbc-ruby$(ruby_ver)::
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver) sitedir='$$(prefix)/lib/ruby'
+	$(MAKE) -Cutf8 install DESTDIR=$(CURDIR)/debian/libodbc-ruby$(ruby_ver) sitedir='$$(prefix)/lib/ruby'
 
 cleanbuilddir/libodbc-ruby$(ruby_ver)::
-	[ ! -e Makefile ] || $(MAKE) clean
-	-rm -f Makefile
+	[ ! -e Makefile ] || $(MAKE) distclean
+	[ ! -e utf8/Makefile ] || $(MAKE) -Cutf8 distclean
 
-
-#
-# UTF-8 library
-#
-
-configure/libodbc-utf8-ruby$(ruby_ver)::
-	[ -e utf8/Makefile ] || ruby$(ruby_ver) -Cutf8 extconf.rb --enable-dlopen
-
-build/libodbc-utf8-ruby$(ruby_ver)::
-	[ -e utf8/odbc_utf8.so ] || $(MAKE) -Cutf8
-
-install/libodbc-utf8-ruby$(ruby_ver)::
-	$(MAKE) -Cutf8 install DESTDIR=$(CURDIR)/debian/libodbc-utf8-ruby$(ruby_ver) sitedir='$$(prefix)/lib/ruby'
-
-cleanbuilddir/libodbc-utf8-ruby$(ruby_ver)::
-	[ ! -e utf8/Makefile ] || $(MAKE) -Cutf8 clean
-	-rm -f utf8/Makefile
-

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