[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.09.3-3-8-g2567332

[Stephane Glondu]

The following commit has been merged in the master branch:
commit c055c5d6eb030b491ef681be68e508c957224763
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon May 24 18:32:28 2010 +0200

    Switch debian/rules to dh with overrides

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..fafcdff
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+Makefile.here
+conf.ml
+otags.byte
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 59219aa..a5f2cab 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Uploaders:
  Mehdi Dogguy <mehdi at debian.org>,
  Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- ocaml-nox (>= 3.10.0),
- debhelper (>= 5.0.0),
- dh-ocaml (>= 0.4.1),
+ ocaml-nox (>= 3.11.1-3~),
+ debhelper (>= 7.2.11~),
+ dh-ocaml (>= 0.9~),
  camlp5
 Standards-Version: 3.8.4
 Homepage: http://www.cs.ru.nl/~tews/otags/
diff --git a/debian/otags.manpages b/debian/otags.manpages
new file mode 100644
index 0000000..c71db04
--- /dev/null
+++ b/debian/otags.manpages
@@ -0,0 +1,2 @@
+debian/otags.1
+debian/update-otags.8
diff --git a/debian/rules b/debian/rules
index de52b21..e7816ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,72 +1,39 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PACKAGE=otags
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
+FILES_TO_BACKUP = Makefile.depend
 
-configure-stamp: configure
-	dh_testdir
-	./configure --prefix /usr --libdir $(OCAML_STDLIB_DIR)/otags/ --bytecode
-	touch configure-stamp
-
-build: build-stamp
+%:
+	dh --with ocaml $@
 
-build-stamp: ocamlinit configure-stamp
-	dh_testdir
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	for u in $(FILES_TO_BACKUP); do \
+	  cp $$u debian/$$u.backup; \
+	done
+	./configure --prefix /usr --libdir $(OCAML_STDLIB_DIR)/otags/ --bytecode
 
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 	$(MAKE) depend
 	$(MAKE)
 
-	touch build-stamp
-
-clean: clean1 ocamlinit-clean
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
 	[ ! -f Makefile.here ] || $(MAKE) clean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
+	for u in $(FILES_TO_BACKUP); do \
+	  if [ -f debian/$$u.backup ]; then \
+	    mv debian/$$u.backup $$u; \
+	  fi; \
+	done
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/otags
 
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_installman debian/otags.1 debian/update-otags.8
-	dh_install
-	dh_installcron
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: override_dh_auto_test
+override_dh_auto_test:

-- 
otags packaging