[Pkg-ocaml-maint-commits] r5908 - in /trunk/packages/ocaml-benchmark/trunk/debian: changelog control.in patches/00list patches/01destdir.dpatch patches/02gettimeofday.dpatch rules
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Sun Aug 3 20:14:36 UTC 2008
Author: gildor
Date: Sun Aug 3 20:14:36 2008
New Revision: 5908
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5908
Log:
* New upstream version
* Remove debian/control.in
* Remove patch 01destdir, applied upstream
* Apply patch 02gettimeofday, to have a WALL time with a precision better
than 1 second (replace Unix.time by Unix.gettimeofay)
Added:
trunk/packages/ocaml-benchmark/trunk/debian/patches/02gettimeofday.dpatch (with props)
Removed:
trunk/packages/ocaml-benchmark/trunk/debian/control.in
trunk/packages/ocaml-benchmark/trunk/debian/patches/01destdir.dpatch
Modified:
trunk/packages/ocaml-benchmark/trunk/debian/changelog
trunk/packages/ocaml-benchmark/trunk/debian/patches/00list
trunk/packages/ocaml-benchmark/trunk/debian/rules
Modified: trunk/packages/ocaml-benchmark/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark/trunk/debian/changelog?rev=5908&op=diff
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-benchmark/trunk/debian/changelog Sun Aug 3 20:14:36 2008
@@ -1,13 +1,17 @@
-ocaml-benchmark (0.6-8) UNRELEASED; urgency=low
+ocaml-benchmark (0.8-1) UNRELEASED; urgency=low
[ Sylvain Le Gall ]
- * NOT RELEASED YET
+ * New upstream version
+ * Remove debian/control.in
* Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
+ * Remove patch 01destdir, applied upstream
+ * Apply patch 02gettimeofday, to have a WALL time with a precision better
+ than 1 second (replace Unix.time by Unix.gettimeofay)
[ Stefano Zacchiroli ]
* fix vcs-svn field to point just above the debian/ dir
- -- Sylvain Le Gall <gildor at debian.org> Thu, 18 Oct 2007 01:11:04 +0200
+ -- Sylvain Le Gall <gildor at debian.org> Fri, 6 Jun 2008 10:57:25 +0200
ocaml-benchmark (0.6-7) unstable; urgency=low
Modified: trunk/packages/ocaml-benchmark/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark/trunk/debian/patches/00list?rev=5908&op=diff
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/patches/00list (original)
+++ trunk/packages/ocaml-benchmark/trunk/debian/patches/00list Sun Aug 3 20:14:36 2008
@@ -1,1 +1,1 @@
-01destdir
+02gettimeofday
Added: trunk/packages/ocaml-benchmark/trunk/debian/patches/02gettimeofday.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark/trunk/debian/patches/02gettimeofday.dpatch?rev=5908&op=file
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/patches/02gettimeofday.dpatch (added)
+++ trunk/packages/ocaml-benchmark/trunk/debian/patches/02gettimeofday.dpatch Sun Aug 3 20:14:36 2008
@@ -1,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02gettimeofday.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/benchmark.ml trunk/benchmark.ml
+--- trunk~/benchmark.ml 2007-01-31 16:49:04.000000000 +0000
++++ trunk/benchmark.ml 2008-06-06 09:14:47.000000000 +0000
+@@ -44,7 +44,7 @@
+
+ let make n =
+ let tms = Unix.times () in
+- { wall = Unix.time ();
++ { wall = Unix.gettimeofday ();
+ utime = tms.Unix.tms_utime; stime = tms.Unix.tms_stime;
+ cutime = tms.Unix.tms_cutime; cstime = tms.Unix.tms_cstime;
+ iters = n }
+@@ -90,15 +90,15 @@
+ let f x = sprintf "%*.*f" fwidth fdigits x in
+ match style with
+ | All ->
+- sprintf "%2.0f WALL (%s usr %s sys + %s cusr %s csys = %s CPU)%s"
+- b.wall (f b.utime) (f b.stime) (f b.cutime) (f b.cstime) (f(pt +. ct))
++ sprintf "%s WALL (%s usr %s sys + %s cusr %s csys = %s CPU)%s"
++ (f b.wall) (f b.utime) (f b.stime) (f b.cutime) (f b.cstime) (f(pt +. ct))
+ (iter_info pt)
+ | No_child ->
+- sprintf "%2.0f WALL (%s usr + %s sys = %s CPU)%s"
+- b.wall (f b.utime) (f b.stime) (f pt) (iter_info pt)
++ sprintf "%s WALL (%s usr + %s sys = %s CPU)%s"
++ (f b.wall) (f b.utime) (f b.stime) (f pt) (iter_info pt)
+ | No_parent ->
+- sprintf "%2.0f WALL (%s cusr + %s csys = %s CPU)%s"
+- b.wall (f b.cutime) (f b.cstime) (f ct) (iter_info ct)
++ sprintf "%s WALL (%s cusr + %s csys = %s CPU)%s"
++ (f b.wall) (f b.cutime) (f b.cstime) (f ct) (iter_info ct)
+ | Nil -> ""
+ | Auto -> assert false
+
Propchange: trunk/packages/ocaml-benchmark/trunk/debian/patches/02gettimeofday.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/packages/ocaml-benchmark/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark/trunk/debian/rules?rev=5908&op=diff
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/rules (original)
+++ trunk/packages/ocaml-benchmark/trunk/debian/rules Sun Aug 3 20:14:36 2008
@@ -16,9 +16,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA.
-
-# Generate debian/control using
-# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
@@ -44,8 +41,6 @@
endif
DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-9),$(CDBS_BUILD_DEPENDS))
-
OCAML_OCAMLDOC_PACKAGES_DOCBASE := libbenchmark-ocaml-dev
clean::
More information about the Pkg-ocaml-maint-commits
mailing list