[Pkg-ocaml-maint-commits] [SCM] coq-float packaging branch, master, updated. debian/8.1-1.0-4-10-g98145e7

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 98145e7891363589df9e2578289beb67b2d7d60b
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Feb 23 16:17:15 2009 +0100

    More extensive use of debhelper 7, add build cache

diff --git a/debian/changelog b/debian/changelog
index 9386783..c37f11e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,15 +2,16 @@ coq-float (1:8.2-1.2-1) UNRELEASED; urgency=low
 
   [ Stephane Glondu ]
   * New Upstream Version
+  * Use debhelper 7
+  * Add a build cache (for Debian debugging)
 
   [ Samuel Mimram ]
   * Switch packaging to git.
   * Enforce strict dependency on coq ABI.
   * Update standards version to 3.8.0.
-  * Update compat to 7.
   * Add Homepage field.
 
- -- Stephane Glondu <steph at glondu.net>  Mon, 23 Feb 2009 15:24:30 +0100
+ -- Stephane Glondu <steph at glondu.net>  Mon, 23 Feb 2009 16:52:25 +0100
 
 coq-float (1:8.1-1.0-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7322c1a..fa7453d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,6 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/coq-float.git
 
 Package: libfloat-coq
 Architecture: all
-Depends: ${shlibs:Depends}, coq-${F:CoqABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, coq-${F:CoqABI}
 Description: coq library for floating point numbers
  Library for reasoning about floating point numbers in coq.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index c9ea3de..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/coq/user-contrib
-usr/share/doc/libfloat-coq/html
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/libfloat-coq.dirs b/debian/libfloat-coq.dirs
new file mode 100644
index 0000000..6606694
--- /dev/null
+++ b/debian/libfloat-coq.dirs
@@ -0,0 +1,2 @@
+usr/lib/coq/user-contrib
+usr/share/doc/libfloat-coq
diff --git a/debian/libfloat-coq.install b/debian/libfloat-coq.install
new file mode 100644
index 0000000..537f1d6
--- /dev/null
+++ b/debian/libfloat-coq.install
@@ -0,0 +1,3 @@
+*.vo     /usr/lib/coq/user-contrib
+*/*.vo   /usr/lib/coq/user-contrib
+html     /usr/share/doc/libfloat-coq
diff --git a/debian/rules b/debian/rules
index 510deed..ec01105 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,74 +1,57 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/coq/coqvars.mk
+# Build cache (for accelerating Debian debugging)
+BUILDCACHE := $(wildcard ../coq-float.cache)
 
-DESTDIR := debian/libfloat-coq/$(shell coqc -where)/user-contrib
+include /usr/share/coq/coqvars.mk
 
-INCDIRS := $(shell find . -type d)
+INCDIRS := $(shell find . -name .git -prune -or -type d -print)
 INCDIRS := $(INCDIRS:%=-I %)
 
+FILES_TO_BACKUP := Makefile
+
 configure: configure-stamp
 configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
+	dh build --before dh_auto_configure
+	for u in $(FILES_TO_BACKUP); do \
+	  if [ ! -f "$$u.backup" ]; then cp "$$u" "$$u.backup"; fi \
+	done
+	coq_makefile $(INCDIRS) $(shell find . -name \*.v) > Makefile
+	touch $@
 
 build: build-stamp
 build-stamp: configure-stamp
-	dh_testdir
-
-	coq_makefile $(INCDIRS) $(shell find . -name \*.v) > Makefile
+ifeq ($(BUILDCACHE),)
 	$(MAKE) depend
 	$(MAKE) all
 	$(MAKE) html
-
+else
+	@echo "===> Build cache detected, skipping compilation <==="
+	rsync -a --exclude=debian --exclude=.git $(BUILDCACHE)/ .
+endif
+	dh build --after dh_auto_test
 	touch $@
 
 clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	[ ! -f Makefile ] || $(MAKE) clean
-
-	dh_clean
+	dh $@
+	for u in $(FILES_TO_BACKUP); do \
+	  if [ -f "$$u.backup" ]; then mv "$$u.backup" "$$u"; fi \
+	done
 
 install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	cp $(shell find . -name \*.vo) $(DESTDIR)
-	cp $(wildcard *.html) debian/libfloat-coq/usr/share/doc/libfloat-coq/html
+	dh $@ --before dh_auto_install
+	dh $@ --after dh_auto_install
 
-binary-indep: build install
+binary-indep: install
+	echo 'F:CoqABI=$(COQ_ABI)' >> debian/libfloat-coq.substvars
+	dh $@
 
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:CoqABI="$(COQ_ABI)"
-	dh_md5sums
-	dh_builddeb
+binary-arch:
+	# No binary-arch packages
 
-binary: binary-indep binary-arch
+binary: binary-indep
 .PHONY: build clean binary-indep binary-arch binary install configure

-- 
coq-float packaging