[Pkg-ocaml-maint-commits] r5986 - in /trunk/packages/why/branches/lenny: debian/changelog debian/control debian/patches/00list debian/patches/cpulimit.dpatch debian/rules why_2.13.orig.tar.gz
dogguy-guest at users.alioth.debian.org
dogguy-guest at users.alioth.debian.org
Tue Sep 16 12:50:51 UTC 2008
Author: dogguy-guest
Date: Tue Sep 16 12:50:50 2008
New Revision: 5986
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5986
Log:
Patch for why : use why-cpulimit instead of cpulimit Debian package
Added:
trunk/packages/why/branches/lenny/debian/patches/cpulimit.dpatch
trunk/packages/why/branches/lenny/why_2.13.orig.tar.gz
- copied unchanged from r5713, trunk/packages/why/upstream/why_2.13.orig.tar.gz
Modified:
trunk/packages/why/branches/lenny/debian/changelog
trunk/packages/why/branches/lenny/debian/control
trunk/packages/why/branches/lenny/debian/patches/00list
trunk/packages/why/branches/lenny/debian/rules
Modified: trunk/packages/why/branches/lenny/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/branches/lenny/debian/changelog?rev=5986&op=diff
==============================================================================
--- trunk/packages/why/branches/lenny/debian/changelog (original)
+++ trunk/packages/why/branches/lenny/debian/changelog Tue Sep 16 12:50:50 2008
@@ -1,3 +1,10 @@
+why (2.13-2) unstable; urgency=low
+
+ * Using why-cpulimit instead of cpulimit Debian package, closes: 498485.
+ * Remove unnecessary dependency : cpulimit.
+
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr> Tue, 16 Sep 2008 14:49:14 +0200
+
why (2.13-1) unstable; urgency=low
* New upstream release.
Modified: trunk/packages/why/branches/lenny/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/branches/lenny/debian/control?rev=5986&op=diff
==============================================================================
--- trunk/packages/why/branches/lenny/debian/control (original)
+++ trunk/packages/why/branches/lenny/debian/control Tue Sep 16 12:50:50 2008
@@ -10,7 +10,7 @@
Package: why
Architecture: any
-Depends: ${shlibs:Depends}, cpulimit
+Depends: ${shlibs:Depends}
Suggests: coq
Description: A software verification tool
Why aims at being a verification conditions generator (VCG) back-end
Modified: trunk/packages/why/branches/lenny/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/branches/lenny/debian/patches/00list?rev=5986&op=diff
==============================================================================
--- trunk/packages/why/branches/lenny/debian/patches/00list (original)
+++ trunk/packages/why/branches/lenny/debian/patches/00list Tue Sep 16 12:50:50 2008
@@ -1,1 +1,2 @@
configure
+cpulimit
Added: trunk/packages/why/branches/lenny/debian/patches/cpulimit.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/branches/lenny/debian/patches/cpulimit.dpatch?rev=5986&op=file
==============================================================================
--- trunk/packages/why/branches/lenny/debian/patches/cpulimit.dpatch (added)
+++ trunk/packages/why/branches/lenny/debian/patches/cpulimit.dpatch Tue Sep 16 12:50:50 2008
@@ -1,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cpulimit.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
+##
+## DP: Using why's version of cpulimit.
+
+ at DPATCH@
+diff -urNad 2.13-1~/Makefile.in 2.13-1/Makefile.in
+--- 2.13-1~/Makefile.in 2008-05-28 16:55:38.000000000 +0200
++++ 2.13-1/Makefile.in 2008-09-16 14:11:59.000000000 +0200
+@@ -148,7 +148,7 @@
+ WHY2HTML=bin/why2html.$(OCAMLBEST)
+ RVMERGE=bin/rv_merge.$(OCAMLBEST)
+ DP=bin/dp.$(OCAMLBEST)
+-CPULIMIT=bin/cpulimit
++CPULIMIT=bin/why-cpulimit
+ WHYOBFUSCATOR=bin/why-obfuscator.$(OCAMLBEST)
+ WHYSTAT=bin/why-stat.$(OCAMLBEST)
+ SIMPLIFY2WHY=bin/simplify2why.$(OCAMLBEST)
+@@ -537,7 +537,7 @@
+ bin/dp.opt: $(DPCMX)
+ $(OCAMLOPT) $(OFLAGS) -o $@ unix.cmxa $^
+
+-bin/cpulimit: tools/cpulimit.c
++bin/why-cpulimit: tools/cpulimit.c
+ $(CC) -o $@ $^
+
+ bin/rv_merge.byte: tools/rv_merge.ml
+@@ -669,7 +669,7 @@
+ cp -f bin/gwhy.sh $(BINDIR)/gwhy
+ cp -f $(WHY2HTML) $(BINDIR)/why2html$(EXE)
+ cp -f $(DP) $(BINDIR)/dp$(EXE)
+- cp -f $(CPULIMIT) $(BINDIR)/cpulimit$(EXE)
++ cp -f $(CPULIMIT) $(BINDIR)/why-cpulimit$(EXE)
+ cp -f $(RVMERGE) $(BINDIR)/rv_merge$(EXE)
+ cp -f $(WHYOBFUSCATOR) $(BINDIR)/why-obfuscator$(EXE)
+ cp -f $(WHYSTAT) $(BINDIR)/why-stat$(EXE)
+@@ -1036,7 +1036,7 @@
+ rm -f bin/why-stat.opt bin/why-stat.byte
+ rm -f bin/why2html.opt bin/why2html.byte
+ rm -f bin/dp.opt bin/dp.byte
+- rm -f bin/cpulimit
++ rm -f bin/why-cpulimit
+ rm -f lib/coq*/*.vo lib/coq*/*~
+ rm -f $(GENERATED)
+ make -C atp clean
+diff -urNad 2.13-1~/tools/calldp.ml 2.13-1/tools/calldp.ml
+--- 2.13-1~/tools/calldp.ml 2008-05-28 16:55:38.000000000 +0200
++++ 2.13-1/tools/calldp.ml 2008-09-16 14:11:10.000000000 +0200
+@@ -67,7 +67,7 @@
+ let t0 = Unix.times () in
+ if debug then Format.eprintf "command line: %s at ." cmd;
+ let out = Filename.temp_file "out" "" in
+- let cmd = sprintf "cpulimit %d %s > %s 2>&1" timeout cmd out in
++ let cmd = sprintf "why-cpulimit %d %s > %s 2>&1" timeout cmd out in
+ let ret = Sys.command cmd in
+ let t1 = Unix.times () in
+ let cpu_time = t1.Unix.tms_cutime -. t0.Unix.tms_cutime in
Modified: trunk/packages/why/branches/lenny/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/why/branches/lenny/debian/rules?rev=5986&op=diff
==============================================================================
--- trunk/packages/why/branches/lenny/debian/rules (original)
+++ trunk/packages/why/branches/lenny/debian/rules Tue Sep 16 12:50:50 2008
@@ -59,7 +59,6 @@
dh_installdirs
$(MAKE) prefix=$(CURDIR)/debian/why/usr install COQLIB=$(CURDIR)/debian/why/usr/lib/coq
- rm -f $(CURDIR)/debian/why/usr/bin/cpulimit
mv $(CURDIR)/debian/why/usr/bin/dp $(CURDIR)/debian/why/usr/bin/why-dp
# Build architecture-independent files here.
More information about the Pkg-ocaml-maint-commits
mailing list