[Pkg-ocaml-maint-commits] [SCM] alt-ergo packaging branch, master, updated. debian/0.9-1-9-g6c60e79

Tue Jun 1 19:31:13 UTC 2010

The following commit has been merged in the master branch:
commit 9e0edf9e6464ea322ec8dcac536a4b695d6c2d65
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Jun 1 20:40:09 2010 +0200

    Refresh packaging (dh-ocaml, dh overrides, using quilt)

diff --git a/debian/changelog b/debian/changelog
index ebef523..876c820 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ alt-ergo (0.91-1) unstable; urgency=low
 
   * New upstream release.
   * Update my email address and remove DMUA
+  * Refresh packaging (dh-ocaml, dh overrides, quilt)
 
- -- Mehdi Dogguy <mehdi at debian.org>  Tue, 01 Jun 2010 20:11:55 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 01 Jun 2010 20:37:56 +0200
 
 alt-ergo (0.9-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index bb5c93d..aea7e8a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,12 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
  Mehdi Dogguy <mehdi at debian.org>
 Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 7.0.50~),
  autotools-dev,
- ocaml-nox (>= 3.11.1),
+ ocaml-nox (>= 3.11.1-3~),
  libocamlgraph-ocaml-dev (>= 1.1),
- dpatch,
- dh-ocaml (>= 0.4.1)
+ quilt (>= 0.46-7~),
+ dh-ocaml (>= 0.9.0~)
 Homepage: http://alt-ergo.lri.fr
 Standards-Version: 3.8.2
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/alt-ergo.git
@@ -18,7 +18,7 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git
 
 Package: alt-ergo
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlRun}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}
 Suggests: why
 Description: Automatic theorem prover dedicated to program verification
  Alt-Ergo is an automatic theorem prover dedicated to program verification. 
diff --git a/debian/patches/0001-No-need-to-activate-debug-flag.patch b/debian/patches/0001-No-need-to-activate-debug-flag.patch
new file mode 100644
index 0000000..5ff0c7b
--- /dev/null
+++ b/debian/patches/0001-No-need-to-activate-debug-flag.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Tue, 1 Jun 2010 20:41:04 +0200
+Subject: [PATCH] No need to activate debug flag
+
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index bcb966a..f19ee42 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -54,7 +54,7 @@ EXE = @EXE@
+ 
+ INCLUDES = @OCAMLGRAPHLIB@ @LABLGTK2LIB@
+ 
+-BFLAGS = -dtypes -g $(INCLUDES)
++BFLAGS = -dtypes $(INCLUDES)
+ OFLAGS = -dtypes $(INCLUDES)
+ 
+ BIBBYTE=nums.cma graph.cma unix.cma
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 2851015..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_no_debug
diff --git a/debian/patches/01_no_debug.dpatch b/debian/patches/01_no_debug.dpatch
deleted file mode 100644
index 303dba6..0000000
--- a/debian/patches/01_no_debug.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_better_Makefile.dpatch by  <dogguy at pps.jussieu.fr>
-##
-## DP: Removes debug flag from bytecode executable.
-
- at DPATCH@
-diff -urNad trunk~/Makefile.in trunk/Makefile.in
---- trunk~/Makefile.in	2008-07-21 22:05:29.000000000 +0200
-+++ trunk/Makefile.in	2008-09-10 10:10:29.000000000 +0200
-@@ -41,7 +41,7 @@
- EXE = @EXE@
- 
- INCLUDES = @OCAMLGRAPHLIB@ 
--BFLAGS = -dtypes -g $(INCLUDES)
-+BFLAGS = -dtypes $(INCLUDES)
- OFLAGS = -dtypes $(INCLUDES)
- 
- BIBBYTE=nums.cma graph.cma unix.cma
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..605b2ad
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-No-need-to-activate-debug-flag.patch
diff --git a/debian/rules b/debian/rules
index da02c66..c77b9bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,71 +3,35 @@
 
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
 include /usr/share/ocaml/ocamlvars.mk
 
 OCAML_RUNTIME_NOX  = $(if $(OCAML_OPT_ARCH),,ocaml-base-nox-$(OCAML_ABI))
 MAKEOPTS  = OCAMLC=ocamlc OCAMLOPT=ocamlopt OCAMLLEX=ocamllex OCAMLLIB=$(OCAML_STDLIB_DIR) OCAMLVERSION=$(OCAML_ABI)
 BACKUP    = version.ml .depend
 
-config.status: 
-	dh_testdir
+override_dh_auto_configure:
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 	--build=$(DEB_BUILD_GNU_TYPE)           \
 	--prefix=/usr                           \
 	--mandir=\$${prefix}/share/man
 
-build: patch build-arch
-
-build-indep: build-indep-stamp
-build-indep-stamp:
-	touch $@
-
-build-arch: build-arch-stamp
-build-arch-stamp: config.status
-	dh_testdir
+override_dh_auto_build:
 	for i in $(BACKUP); do \
 		cp -ax $$i $$i.debian; \
 	done
 	$(MAKE) $(OCAML_BEST)
-	touch $@
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
+override_dh_auto_clean:
 	if [ -f Makefile ]; then \
 		$(MAKE) clean;   \
 	fi
 	for i in $(BACKUP); do \
 		[ ! -f $$i.debian ] || mv $$i.debian $$i; \
 	done
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+override_dh_auto_install:
 	cp -f alt-ergo.$(OCAML_BEST) $(CURDIR)/debian/alt-ergo/usr/bin/alt-ergo
 	cp -f smt_prelude.mlw $(CURDIR)/debian/alt-ergo/usr/lib/alt-ergo
 
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlRun="$(OCAML_RUNTIME_NOX)"
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh --with quilt,ocaml $@

-- 
alt-ergo packaging

