[Piuparts-commits] rev 279 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2009-03-18 02:01:57 +0000 (Wed, 18 Mar 2009)
New Revision: 279

Added:
   trunk/debian/rules
Removed:
   trunk/debian/conffiles
Modified:
   trunk/Makefile
   trunk/debian/changelog
   trunk/debian/control
Log:
  * debian/control: depend on python (>>2.4), make dependency to python-debian
    unversioned and add one for debhelper.
  * Rewrite debian/rules using debhelper.



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-03-18 01:27:12 UTC (rev 278)
+++ trunk/Makefile	2009-03-18 02:01:57 UTC (rev 279)
@@ -16,7 +16,7 @@
 
 ignore = -I fdmount -N
 
-all: piuparts.1 
+all: piuparts.1 install-conf install-py
 
 piuparts.1: piuparts.docbook
 	docbook2x-man --encoding=utf-8 piuparts.docbook
@@ -49,7 +49,7 @@
 	install -m 0644 piupartslib/*.py $(site24)/piupartslib
 	install -m 0644 piupartslib/*.py $(site25)/piupartslib
 
-install: install-py install-conf
+install: all
 
 check:
 	python piuparts.py unittest

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-03-18 01:27:12 UTC (rev 278)
+++ trunk/debian/changelog	2009-03-18 02:01:57 UTC (rev 279)
@@ -34,8 +34,10 @@
       value "sections". 
     - provide links to logfiles in statistics page.
     - improve look.
-  * control: depend on python (>>2.4) at least. 
   * Makefile: add "~$date" to versionstring if building an unreleased version.
+  * debian/control: depend on python (>>2.4), make dependency to python-debian
+    unversioned and add one for debhelper.
+  * Rewrite debian/rules using debhelper.
 
  -- Holger Levsen <holger at debian.org>  Tue, 10 Mar 2009 15:23:59 +0100
 

Deleted: trunk/debian/conffiles

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2009-03-18 01:27:12 UTC (rev 278)
+++ trunk/debian/control	2009-03-18 02:01:57 UTC (rev 279)
@@ -10,8 +10,8 @@
 Section: devel
 Priority: extra
 Standards-Version: 3.8.0
-Build-Depends-Indep: docbook2x, python-support, docbook-xml
-XS-Python-Version: all
+Build-Depends: debhelper (>=5.0.42)
+Build-Depends-Indep: docbook2x, python-support, docbook-xml, asciidoc
 Vcs-Svn: svn://svn.debian.org/svn/piuparts/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/piuparts/trunk/
 Homepage: http://wiki.debian.org/piuparts
@@ -19,7 +19,7 @@
 Package: piuparts
 Architecture: all
 Depends: apt, python (>> 2.4), debootstrap (>= 0.3.3), lsof, lsb-release, 
-    python-debian (>= 0.1.4)
+    python-debian
 Description: .deb package installation, upgrading, and removal testing tool
  piuparts tests that .deb packages (as used by Debian) handle
  installation, upgrading, and removal correctly. It does this by
@@ -30,4 +30,3 @@
  . 
  piuparts is meant as a quality assurance tool for people who create .deb
  packages to test them before they upload them to the Debian package archive.
-XB-Python-Version: all

Added: trunk/debian/rules
===================================================================
--- trunk/debian/rules	                        (rev 0)
+++ trunk/debian/rules	2009-03-18 02:01:57 UTC (rev 279)
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
+
+
+build:
+
+clean:
+	dh_testdir
+	dh_testroot
+	$(MAKE) clean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_installman
+	$(MAKE) prefix=$(CURDIR)/debian/piuparts/usr etcdir=$(CURDIR)/debian/piuparts/etc install
+
+binary-arch:
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installchangelogs
+	dh_compress
+	dh_fixperms
+	dh_pysupport
+	dh_installdeb 
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-arch binary-indep binary install


Property changes on: trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *