The following commit has been merged in the master branch:
commit 00bf12ffa3de8188a6ec4052d24650560a51965f
Author: Stephane Glondu <st...@glondu.net>
Date: Fri Mar 13 21:13:13 2009 +0100
Use debhelper 7 and ocamlvars.mk
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..6f65c29
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+Makefile
+config.cache
+config.status
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 1bb5d5f..7c0498b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,11 @@ Source: ocamlwc
Section: devel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
-Uploaders:
- Georg Neis <g...@oglaroon.de>,
+Uploaders: Georg Neis <g...@oglaroon.de>,
Ralf Treinen <trei...@debian.org>,
Stephane Glondu <st...@glondu.net>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>> 4), dpatch
+Build-Depends: debhelper (>= 7.0.52), dpatch, dh-ocaml
Build-Depends-Indep: ocaml-nox
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlwc.git
@@ -15,7 +14,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlwc.git
Package: ocamlwc
Architecture: all
-Depends: ocaml-base-nox-${F:OCamlABI}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
Description: count the lines of code and comments in OCaml sources
ocamlwc is a program to count the number of lines of code and documentation
in OCaml sources. It assumes the files to be lexically well-formed.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..a9249c6
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+debian/ocamlwc.1
diff --git a/debian/rules b/debian/rules
index 76317a7..f1c6ba1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,37 +3,19 @@
#export DH_VERBOSE=1
include /usr/share/dpatch/dpatch.make
+include /usr/share/ocaml/ocamlvars.mk
-OCAMLABI := $(shell ocamlc -version)
-
-clean: unpatch
- dh_testdir
- dh_testroot
- [ ! -f Makefile ] || $(MAKE) clean
- dh_clean config.cache config.status Makefile
-
-build: patch
- dh_testdir
+override_dh_auto_configure: patch-stamp
./configure
- $(MAKE)
-binary-indep: build
- dh_testdir
- dh_testroot
- dh_installdirs /usr/bin
+override_dh_auto_install:
$(MAKE) install BINDIR=$(CURDIR)/debian/ocamlwc/usr/bin/
- dh_installchangelogs
- dh_installdocs
- dh_installman debian/ocamlwc.1
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
- dh_md5sums
- dh_builddeb
+ echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/ocamlwc.substvars
-binary-arch: build
+clean: unpatch
+ dh $@
-binary: binary-indep binary-arch
+%:
+ dh $@
-.PHONY: clean build binary-indep binary-arch binary
+.PHONY: clean
--
ocamlwc packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
