[Pkg-ocaml-maint-commits] r5591 - in /trunk/packages/why/trunk/debian: changelog control patches/install.dpatch rules

[dogguy-guest at users.alioth.debian.org]

Author: dogguy-guest
Date: Mon May  5 09:00:43 2008
New Revision: 5591

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5591
Log:
- Fix missing dependency (cpulimit).
- Reinclude gwhy.sh
- Updating install.dpatch


Modified:
    trunk/packages/why/trunk/debian/changelog
    trunk/packages/why/trunk/debian/control
    trunk/packages/why/trunk/debian/patches/install.dpatch
    trunk/packages/why/trunk/debian/rules

Modified: trunk/packages/why/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/trunk/debian/changelog?rev=5591&op=diff
==============================================================================
--- trunk/packages/why/trunk/debian/changelog (original)
+++ trunk/packages/why/trunk/debian/changelog Mon May  5 09:00:43 2008
@@ -1,9 +1,11 @@
 why (2.11-2) UNRELEASED; urgency=low
 
-  * Fix Makefile's install target, when ocamlopt doesn't exist. Closes: #478501.
+  * Fix install target and JCLIB value in the Makefile, Closes: #478501.
   * Update maintainer and uploders fields in debian/control.
+  * Fix missing dependency (cpulimit).
+  * Reinclude gwhy.sh
 
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Wed, 30 Apr 2008 15:22:30 +0200
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Mon, 05 May 2008 10:47:33 +0200
 
 why (2.11-1) unstable; urgency=low
 

Modified: trunk/packages/why/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/trunk/debian/control?rev=5591&op=diff
==============================================================================
--- trunk/packages/why/trunk/debian/control (original)
+++ trunk/packages/why/trunk/debian/control Mon May  5 09:00:43 2008
@@ -10,7 +10,7 @@
 
 Package: why
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, cpulimit
 Suggests: coq
 Description: A software verification tool
  Why aims at being a verification conditions generator (VCG) back-end

Modified: trunk/packages/why/trunk/debian/patches/install.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/trunk/debian/patches/install.dpatch?rev=5591&op=diff
==============================================================================
--- trunk/packages/why/trunk/debian/patches/install.dpatch (original)
+++ trunk/packages/why/trunk/debian/patches/install.dpatch Mon May  5 09:00:43 2008
@@ -7,29 +7,21 @@
 @DPATCH@
 diff -urNad trunk~/Makefile.in trunk/Makefile.in
 --- trunk~/Makefile.in	2008-03-17 10:21:43.000000000 +0100
-+++ trunk/Makefile.in	2008-04-29 15:33:12.000000000 +0200
-@@ -154,7 +154,10 @@
++++ trunk/Makefile.in	2008-05-05 10:10:14.000000000 +0200
+@@ -154,7 +154,11 @@
  TOOLS=$(WHY2HTML) $(DP) $(CPULIMIT) $(RVMERGE) $(WHYOBFUSCATOR) \
        $(SIMPLIFY2WHY) $(WHYSTAT)
  
 -JCLIB=jc/jc.cmo jc/jc.cmx
-+JCLIB=jc/jc.cmo
-+if [ "$(OCAMLBEST)" = "opt" ]; then \
-+       JCLIB+=jc/jc.cmx;           \
-+fi
++ifeq ($(OCAMLBEST),opt)
++ JCLIB=jc/jc.cmo jc/jc.cmx
++else
++ JCLIB=jc/jc.cmo
++endif
  
  all: $(BINARY) check $(CADUCEUS) $(JESSIE) $(KRAKATOA) coq- at COQ@ $(TOOLS) gwhy- at LABLGTK2@ $(JCLIB)
  
-@@ -648,7 +651,7 @@
- 	cp -f $(CADUCEUS) $(BINDIR)/caduceus$(EXE)
- 	cp -f $(JESSIE) $(BINDIR)/jessie$(EXE)
- 	cp -f $(KRAKATOA) $(BINDIR)/krakatoa$(EXE)
--	cp -f bin/gwhy.sh $(BINDIR)/gwhy
-+	cp -f bin/gwhy.$(OCAMLBEST) $(BINDIR)/gwhy
- 	cp -f $(WHY2HTML) $(BINDIR)/why2html$(EXE)
- 	cp -f $(DP) $(BINDIR)/dp$(EXE)
- 	cp -f $(CPULIMIT) $(BINDIR)/cpulimit$(EXE)
-@@ -665,7 +668,7 @@
+@@ -665,7 +669,7 @@
  	cp -f $(PRELUDE) $(LIBDIR)/why
  	mkdir -p $(LIBDIR)/caduceus/why
  	mkdir -p $(LIBDIR)/jessie/why
@@ -38,7 +30,7 @@
  	cp -f lib/why/caduceus.why $(LIBDIR)/caduceus/why
  	cp -f lib/why/caduceus_arith.why $(LIBDIR)/caduceus/why
  	cp -f lib/why/jessie.why $(LIBDIR)/jessie/why
-@@ -1061,4 +1064,4 @@
+@@ -1061,4 +1065,4 @@
  # 4) Run Ocamlbuild with the target you need, for example:
  # ocamlbuild jc/jc_main.native
  

Modified: trunk/packages/why/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/trunk/debian/rules?rev=5591&op=diff
==============================================================================
--- trunk/packages/why/trunk/debian/rules (original)
+++ trunk/packages/why/trunk/debian/rules Mon May  5 09:00:43 2008
@@ -47,7 +47,7 @@
 	rm -f build-stamp
 
 	[ ! -f Makefile ] || $(MAKE) clean
-	rm -f bin/* bench/bench
+	rm -f bench/bench
 	rm -f config.status
 
 	dh_clean