[DRE-commits] r4463 - in trunk/libdb-ruby/debian: . patches

[Antonio Terceiro]

Author: terceiro-guest
Date: 2009-12-13 01:47:38 +0000 (Sun, 13 Dec 2009)
New Revision: 4463

Added:
   trunk/libdb-ruby/debian/patches/build-against-libdb-4.8.patch
   trunk/libdb-ruby/debian/patches/fail-make-test-if-tests-fail.patch
Modified:
   trunk/libdb-ruby/debian/changelog
   trunk/libdb-ruby/debian/control
   trunk/libdb-ruby/debian/rules
Log:
New version, fixing RC bug



Modified: trunk/libdb-ruby/debian/changelog
===================================================================
--- trunk/libdb-ruby/debian/changelog	2009-12-13 00:11:36 UTC (rev 4462)
+++ trunk/libdb-ruby/debian/changelog	2009-12-13 01:47:38 UTC (rev 4463)
@@ -1,9 +1,27 @@
 libdb-ruby (0.6.5-4) UNRELEASED; urgency=low
 
+  [ Gunnar Wolf ]
   * Changed section to Ruby as per ftp-masters' request
 
- -- Gunnar Wolf <gwolf at debian.org>  Tue, 21 Apr 2009 15:54:12 -0500
+  [ Antonio Terceiro ]
+  * debian/patches/build-against-libdb-4.8.patch: libdb-4.8 is currently the
+    default version of libdb. This fix the problem caused by the package being
+    built against libdb-4.8 headers but linked against libdb-4.7 library
+    (Closes: #556576).
+  * debian/patches/fail-make-test-if-tests-fail.patch: do not ignore failing
+    tests during build.
+  * debian/rules: running tests on install/libdb-ruby1.8 instead of
+    binary/libdb-ruby1.8, because the binary target for ruby1.8 is run just
+    after the package was built for ruby1.9 so the tests ended up running with
+    ruby1.9 and not with ruby1.8.
+  * Bumped Standards Version; no changes needed.
+  * debian/control: added separator between ${shlibs:Depends} and
+    ${misc:Depends} as suggested by lintian.
+  * Added myself to Uploaders.
+  * Added DM-Upload-Allowed flag so that I can upload myself the next time.
 
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Sat, 12 Dec 2009 22:52:06 -0300
+
 libdb-ruby (0.6.5-3) unstable; urgency=low
 
   [ Michael Schutte ]

Modified: trunk/libdb-ruby/debian/control
===================================================================
--- trunk/libdb-ruby/debian/control	2009-12-13 00:11:36 UTC (rev 4462)
+++ trunk/libdb-ruby/debian/control	2009-12-13 01:47:38 UTC (rev 4463)
@@ -2,16 +2,17 @@
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>, Michael Schutte <m.schutte.jr at gmail.com>, Gunnar Wolf <gwolf at debian.org>
+Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>, Michael Schutte <m.schutte.jr at gmail.com>, Gunnar Wolf <gwolf at debian.org>, Antonio Terceiro <terceiro at softwarelivre.org>
 Build-Depends: debhelper (>= 5), libdb-dev, ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev, cdbs, ruby-pkg-tools (>= 0.14)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Homepage: http://moulon.inra.fr/ruby/bdb.html
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libdb-ruby/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libdb-ruby/
+DM-Upload-Allowed: yes
 
 Package: libdb-ruby1.8
 Architecture: any
-Depends: ${shlibs:Depends} ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libdb4.2-ruby1.8 (< 0.6.4-1), libdb4.3-ruby1.8 (< 0.6.4-1), libdb4.4-ruby1.8 (< 0.6.4-1)
 Replaces: libdb4.2-ruby1.8 (< 0.6.4-1), libdb4.3-ruby1.8 (< 0.6.4-1), libdb4.4-ruby1.8 (< 0.6.4-1)
 Provides: libdb4.2-ruby1.8, libdb4.3-ruby1.8, libdb4.4-ruby1.8
@@ -22,7 +23,7 @@
 
 Package: libdb-ruby1.9
 Architecture: any
-Depends: ${shlibs:Depends} ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libdb4.2-ruby1.9 (< 0.6.4-1), libdb4.3-ruby1.9 (< 0.6.4-1)
 Replaces: libdb4.2-ruby1.9 (< 0.6.4-1), libdb4.3-ruby1.9 (< 0.6.4-1)
 Provides: libdb4.2-ruby1.9, libdb4.3-ruby1.9

Added: trunk/libdb-ruby/debian/patches/build-against-libdb-4.8.patch
===================================================================
--- trunk/libdb-ruby/debian/patches/build-against-libdb-4.8.patch	                        (rev 0)
+++ trunk/libdb-ruby/debian/patches/build-against-libdb-4.8.patch	2009-12-13 01:47:38 UTC (rev 4463)
@@ -0,0 +1,11 @@
+--- libdb-ruby-0.6.5.old/src/extconf.rb	2009-12-12 21:54:13.000000000 -0300
++++ libdb-ruby-0.6.5/src/extconf.rb	2009-12-12 22:02:25.000000000 -0300
+@@ -63,7 +63,7 @@
+    $LDFLAGS += " -lpthread"
+ end
+ 
+-version  = with_config('db-version', "-4.7,47,-4.6,46,-4.5,45,-4.4,44,-4.3,43,-4.2,42,-4.1,41,-4.0,-4,40,4,3,2,").split(/,/, -1)
++version  = with_config('db-version', "-4.8,48,-4.7,47,-4.6,46,-4.5,45,-4.4,44,-4.3,43,-4.2,42,-4.1,41,-4.0,-4,40,4,3,2,").split(/,/, -1)
+ version << "" if version.empty?
+ 
+ catch(:done) do

Added: trunk/libdb-ruby/debian/patches/fail-make-test-if-tests-fail.patch
===================================================================
--- trunk/libdb-ruby/debian/patches/fail-make-test-if-tests-fail.patch	                        (rev 0)
+++ trunk/libdb-ruby/debian/patches/fail-make-test-if-tests-fail.patch	2009-12-13 01:47:38 UTC (rev 4463)
@@ -0,0 +1,12 @@
+diff -Nru libdb-ruby-0.6.5.old/extconf.rb libdb-ruby-0.6.5/extconf.rb
+--- libdb-ruby-0.6.5.old/extconf.rb	2009-12-12 22:14:59.000000000 -0300
++++ libdb-ruby-0.6.5/extconf.rb	2009-12-12 22:15:18.000000000 -0300
+@@ -67,7 +67,7 @@
+    Dir.foreach('tests') do |x|
+       next if /^\./ =~ x || /(_\.rb|~)$/ =~ x
+       next if FileTest.directory?(x)
+-      make.print "\t-#{CONFIG['RUBY_INSTALL_NAME']} tests/#{x}\n"
++      make.print "\t#{CONFIG['RUBY_INSTALL_NAME']} tests/#{x}\n"
+    end
+ ensure
+    make.close

Modified: trunk/libdb-ruby/debian/rules
===================================================================
--- trunk/libdb-ruby/debian/rules	2009-12-13 00:11:36 UTC (rev 4462)
+++ trunk/libdb-ruby/debian/rules	2009-12-13 01:47:38 UTC (rev 4463)
@@ -10,6 +10,6 @@
 
 DEB_INSTALL_DOCS_ALL = docs/*.html
 
-binary/libdb-ruby1.8::
+install/libdb-ruby1.8::
 	make test