Update package for Debian Etch

3 files changed, 66 insertions, 34 deletions

diff --git a/debian/changelog b/debian/changelog
index ff0744a..a3645a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ivycontrolpanel (2.3-2) unstable; urgency=low
+
+  * Update package for Debian Etch
+
+ -- Olivier Fourdan <fourdan@lerak.tls.cena.fr>  Mon, 15 Jan 2007 10:25:54 +0100
+
 ivycontrolpanel (2.3) unstable; urgency=low
 
   * Ajout d'un mécanisme de polling pour détecter les problèmes de 
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..6619157
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib/ivycontrolpanel
+usr/share/ivycontrolpanel
diff --git a/debian/rules b/debian/rules
index 74aba0a..1b4f3d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,47 +2,68 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
+export DH_VERBOSE=1
 package=ivycontrolpanel
 
-build:
-	$(checkdir)
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp 
+	dh_testdir
+	pod2man src/$(package) > $(package).1
 	touch build
+	touch build-stamp
 
 clean:
-	$(checkdir)
-	-rm -f build
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
 	-$(MAKE) clean
-	-rm -f `find . -name "*~"`
-	-rm -rf debian/tmp debian/files* core debian/substvars
+	dh_clean 
 
-binary-indep: checkroot build
-	$(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
-
-binary-arch: checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp
-	install -d debian/tmp
-	install -d debian/tmp/usr/bin
-	install -d debian/tmp/usr/lib/$(package)
-	install -d debian/tmp/usr/share/$(package)
-	install -m755 src/$(package) debian/tmp/usr/bin/$(package)
-	install -m644 src/*.pm  debian/tmp/usr/lib/$(package)
-	install -m644 images/*.bmp  debian/tmp/usr/share/$(package)
-# Must have debmake installed for this to work. Otherwise please copy
-# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
-	pod2man src/$(package) > $(package).1
-	debstd 
-	dpkg-gencontrol
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
-
-define checkdir
-	test -f debian/rules
-endef
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+	install -m755 src/$(package) $(CURDIR)/debian/tmp/usr/bin/$(package)
+	install -m644 src/*.pm  $(CURDIR)/debian/tmp/usr/lib/$(package)
+	install -m644 images/*.bmp  $(CURDIR)/debian/tmp/usr/share/$(package)
+                 
+binary-indep: build install
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install --source=$(CURDIR)/debian/tmp
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 
@@ -51,3 +72,5 @@ checkroot:
 	test root = "`whoami`"
 
 .PHONY: binary binary-arch binary-indep clean checkroot
+
+