[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.13-1-31-gf2e5234

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit f2e5234ed9da7042f2d8efc540fac08d01d07c79
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Sat Nov 8 21:18:04 2008 +0100

    - Some cleaning
    - Add makefile.in.dpatch to not clean examples-v7 directory (which doesn't exist)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f3a8568
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,25 @@
+Makefile
+a.out
+bin/gwhy.opt
+bin/krakatoa.opt
+bin/simplify2why.opt
+bin/why-config.opt
+config.status
+config.log
+bench/bench
+config/check_ocamlgraph.cmi
+config/check_ocamlgraph.cmo
+config/check_ocamlgraph.cmx
+config/check_ocamlgraph.o
+doc/version.tex
+jc/jc.a
+jc/jc.cma
+jc/jc.cmxa
+lib/coq/WhyCoqCompat.vo
+lib/why/arrays_why.v
+lib/why/floats_why.v
+lib/why/prelude_why.v
+mix/mix_parser.output
+regtest.opt
+tools/simplify_parser.output
+tools/toolstat_pars.output
\ No newline at end of file
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/patches/00list b/debian/patches/00list
index 8420d4e..d064c4d 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 configure
 jessie_lib
 logopath
+makefile.in
diff --git a/debian/patches/makefile.in.dpatch b/debian/patches/makefile.in.dpatch
new file mode 100755
index 0000000..c41919c
--- /dev/null
+++ b/debian/patches/makefile.in.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## makefile.in.dpatch by  <dogguy at pps.jussieu.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad why~/Makefile.in why/Makefile.in
+--- why~/Makefile.in	2008-11-08 21:07:42.000000000 +0100
++++ why/Makefile.in	2008-11-08 21:08:08.000000000 +0100
+@@ -1112,7 +1112,6 @@
+ 	rm -f $(GENERATED)
+ 	make -C atp clean
+ 	make -C doc clean
+-	make -C examples-v7 clean
+ 	make -C examples clean
+ 
+ dist-clean:: clean
diff --git a/debian/rules b/debian/rules
index fcb589c..ab2a575 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,12 +44,7 @@ build-stamp: config.status
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
-
 	[ ! -f Makefile ] || $(MAKE) clean
-	rm -f bench/bench
-	rm -f config.status
-
 	dh_clean
 
 install: build
@@ -57,10 +52,7 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
-	mkdir -p $(CURDIR)/debian/why/usr/lib/coq
 	$(MAKE) prefix=$(CURDIR)/debian/why/usr install COQLIB=$(CURDIR)/debian/why/usr/lib/coq
-	mkdir -p $(CURDIR)/debian/why/usr/share/why
 	mv $(CURDIR)/debian/why/usr/lib/why/why-logo-1.png $(CURDIR)/debian/why/usr/share/why
 
 # Build architecture-independent files here.
@@ -74,7 +66,7 @@ binary-arch: build install
 	dh_installdocs
 	dh_installexamples
 	dh_install
-	dh_installman debian/why-cpulimit.1
+	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
diff --git a/debian/why.dirs b/debian/why.dirs
new file mode 100644
index 0000000..1ee4cf6
--- /dev/null
+++ b/debian/why.dirs
@@ -0,0 +1,2 @@
+usr/lib/coq
+usr/share/why
\ No newline at end of file
diff --git a/debian/why.manpages b/debian/why.manpages
new file mode 100644
index 0000000..ca3d292
--- /dev/null
+++ b/debian/why.manpages
@@ -0,0 +1 @@
+debian/why-cpulimit.1
\ No newline at end of file

-- 
why packaging