[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.19+dfsg-2-17-g9832da6

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 7ed82e1e14a8f621841f1451e4107165031429d5
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 10 20:14:13 2010 +0100

    Refresh packaging

diff --git a/debian/changelog b/debian/changelog
index 89a0fc5..58461a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ why (2.23+dfsg-1) UNRELEASED; urgency=low
     + Remove jessie_lib.dpatch (not needed anymore)
     + Needs ocamlgraph 1.3
     + Fixes detection of Alt-Ergo (Closes: #552776).
+  * Refresh packaging
+    + Use dh 7 features
+    + Build-depend on quilt (goodbye dpatch!)
   * Set filter-pristine-tar to True in debian/gbp.conf
   * Remove libjessie-ocaml-dev which is no longer user by Frama-C
   * Update copyright file
diff --git a/debian/control b/debian/control
index 163a08a..693e31c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
   Samuel Mimram <smimram at debian.org>,
   Mehdi Dogguy <mehdi at debian.org>
 Build-Depends:
-  debhelper (>= 7),
+  debhelper (>= 7.0.50~),
   autotools-dev,
   dh-ocaml (>= 0.4.1),
   ocaml-nox (>= 3.11.1),
@@ -17,7 +17,7 @@ Build-Depends:
   libfloat-coq (>= 1:8.2-1.2-3),
   libocamlgraph-ocaml-dev (>= 1.3),
   frama-c-nox,
-  dpatch
+  quilt (>= 0.46-7~)
 Standards-Version: 3.8.2
 Homepage: http://why.lri.fr/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/why.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/patches/logopath.dpatch b/debian/patches/logopath.dpatch
deleted file mode 100755
index 3dcd8a2..0000000
--- a/debian/patches/logopath.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## logopath.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
-##
-## DP: Move the logo in the right place.
-
- at DPATCH@
-diff -urNad trunk~/intf/pprinter.ml trunk/intf/pprinter.ml
---- trunk~/intf/pprinter.ml	2008-10-29 11:35:08.000000000 +0100
-+++ trunk/intf/pprinter.ml	2008-11-04 15:48:57.000000000 +0100
-@@ -167,7 +167,7 @@
- 	  b#set_text (banner());
- 	  begin
- 	    try
--	      let why_logo_image = Filename.concat Version.libdir "why-logo-1.png" in
-+	      let why_logo_image = "/usr/share/why/why-logo-1.png" in
- 	      let why_logo = GdkPixbuf.from_file why_logo_image in
- 	      b#insert_pixbuf ~iter:b#start_iter ~pixbuf:why_logo 
- 	    with _ -> 
diff --git a/debian/rules b/debian/rules
index 87dad0c..e1612fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,87 +3,46 @@
 
 export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
 include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/coq/coqvars.mk
 
 WHYDIR    = $(CURDIR)/debian/why
+FRAMADIR  = $(WHYDIR)/$(shell frama-c -print-plugin-path)
 VERSION   = $(shell cat Version | grep ^VERSION | cut -d= -f 2)
+export OCAMLINIT_SED += -e 's/@VERSION@/$(VERSION)/g'
 
-OCAMLINIT_SED += -e 's/@VERSION@/$(VERSION)/g'
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	dh_ocamlinit
+override_dh_auto_configure:
 	./configure \
 	    --host=$(DEB_HOST_GNU_TYPE) \
 	    --build=$(DEB_BUILD_GNU_TYPE) \
 	    --prefix=/usr \
 	    --libdir=/usr/share \
 	    --mandir=\$${prefix}/share/man \
-	    --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
+	    --infodir=\$${prefix}/share/info \
 	    LDFLAGS="-Wl,-z,defs"
 	cp .depend .depend.debian
 
-build: patch-stamp build-stamp
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	dh_ocamlinit -d
+override_dh_auto_clean:
 	[ ! -f Makefile ] || sed -e 's/include .depend.*//g' Makefile > Makefile.debian
 	[ ! -f Makefile.debian ] || $(MAKE) -f Makefile.debian clean
 	-cp lib/coq/WhyCoq8.v lib/coq/WhyCoqCompat.v
 	[ ! -f .depend.debian ]  || mv .depend.debian .depend
 	$(RM) -f lib/coq/*.glob
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+override_dh_auto_install:
+	mkdir -p $(FRAMADIR)
 	$(MAKE) prefix=$(WHYDIR)/usr install \
 		LIBDIR=$(WHYDIR)/usr/share   \
+		PLUGIN_INSTALL_DIR=$(WHYDIR)/usr/lib/frama-c/plugins \
 		COQLIB=$(CURDIR)/debian/libwhy-coq/$(COQ_STDLIB_DIR)
 	#Used to remove /usr/share/coq/jessie_why.v which is alone and installed by libwhy-coq
 	-$(RM) -rf $(WHYDIR)/usr/share/coq/
 	echo 'F:CoqABI=$(COQ_ABI)' >> debian/libwhy-coq.substvars
 
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installman
-	dh_link
-	dh_strip
+override_dh_compress:
 	dh_compress -X.v -X.sx -X.why
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_ocaml
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+	dh --with quilt,ocaml $@
+
+#	dh_installchangelogs CHANGES

-- 
why packaging