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

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

Author: dogguy-guest
Date: Tue Apr 29 13:49:48 2008
New Revision: 5562

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5562
Log:
Fix Makefile, when ocamlopt doesn't exist.

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

Modified: trunk/packages/why/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/trunk/debian/changelog?rev=5562&op=diff
==============================================================================
--- trunk/packages/why/trunk/debian/changelog (original)
+++ trunk/packages/why/trunk/debian/changelog Tue Apr 29 13:49:48 2008
@@ -1,9 +1,13 @@
 why (2.11-1) unstable; urgency=low
 
+  [ Samuel Mimram ]
   * New upstream release.
   * Updated watch file.
 
- -- Samuel Mimram <smimram at debian.org>  Tue, 22 Apr 2008 09:36:52 +0200
+  [ Mehdi Dogguy ]
+  * Fix Makefile, when ocamlopt doesn't exist. Closes:478501
+
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Tue, 29 Apr 2008 15:44:11 +0200
 
 why (2.10.dfsg.2-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=5562&op=diff
==============================================================================
--- trunk/packages/why/trunk/debian/control (original)
+++ trunk/packages/why/trunk/debian/control Tue Apr 29 13:49:48 2008
@@ -1,7 +1,7 @@
 Source: why
 Section: math
 Priority: optional
-Maintainer: Samuel Mimram <smimram at debian.org>
+Maintainer: Samuel Mimram <smimram at debian.org>, Mehdi Dogguy <dogguy at pps.jussieu.fr>
 Build-Depends: debhelper (>= 5), autotools-dev, ocaml-nox (>= 3.10), ocaml-best-compilers, camlp4, liblablgtk2-ocaml-dev, coq (>= 8.1.pl2+dfsg-3), libfloat-coq (>= 1:8.1-1.0-4), ocamlweb, libocamlgraph-ocaml-dev, dpatch
 Standards-Version: 3.7.3
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/trunk/

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=5562&op=diff
==============================================================================
--- trunk/packages/why/trunk/debian/patches/install.dpatch (original)
+++ trunk/packages/why/trunk/debian/patches/install.dpatch Tue Apr 29 13:49:48 2008
@@ -5,10 +5,22 @@
 ## DP: Correct installation.
 
 @DPATCH@
-diff -urNad why-2.10.dfsg~/Makefile.in why-2.10.dfsg/Makefile.in
---- why-2.10.dfsg~/Makefile.in	2007-12-21 09:34:10.000000000 +0100
-+++ why-2.10.dfsg/Makefile.in	2007-12-26 14:14:26.000000000 +0100
-@@ -637,7 +637,7 @@
+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 @@
+ 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
+ 
+ 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)
@@ -17,3 +29,19 @@
  	cp -f $(WHY2HTML) $(BINDIR)/why2html$(EXE)
  	cp -f $(DP) $(BINDIR)/dp$(EXE)
  	cp -f $(CPULIMIT) $(BINDIR)/cpulimit$(EXE)
+@@ -665,7 +668,7 @@
+ 	cp -f $(PRELUDE) $(LIBDIR)/why
+ 	mkdir -p $(LIBDIR)/caduceus/why
+ 	mkdir -p $(LIBDIR)/jessie/why
+-	cp -f jc/jc.cmo jc/jc.cmx $(JCCMI_EXPORT) $(LIBDIR)/jessie
++	cp -f $(JCLIB) $(JCCMI_EXPORT) $(LIBDIR)/jessie
+ 	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 @@
+ # 4) Run Ocamlbuild with the target you need, for example:
+ # ocamlbuild jc/jc_main.native
+ 
+-# You can also use the Makefile ./build.makefile which has some handy targets.
+\ No newline at end of file
++# You can also use the Makefile ./build.makefile which has some handy targets.