[DRE-commits] [SCM] ruby-bsearch packaging branch, master, updated. debian/1.5-6-7-g28c48c6

[TANIGUCHI Takaki]

The following commit has been merged in the master branch:
commit 4f71a7b55ab69f4801554fd5da61cf13540312a4
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Tue May 17 10:09:52 2011 +0900

    Build with New Ruby policy.
      + debian/rules: switch to dh7 style.
      + Remove obsolete files debian/{dh_ruby, install.rb}.

diff --git a/debian/changelog b/debian/changelog
index 088bf51..ab8e476 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ ruby-bsearch (1.5-7) UNRELEASED; urgency=low
 
   * debian/control: change Maintainer to Debian Ruby Extra Maintainers.
 
- -- TANIGUCHI Takaki <takaki at asis.media-as.org>  Tue, 17 May 2011 09:49:07 +0900
+ -- TANIGUCHI Takaki <takaki at debian.org>  Tue, 17 May 2011 09:49:07 +0900
 
 ruby-bsearch (1.5-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5e5bd21..c927e19 100644
--- a/debian/control
+++ b/debian/control
@@ -4,20 +4,35 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: TANIGUCHI Takaki <takaki at debian.org>
 Build-Depends: debhelper (>> 7.0.0)
-Build-Depends-Indep: ruby, ruby1.8-dev
+Build-Depends-Indep: ruby
 Standards-Version: 3.8.3
 
-Package: libbsearch-ruby
+Package: ruby-bsearch
 Architecture: all
-Depends: libbsearch-ruby1.8
-Description: binary search library for Ruby
- This is dependency package to libbsearch-ruby1.8
-
-Package: libbsearch-ruby1.8
-Architecture: all
-Depends: libruby1.8
+Depends: ruby-intepreter | ruby, ${misc:Depends}
+Replaces: libbsearch-ruby (<< 1.5-7~), libbsearch-ruby1.8 (<< 1.5-7~)
+Conflicts: libbsearch-ruby (<< 1.5-7~), libbsearch-ruby1.8 (<< 1.5-7~)
+Provides: libbsearch-ruby, libbsearch-ruby1.8
 Description: binary search library for Ruby
  It can search the FIRST or LAST occurrence in an array with a condition 
  given by a block.
  The latest version of Ruby/Bsearch is available at 
  http://namazu.org/~satoru/ruby-bsearch/
+
+Package: libbsearch-ruby1.8
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-bsearch
+Description: Transitional package for ruby-bsearch
+ This is a transitional package to ease upgrades to the ruby-bsearch
+ package. It can safely be removed.
+
+Package: libbsearch-ruby
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-bsearch
+Description: Transitional package for ruby-bsearch
+ This is a transitional package to ease upgrades to the ruby-bsearch
+ package. It can safely be removed.
+
+
diff --git a/debian/dh_ruby b/debian/dh_ruby
deleted file mode 100644
index a62acc5..0000000
--- a/debian/dh_ruby
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/ruby
-
-pkg=ARGV[0]
-pkgext=""
-if pkg != ""
-  pkgext= pkg + "."
-end
-substvars="debian/#{pkgext}substvars"
-require 'rbconfig'
-CONFIG = Config::MAKEFILE_CONFIG
-File.open(substvars, "w") {|f|
- f.puts "ruby:Depends=ruby (>= #{CONFIG['MAJOR']}.#{CONFIG['MINOR']}), ruby (<< #{CONFIG['MAJOR']}.#{CONFIG['MINOR'].to_i+1})"
-}
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..7602a7e
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+bsearch.rb /usr/lib/vendor_ruby
diff --git a/debian/install.rb b/debian/install.rb
deleted file mode 100644
index 1058a57..0000000
--- a/debian/install.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/ruby
-require 'mkmf'
-require 'ftools'
-
-destdir=File.join(ARGV[1], $libdir.sub('$(exec_prefix)', '/usr'), 'ruby', Config::CONFIG["ruby_version"])
-File::makedirs(destdir)
-File::install(ARGV[0], "#{destdir}/#{ARGV[0]}", 0644, true)
-
-
diff --git a/debian/rules b/debian/rules
index 99c9047..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,74 +1,4 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-RUBY = ruby1.8
-DESTDIR=$(CURDIR)/debian/libbsearch-$(RUBY)
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-	# Add here commands to compile the package.
-	#$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	# Add here commands to clean up after the build process.
-	#-$(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/ruby-bsearch.
-	#$(MAKE) install DESTDIR=$(DESTDIR)
-	$(RUBY) debian/install.rb bsearch.rb $(DESTDIR)
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf	
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-#	$(RUBY) ./debian/dh_ruby libbsearch-ruby
-#	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+	dh $@

-- 
ruby-bsearch packaging