[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-755-ga3ab31d

[Holger Levsen]

The following commit has been merged in the piatti branch:
commit 3c0649bb5558c39ac56bff773a359646dd8ed086
Author: David Steele <dsteele at gmail.com>
Date:   Sat Jun 16 01:09:11 2012 -0400

    Use dh_install, in preparation for multiple package support.

diff --git a/debian/changelog b/debian/changelog
index d4d6ed3..f84de1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ piuparts (0.45) UNRELEASED; urgency=low
   * Remove debian/postinst as it was only dealing with lenny time area
     configuration files.
   * Added server configuration files for apache, sudo, and cron.
+  * Use dh_install, in preparation for multiple package build.
   * packagesdb.py:
     - Calculate recursive reverse dependency count, and store in PackagesDB.
     - Calculate the count of packages being blocked by a failed package.
diff --git a/debian/rules b/debian/rules
index 20376db..3275f66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,9 @@ install: build
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	dh_installman
-	$(MAKE) prefix=$(CURDIR)/debian/piuparts/usr etcdir=$(CURDIR)/debian/piuparts/etc all
+	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr etcdir=$(CURDIR)/debian/tmp/etc all
+	dh_install
+	dh_installman --sourcedir=debian/piuparts
 
 binary-arch:
 binary-indep: build install

-- 
piuparts git repository