[Modconf-commits] r183 - trunk/modconf/debian

[Frank Lichtenheld]

Author: djpig
Date: 2005-06-20 23:04:00 +0000 (Mon, 20 Jun 2005)
New Revision: 183

Removed:
   trunk/modconf/debian/prerm
Modified:
   trunk/modconf/debian/changelog
   trunk/modconf/debian/control
   trunk/modconf/debian/postrm
   trunk/modconf/debian/rules
Log:
- Convert package to debhelper
- Change section to admin


Modified: trunk/modconf/debian/changelog
===================================================================
--- trunk/modconf/debian/changelog	2005-06-20 23:02:47 UTC (rev 182)
+++ trunk/modconf/debian/changelog	2005-06-20 23:04:00 UTC (rev 183)
@@ -1,5 +1,7 @@
 modconf (0.2.49) unstable; urgency=low
 
+  * Change section to admin
+  * Change debian/rules to use debhelper
   * Fix the --libdir option to actually make what the man page
     says it does. Introduce a new --contentdir option which
     actually does what the "old" --libdir option would have

Modified: trunk/modconf/debian/control
===================================================================
--- trunk/modconf/debian/control	2005-06-20 23:02:47 UTC (rev 182)
+++ trunk/modconf/debian/control	2005-06-20 23:04:00 UTC (rev 183)
@@ -1,7 +1,8 @@
 Source: modconf
-Section: base
+Section: admin
 Priority: optional
 Maintainer: Frank Lichtenheld <djpig@debian.org>
+Build-Depends: debhelper (>= 4)
 Build-Depends-Indep: pcmcia-source, kernel-tree-2.4.27
 Standards-Version: 3.6.1
 

Modified: trunk/modconf/debian/postrm
===================================================================
--- trunk/modconf/debian/postrm	2005-06-20 23:02:47 UTC (rev 182)
+++ trunk/modconf/debian/postrm	2005-06-20 23:04:00 UTC (rev 183)
@@ -7,3 +7,5 @@
 	rm -f $CONFFILE
     	update-modules || true
 fi
+
+#DEBHELPER#

Deleted: trunk/modconf/debian/prerm
===================================================================
--- trunk/modconf/debian/prerm	2005-06-20 23:02:47 UTC (rev 182)
+++ trunk/modconf/debian/prerm	2005-06-20 23:04:00 UTC (rev 183)
@@ -1,4 +0,0 @@
-#!/bin/sh
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/modconf ]; then
-	rm -f /usr/doc/modconf
-fi

Modified: trunk/modconf/debian/rules
===================================================================
--- trunk/modconf/debian/rules	2005-06-20 23:02:47 UTC (rev 182)
+++ trunk/modconf/debian/rules	2005-06-20 23:04:00 UTC (rev 183)
@@ -1,16 +1,5 @@
 #!/usr/bin/make -f
-# Sample debian.rules file - for GNU Hello (1.3).
-# Copyright 1994,1995 by Ian Jackson.
-# I hereby give you perpetual unlimited permission to copy,
-# modify and relicense this file, provided that you do not remove
-# my name from the file itself.  (I assert my moral right of
-# paternity under the Copyright, Designs and Patents Act 1988.)
-# This file may have to be extensively modified
-#
-# Modified to be a prototype for debmake by Christoph Lameter <clameter@debian.org>
 
-package=modconf
-
 # copied from kernel-image-i386
 version :=  $(shell \
         sed -n 's/.*kernel-tree-\([^,]*\).*/\1/p; t e; b; :e q' \
@@ -19,7 +8,7 @@
 
 build: build-stamp
 build-stamp:
-	$(checkdir)
+	dh_testdir
 	[ -d build ] || mkdir build
 	cd build && tar xjf /usr/src/kernel-source-$(version).tar.bz2
 	cd build/kernel-source-$(version) && \
@@ -28,47 +17,36 @@
 	touch build-stamp
 
 clean:
-	$(checkdir)
+	dh_testdir
+	dh_testroot
 	-$(MAKE) clean
-	-rm -f `find . -name "*~"`
-	-rm -rf debian/tmp debian/files* core
 	-rm -f build-stamp
+	dh_clean
 
-binary-indep:	checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp
-	install -d debian/tmp/usr/share/doc/$(package)
-	install -c -m 644 debian/copyright debian/tmp/usr/share/doc/$(package)/
-	install -c -m 644 debian/changelog debian/tmp/usr/share/doc/$(package)/
-	gzip -9f debian/tmp/usr/share/doc/$(package)/changelog*
-	install -d debian/tmp/DEBIAN
-	install -c -m 755 debian/prerm debian/tmp/DEBIAN/
-	install -c -m 755 debian/postrm debian/tmp/DEBIAN/
-	dpkg-gencontrol -isp
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
+binary-indep: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
 
-binary-arch:	checkroot build
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/modconf
+
+	dh_installchangelogs
+	dh_installdocs
+
+	dh_compress
+	dh_fixperms
+
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-arch: build
 # There are no architecture-dependent files to be uploaded
 # generated by this package.  If there were any they would be
 # made here.
-	$(checkdir)
 
-define checkdir
-	test -f debian/rules
-endef
-
 # Below here is fairly generic really
-
 binary:		binary-indep binary-arch
 
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
 .PHONY: binary binary-arch binary-indep clean checkroot