[Pkg-ocaml-maint-commits] [SCM] coq-float packaging branch, master, updated. debian/8.2-1.2-3-2-g46216d9

[Stephane Glondu]

The following commit has been merged in the master branch:
commit f09c42ff26805f1a864ac516dbababac357afbca
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Sep 1 16:23:26 2009 +0200

    Move *.vo files to user-contrib/Float + various updates

diff --git a/debian/changelog b/debian/changelog
index c54a8ce..fc0fbe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+coq-float (1:8.2-1.2-4) UNRELEASED; urgency=low
+
+  * Rebuild with OCaml 3.11.2
+  * Rewrite debian/rules with dh overrides
+  * Install *.vo files in user-contrib/Float
+  * debian/control:
+    - move to section math
+    - bump dependency to debhelper
+    - update my e-mail address, remove DMUA
+    - update Standards-Version to 3.8.4 (no changes)
+
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 01 Sep 2009 16:19:53 +0200
+
 coq-float (1:8.2-1.2-3) unstable; urgency=low
 
   * Rebuild with Coq 8.2pl1
diff --git a/debian/control b/debian/control
index e2bbb04..244d987 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,12 @@
 Source: coq-float
-Section: libdevel
+Section: math
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
  Samuel Mimram <smimram at debian.org>,
- Stephane Glondu <steph at glondu.net>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), coq (>= 8.2)
-Standards-Version: 3.8.2
+ Stéphane Glondu <glondu at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), coq (>= 8.2)
+Standards-Version: 3.8.4
 Homepage: http://lipforge.ens-lyon.fr/www/pff/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/coq-float.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/coq-float.git
diff --git a/debian/libfloat-coq.dirs b/debian/libfloat-coq.dirs
deleted file mode 100644
index 6606694..0000000
--- a/debian/libfloat-coq.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/coq/user-contrib
-usr/share/doc/libfloat-coq
diff --git a/debian/libfloat-coq.install b/debian/libfloat-coq.install
index 537f1d6..a248f08 100644
--- a/debian/libfloat-coq.install
+++ b/debian/libfloat-coq.install
@@ -1,3 +1,3 @@
-*.vo     /usr/lib/coq/user-contrib
-*/*.vo   /usr/lib/coq/user-contrib
+*.vo     /usr/lib/coq/user-contrib/Float
+*/*.vo   /usr/lib/coq/user-contrib/Float
 html     /usr/share/doc/libfloat-coq
diff --git a/debian/rules b/debian/rules
index ec01105..ea9f1e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,22 +9,22 @@ BUILDCACHE := $(wildcard ../coq-float.cache)
 
 include /usr/share/coq/coqvars.mk
 
-INCDIRS := $(shell find . -name .git -prune -or -type d -print)
-INCDIRS := $(INCDIRS:%=-I %)
+INCDIRS := -R . Float
 
 FILES_TO_BACKUP := Makefile
 
-configure: configure-stamp
-configure-stamp:
-	dh build --before dh_auto_configure
+%:
+	dh $@
+
+.PHONY: override_dh_auto_configure
+override_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
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 ifeq ($(BUILDCACHE),)
 	$(MAKE) depend
 	$(MAKE) all
@@ -33,25 +33,17 @@ else
 	@echo "===> Build cache detected, skipping compilation <==="
 	rsync -a --exclude=debian --exclude=.git $(BUILDCACHE)/ .
 endif
-	dh build --after dh_auto_test
-	touch $@
 
-clean:
-	dh $@
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+
+.PHONY: override_dh_clean
+override_dh_clean:
+	dh_clean
 	for u in $(FILES_TO_BACKUP); do \
 	  if [ -f "$$u.backup" ]; then mv "$$u.backup" "$$u"; fi \
 	done
 
-install: build
-	dh $@ --before dh_auto_install
-	dh $@ --after dh_auto_install
-
-binary-indep: install
-	echo 'F:CoqABI=$(COQ_ABI)' >> debian/libfloat-coq.substvars
-	dh $@
-
-binary-arch:
-	# No binary-arch packages
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: override_dh_gencontrol
+override_dh_gencontrol:
+	dh_gencontrol -- -VF:CoqABI="$(COQ_ABI)"

-- 
coq-float packaging