[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, master, updated. debian/1.5.9-1-61-gb3b2276

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit 209d88637278a5c188ae438b139cc02729bcc0f7
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Fri Jun 24 09:56:25 2011 +0200

    New packaging to support multiple ruby versions

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index f9c9a3a..a1e3c6e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,19 @@ Section: admin
 Priority: optional
 Maintainer: Puppet Package Maintainers <pkg-puppet-devel at lists.alioth.debian.org>
 Uploaders: Andrew Pollock <apollock at debian.org>, Nigel Kersten <nigel at explanatorygap.net>, Micah Anderson <micah at debian.org>, Stig Sandbeck Mathisen <ssm at debian.org>
-Build-Depends: ruby-pkg-tools, libsetup-ruby1.8, debhelper (>= 5.0.0), ruby (>= 1.8), libopenssl-ruby
+Build-Depends: debhelper (>= 8), gem2deb (>= 0.2.4~)
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-puppet/facter.git
 Vcs-Browser: http://git.debian.org/?p=pkg-puppet/facter.git
 Homepage: http://projects.puppetlabs.com/projects/facter
-
+XS-Ruby-Versions: all
 
 Package: facter
 Architecture: all
-Depends: ruby1.8 (>= 1.8.7.72-3lenny1), net-tools, bind9-host | host, libopenssl-ruby1.8 | libopenssl-ruby1.9, ${misc:Depends}
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-json, net-tools, bind9-host | host
 Recommends: pciutils
-Description: library for retrieving facts from operating systems
+Description: collect and display facts about the system
  A cross-platform Ruby library for retrieving facts from operating systems.
  Supports multiple resolution mechanisms, any of which can be restricted to
  working only on certain operating systems or environments. Facter is
diff --git a/debian/docs b/debian/docs
index 724e084..b43bf86 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-README
-TODO
+README.md
diff --git a/debian/facter.install b/debian/facter.install
deleted file mode 100644
index 977cc86..0000000
--- a/debian/facter.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/ruby/1.8/* usr/lib/ruby/1.8
-debian/tmp/usr/bin/facter usr/bin
diff --git a/debian/rules b/debian/rules
index 5790758..0d75bd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,75 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# export DH_VERBOSE=1
+# export DH_RUBY_IGNORE_TESTS=all
 
-INSTALL=install -Dp
-
-prefix := $(CURDIR)/debian/tmp
-bindir := $(prefix)/usr/bin
-sbindir := $(prefix)/usr/sbin
-libdir := $(prefix)/usr/lib
-localstatedir := $(prefix)/var
-rubylibdir := $(libdir)/ruby/1.8
-sysconfdir := $(prefix)/etc
-pkgconfdir := $(sysconfdir)/facter
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	$(CURDIR)/install.rb --destdir=debian/tmp --bindir=/usr/bin \
-          --sbindir=/usr/sbin --sitelibdir=/usr/lib/ruby/1.8
-        
-	# strip executable bit from all the non-executable files.
-	find debian/tmp/usr/lib/ruby/1.8 -type f -perm /u+x,g+x,o+x -exec chmod a-x {} \;
-	# fix the permissions on all of the directories
-	find debian/tmp/usr/lib/ruby/1.8 -type d -exec chmod 755 {} \;
-
-# Build architecture-dependent files here.
-binary-arch: build install
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_install -i
-	dh_installchangelogs -i CHANGELOG
-	dh_installdocs -i
-	dh_installman
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_shlibdeps -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+	dh $@ --buildsystem=ruby --with ruby

-- 
Packaging of Facter for debian