[DRE-commits] r2201 - in packages/libdb4.2-ruby/trunk: . debian

[lucas at alioth.debian.org]

Author: lucas
Date: 2007-12-08 14:10:16 +0000 (Sat, 08 Dec 2007)
New Revision: 2201

Removed:
   packages/libdb4.2-ruby/trunk/src/
Modified:
   packages/libdb4.2-ruby/trunk/debian/changelog
   packages/libdb4.2-ruby/trunk/debian/control
   packages/libdb4.2-ruby/trunk/debian/rules
Log:
removed local patches applied upstream. drop ruby1.9 support.

Modified: packages/libdb4.2-ruby/trunk/debian/changelog
===================================================================
--- packages/libdb4.2-ruby/trunk/debian/changelog	2007-12-08 14:04:07 UTC (rev 2200)
+++ packages/libdb4.2-ruby/trunk/debian/changelog	2007-12-08 14:10:16 UTC (rev 2201)
@@ -5,6 +5,11 @@
   * Added debian/watch.
   * Added Homepage.
   * New upstream release. All previous patches have been included upstream.
+  * Removed ruby1.9 support, because:
+    + It's not supported upstream, so it breaks all the time
+    + It's not clear yet whether we want to release ruby1.9 with lenny
+    The patch is in debian/Attic/.
+    Closes: #427353.
 
  -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sat, 08 Dec 2007 14:38:36 +0100
 

Modified: packages/libdb4.2-ruby/trunk/debian/control
===================================================================
--- packages/libdb4.2-ruby/trunk/debian/control	2007-12-08 14:04:07 UTC (rev 2200)
+++ packages/libdb4.2-ruby/trunk/debian/control	2007-12-08 14:10:16 UTC (rev 2201)
@@ -2,7 +2,7 @@
 Section: interpreters
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 4.0.0), libdb4.2-dev, ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev
+Build-Depends: debhelper (>> 4.0.0), libdb4.2-dev, ruby1.8, ruby1.8-dev
 Standards-Version: 3.6.2
 Homepage: http://moulon.inra.fr/ruby/bdb.html
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libdb4.2-ruby/
@@ -16,12 +16,3 @@
  (http://www.sleepycat.com/).
  .
  This package provides BDB linked to libdb4.2.
-
-Package: libdb4.2-ruby1.9
-Architecture: any
-Depends: ${shlibs:Depends} ${misc:Depends}
-Description: Interface to Berkeley DB for Ruby 1.9
- BDB is an interface to Berkeley DB, distributed by Sleepycat
- (http://www.sleepycat.com/).
- .
- This package provides BDB linked to libdb4.2.

Modified: packages/libdb4.2-ruby/trunk/debian/rules
===================================================================
--- packages/libdb4.2-ruby/trunk/debian/rules	2007-12-08 14:04:07 UTC (rev 2200)
+++ packages/libdb4.2-ruby/trunk/debian/rules	2007-12-08 14:10:16 UTC (rev 2201)
@@ -16,23 +16,19 @@
 
 rb18_libdir = $(shell ruby1.8 -rrbconfig -e 'print Config::CONFIG["rubylibdir"]')
 rb18_archdir= $(shell ruby1.8 -rrbconfig -e 'print Config::CONFIG["archdir"]')
-rb19_libdir = $(shell ruby1.9 -rrbconfig -e 'print Config::CONFIG["rubylibdir"]')
-rb19_archdir= $(shell ruby1.9 -rrbconfig -e 'print Config::CONFIG["archdir"]')
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	-rm -rf build-tree-{1.8,1.9}
+	-rm -rf build-tree-1.8
 	tar -zcf debian/src.tgz $(filter-out debian,$(wildcard *))
 
-	mkdir build-tree-{1.8,1.9}
+	mkdir build-tree-1.8
 
 	tar -C build-tree-1.8 -zxf debian/src.tgz
-	tar -C build-tree-1.9 -zxf debian/src.tgz
 
 	ruby1.8 -C build-tree-1.8 extconf.rb --with-db-version=-4.2
-	ruby1.9 -C build-tree-1.9 extconf.rb --with-db-version=-4.2
 
 	touch configure-stamp
 
@@ -42,7 +38,6 @@
 	dh_testdir
 
 	$(MAKE) -C build-tree-1.8 $(so_mkflag)
-	$(MAKE) -C build-tree-1.9 $(so_mkflag)
 
 	touch build-stamp
 
@@ -51,7 +46,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-rm -rf build-tree-{1.8,1.9}
+	-rm -rf build-tree-1.8
 	-rm -f debian/bdb.html debian/bdb.rd
 	-rm -f debian/libdb$(bdb_version)-ruby*.{postinst,prerm,doc-base,README.Debian}
 	-rm -f debian/src.tgz
@@ -66,28 +61,19 @@
 
 	# Add here commands to install the package into debian/libdb4.1-ruby.
 	$(MAKE) -C build-tree-1.8 install RUBYARCHDIR=$(dest_dir)1.8$(rb18_archdir)
-	$(MAKE) -C build-tree-1.9 install RUBYARCHDIR=$(dest_dir)1.9$(rb19_archdir)
 
 	cd $(dest_dir)1.8$(rb18_archdir) && \
 	  mv -f $(so_base).so $(so_base)$(so_postfix).so
-	cd $(dest_dir)1.9$(rb19_archdir) && \
-	  mv -f $(so_base).so $(so_base)$(so_postfix).so
 
 	(echo "# This file is hack only for Debian System."; \
 	 echo "require '$(so_base)$(so_postfix).so'") \
 	> $(dest_dir)1.8$(rb18_libdir)/$(so_base)$(so_postfix).rb
-	(echo "# This file is hack only for Debian System."; \
-	 echo "require '$(so_base)$(so_postfix).so'") \
-	> $(dest_dir)1.9$(rb19_libdir)/$(so_base)$(so_postfix).rb
 
 	for f in debian/in.*; \
 	do \
 	  sed -e 's!@@ver@@!1.8!g' \
 	      -e 's!@@libdir@@!$(rb18_libdir)!g' \
 	  < $$f > debian/libdb$(bdb_version)-ruby1.8.`basename $$f | sed -e 's!^in\.!!'`; \
-	  sed -e 's!@@ver@@!1.9!g' \
-	      -e 's!@@libdir@@!$(rb19_libdir)!g' \
-	  < $$f > debian/libdb$(bdb_version)-ruby1.9.`basename $$f | sed -e 's!^in\.!!'`; \
 	done
 
 	sed -e 's/\(((<.*|URL:\)docs\/\(.*\.html.*>))\)/\1\2/g' \