[DRE-commits] r2232 - packages/mahoro/trunk/debian

[lucas at alioth.debian.org]

Author: lucas
Date: 2007-12-09 11:49:59 +0000 (Sun, 09 Dec 2007)
New Revision: 2232

Modified:
   packages/mahoro/trunk/debian/changelog
   packages/mahoro/trunk/debian/control
   packages/mahoro/trunk/debian/rules
Log:
switched to cdbs

Modified: packages/mahoro/trunk/debian/changelog
===================================================================
--- packages/mahoro/trunk/debian/changelog	2007-12-09 11:03:05 UTC (rev 2231)
+++ packages/mahoro/trunk/debian/changelog	2007-12-09 11:49:59 UTC (rev 2232)
@@ -3,8 +3,10 @@
   * Added Vcs-Svn and Vcs-Browser.
   * Added watch file.
   * Added Homepage.
+  * Switched to CDBS. Renamed binary packages to match the team's
+    policy. Closes: #442825.
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sun, 09 Dec 2007 12:02:52 +0100
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sun, 09 Dec 2007 12:27:01 +0100
 
 mahoro (0.1-2) unstable; urgency=low
 

Modified: packages/mahoro/trunk/debian/control
===================================================================
--- packages/mahoro/trunk/debian/control	2007-12-09 11:03:05 UTC (rev 2231)
+++ packages/mahoro/trunk/debian/control	2007-12-09 11:49:59 UTC (rev 2232)
@@ -3,15 +3,18 @@
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>
-Build-Depends: debhelper (>> 5.0.0), ruby, ruby1.8-dev, libmagic-dev
+Build-Depends: cdbs, debhelper (>> 5.0.0), ruby1.8-dev, libmagic-dev, ruby-pkg-tools
 Standards-Version: 3.7.2
 Homepage: http://mahoro.rubyforge.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/mahoro/
 Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/mahoro/
 
-Package: mahoro-ruby
+Package: libmahoro-ruby
 Architecture: all
-Depends: mahoro-ruby1.8
+Depends: libmahoro-ruby1.8
+Provides: mahoro-ruby
+Conflicts: mahoro-ruby
+Replaces: mahoro-ruby
 Description: File type determination library for Ruby
  This package provides a Ruby interface to the C libmagic library.
  With it, you can determine the type of a file by examining its contents
@@ -20,9 +23,12 @@
  This is a dummy package to install the Mahoro library bindings for
  the default version of Ruby.
 
-Package: mahoro-ruby1.8
+Package: libmahoro-ruby1.8
 Architecture: any
 Depends: ${shlibs:Depends}
+Provides: mahoro-ruby1.8
+Conflicts: mahoro-ruby1.8
+Replaces: mahoro-ruby1.8
 Description: File type determination library for Ruby 1.8
  This package provides a Ruby interface to the C libmagic library.
  With it, you can determine the type of a file by examining its contents

Modified: packages/mahoro/trunk/debian/rules
===================================================================
--- packages/mahoro/trunk/debian/rules	2007-12-09 11:03:05 UTC (rev 2231)
+++ packages/mahoro/trunk/debian/rules	2007-12-09 11:49:59 UTC (rev 2232)
@@ -1,52 +1,8 @@
 #!/usr/bin/make -f
 
-RUBY = ruby1.8
-DESTDIR = $(CURDIR)/debian/mahoro-$(RUBY)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	# Generate Makefile, then build.
-	$(RUBY) extconf.rb --with-magic-include=/usr/include \
-		--with-magic-lib=/usr
-	$(MAKE)
-
-	# Run the test suite, just to be sure.
-	$(RUBY) test.rb
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	-$(MAKE) distclean
-	rm -f build-stamp
-	dh_clean
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install sitedir=$(DESTDIR)/usr/lib/ruby
-
-binary-indep: install
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installchangelogs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+install/mahoro-ruby1.8::
+	ruby1.8 test.rb