[Pkg-ocaml-maint-commits] [SCM] omake packaging branch, master, updated. debian/0.9.8.5-3-4-18-g6503605

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 775916748cb7caf542bb7e003527465a28844be9
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Apr 11 14:40:09 2009 +0200

    Use debhelper 7 and overrides

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..3321a6c
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+.config
+.omakedb
+test/OMakefile.omc
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 783d254..b42755e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Mike Furr <mfurr at debian.org>, Stephane Glondu <steph at glondu.net>
 Build-Depends:
- debhelper (>= 4.0.0),
+ debhelper (>= 7.2.6),
  autotools-dev,
  ocaml-nox (>= 3.10.0),
  libfam-dev,
@@ -19,7 +19,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/omake.git
 
 Package: omake
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: build system with automated dependency analysis
  omake is a build system designed to scale from small projects to very
  large projects spanning many directories. omake uses a syntax similar
diff --git a/debian/rules b/debian/rules
index 287335b..5894496 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,68 +8,50 @@ PACKAGE=omake
 include /usr/share/quilt/quilt.make
 include /usr/share/ocaml/ocamlvars.mk
 
-build: build-stamp
-build-stamp: patch
-	dh_testdir
+build: patch
+	dh $@
 
+override_dh_auto_build:
 	$(MAKE) PREFIX=/usr MANDIR=/usr/share/man bootstrap
 	$(MAKE) PREFIX=/usr MANDIR=/usr/share/man all
 
-	touch build-stamp
-
-clean: patch clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
+override_dh_auto_clean:
+ifneq ($(wildcard omake-boot),)
+	debian/rules patch
 	-./omake-boot clean
-	find . -name '*.omc' | xargs rm -f
-	rm -f .omakedb .config
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+endif
+	debian/rules unpatch
 
+override_dh_auto_install:
 	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/omake/ install
-
 	rm -f $(CURDIR)/debian/omake/usr/bin/ocamldep-omake
 	rm -f $(CURDIR)/debian/omake/usr/bin/cvs_realclean
 
+override_dh_installdocs:
+	dh_installdocs -XCVS -X.cvsignore \
+	  -X.ps -X.eps -X.psd -X.ai -X.tex
 
-binary-indep: build install
-
+override_dh_compress:
+	dh_compress -X.html
 
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGELOG.txt
-	dh_installdocs -XCVS -X.cvsignore
-	rm debian/omake/usr/share/doc/omake/html/images/*.ps
-	rm debian/omake/usr/share/doc/omake/html/images/*.eps
-	rm debian/omake/usr/share/doc/omake/html/images/*.psd
-	rm debian/omake/usr/share/doc/omake/html/images/*.ai
-	rm debian/omake/usr/share/doc/omake/html/images/*.tex
-	dh_installexamples
-	dh_install
-#	dh_installman doc/man/*.1
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	dh_strip -Xocamldep-omake
+override_dh_strip:
+# omake is compiled with -custom
+ifdef OCAML_OPT_ARCH
+	dh_strip
 endif
-	dh_compress -Xhtml/
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install redo-patches
+%:
+	dh $@
+
+
+.PHONY: build \
+  override_dh_auto_build \
+  override_dh_auto_clean \
+  override_dh_auto_install \
+  override_dh_installdocs \
+  override_dh_compress \
+  override_dh_strip \
+  redo-patches
 
 redo-patches::
 	rm -f debian/patches/*

-- 
omake packaging