[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.7-1-114-g8514fa4

[Nigel Kersten]

The following commit has been merged in the master branch:
commit 6c7d01a933c5992022158ef67854537aceb252c4
Author: Nigel Kersten <nigel at explanatorygap.net>
Date:   Tue Jun 16 14:50:52 2009 -0700

      * Switched to use install.rb, primarily to stop shebangs using /usr/bin/env
      * Stopped using dh_movefiles, moved to dh_install
      * debian/rules greatly cleaned up due to above two changes

diff --git a/debian/changelog b/debian/changelog
index bee0e1b..58a041b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,12 @@ puppet (0.24.8-2) UNRELEASED; urgency=high
     Sandbeck Mathisen to call conditionally call adduser in the postinst, if
     it's available
 
- -- Andrew Pollock <apollock at debian.org>  Wed, 27 May 2009 23:35:12 +0200
+  [ Nigel Kersten ]
+  * Switched to use install.rb, primarily to stop shebangs using /usr/bin/env
+  * Stopped using dh_movefiles, moved to dh_install
+  * debian/rules greatly cleaned up due to above two changes
+
+ -- Nigel Kersten <nigel at explanatorygap.net>  Tue, 16 Jun 2009 14:45:33 -0700
 
 puppet (0.24.8-1) unstable; urgency=low
 
diff --git a/debian/puppet.files b/debian/puppet.files
deleted file mode 100644
index 1752425..0000000
--- a/debian/puppet.files
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/bin/filebucket
-usr/bin/puppet
-usr/bin/puppetdoc
-usr/sbin/puppetd
-usr/bin/ralsh
-usr/lib/ruby/1.8/
-var/log/puppet
-etc/puppet/puppet.conf
diff --git a/debian/puppet.install b/debian/puppet.install
new file mode 100644
index 0000000..ee9dc3e
--- /dev/null
+++ b/debian/puppet.install
@@ -0,0 +1,6 @@
+debian/puppet.conf etc/puppet
+debian/tmp/usr/bin/filebucket usr/bin
+debian/tmp/usr/bin/puppet usr/bin
+debian/tmp/usr/bin/puppetdoc usr/bin
+debian/tmp/usr/bin/puppetd usr/sbin
+debian/tmp/usr/bin/ralsh usr/bin
diff --git a/debian/puppetmaster.files b/debian/puppetmaster.files
deleted file mode 100644
index 78f0ecd..0000000
--- a/debian/puppetmaster.files
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin/puppetlast
-usr/sbin/puppetmasterd
-usr/sbin/puppetca
-usr/sbin/puppetrun
-etc/puppet/
diff --git a/debian/puppetmaster.install b/debian/puppetmaster.install
new file mode 100644
index 0000000..886d78c
--- /dev/null
+++ b/debian/puppetmaster.install
@@ -0,0 +1,7 @@
+debian/fileserver.conf etc/puppet
+ext/puppetlast usr/bin
+# As of puppet 0.25.0 this will no longer be necessary
+# as sbindir will be used by install.rb
+debian/tmp/usr/bin/puppetmasterd usr/sbin
+debian/tmp/usr/bin/puppetca usr/sbin
+debian/tmp/usr/bin/puppetrun usr/sbin
diff --git a/debian/rules b/debian/rules
index a06c07e..ee69062 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,24 +44,13 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	# note to self, fix the install.rb to handle DESTDIR and change
-	# library path
-	install -d -m0755 $(sbindir)
-	install -d -m0755 $(bindir)
-	install -d -m0755 $(rubylibdir)
-	install -d -m0755 $(pkgconfdir)/manifests
-	install -d -m0755 $(localstatedir)/lib/puppet
-	install -d -m0755 $(localstatedir)/run
-	install -d -m0755 $(localstatedir)/log/puppet
-
-	$(INSTALL) -m0755 bin/puppet bin/puppetdoc bin/ralsh ext/puppetlast bin/filebucket $(bindir)
-	$(INSTALL) -m0755 bin/puppetd bin/puppetmasterd bin/puppetca bin/puppetrun $(sbindir)
-	$(INSTALL) -m0644 lib/puppet.rb $(rubylibdir)/puppet.rb
-	cp -a lib/puppet $(rubylibdir)
-	find $(rubylibdir) -type f -perm +ugo+x -exec chmod a-x {} \;
-
-	$(INSTALL) -m0644 debian/fileserver.conf $(pkgconfdir)/fileserver.conf
-	$(INSTALL) -m0644 debian/puppet.conf $(pkgconfdir)/puppet.conf
+	# Note sbindir does nothing right now. Leaving in for future
+	# puppet versions where it is respected.
+	$(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 {} \;
 
 	# Vim auto-syntax-highlighting stuff
 	$(INSTALL) -m0644 ext/vim/syntax/puppet.vim				\
@@ -90,7 +79,7 @@ binary-arch: build install
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_movefiles -i
+	dh_install -i
 	dh_installchangelogs -i CHANGELOG
 	dh_installdocs -i
 	dh_installman

-- 
Puppet packaging for Debian