[Pkg-ocaml-maint-commits] [SCM] ocaml-benchmark packaging branch, master, updated. debian/0.9-2-9-g61f9005
Hendrik Tews
hendrik at askra.de
Sun Jun 23 19:30:45 UTC 2013
The following commit has been merged in the master branch:
commit 61f9005fba47d0f001316c5d485b23087171760c
Author: Hendrik Tews <hendrik at askra.de>
Date: Sun Jun 23 21:14:09 2013 +0200
update packaging
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 62605d2..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package use dpatch for patching the source.
-
-Please consider reading dpatch manpage to patch the source.
-
- -- Sylvain Le Gall <gildor at debian.org> Sun, 22 Jun 2008 23:26:52 +0200
diff --git a/debian/changelog b/debian/changelog
index 8e83761..abcdbcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
-ocaml-benchmark (0.9-3) UNRELEASED; urgency=low
+ocaml-benchmark (1.2-1) unstable; urgency=low
[ Sylvain Le Gall ]
* Remove Sylvain Le Gall from uploaders
[ Hendrik Tews ]
* fix watch file and homepage
-
- -- Hendrik Tews <hendrik at askra.de> Mon, 27 May 2013 00:23:06 +0200
+ * import new upstream version
+ * bump debhelper compat level and standards version
+ * add myself as uploader
+ * update dependencies, Vcs fields, copyright
+ * change packaging to debhelper
+ * delete old patches
+ * delete some unused files in debian subdir
+
+ -- Hendrik Tews <hendrik at askra.de> Sun, 23 Jun 2013 21:01:51 +0200
ocaml-benchmark (0.9-2) unstable; urgency=low
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 80e646e..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,2 +0,0 @@
-benchmark.annot
-.depend
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index b27e9b5..9e110a7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,27 @@ Source: ocaml-benchmark
Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1),
- debhelper (>= 7),
- dpatch,
- ocaml-nox (>= 3.10.0-9),
+Uploaders: Hendrik Tews <hendrik at askra.de>
+Build-Depends:
+ debhelper (>= 9),
+ dh-ocaml (>= 0.9.1),
+ ocaml-nox (>= 3.10.0-9),
+ ocaml-best-compilers,
ocaml-findlib (>= 1.1.2pl1-4),
- dh-ocaml (>= 0.9.1)
-Standards-Version: 3.8.3
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-benchmark.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-benchmark.git
+ libpcre-ocaml-dev
+Standards-Version: 3.9.4
+Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocaml-benchmark.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/ocaml-benchmark.git
Homepage: https://forge.ocamlcore.org/projects/ocaml-benchmark/
Package: libbenchmark-ocaml-dev
Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
Provides: ${ocaml:Provides}
+Recommends: ocaml-findlib
Description: OCaml benchmarking library
This library implements benchmarking functions for measuring the
run-time of one or many functions using latency (multiple
diff --git a/debian/copyright b/debian/copyright
index d964019..26014ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,214 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Author: Christophe Troestler <chris_77 at users.sourceforge.net>
- Doug Bagley (http://www.bagley.org)
-Packaged-By: Sylvain Le Gall <gildor at debian.org>
-Packaged-Date: Wed, 16 Mar 2005 23:35:07 +0100
-Original-Source-Location:http://sourceforge.net/projects/ocaml-benchmark/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ocaml-benchmark
+Upstream-Contact: Christophe.Troestler at umons.ac.be
+Source: http://ocaml-benchmark.forge.ocamlcore.org/
Files: *
Copyright: (C) 2002-2003, Doug Bagley
(C) 2004, Troestler Christophe
-License: LGPL-2.1+
-
-Benchmark is distributed under the terms of the LGPL v2.1 licence, which
-can be found in the /usr/share/common-licenses/LGPL-2.1 file on debian
-systems.
+License: LGPL-3+ with OCaml linking exception
+ This Library is distributed under the terms of the GNU Lesser General
+ Public License version 3 (included below) or, at your option, any
+ later version.
+ .
+ As a special exception to the GNU Lesser General Public License, you
+ may link, statically or dynamically, a "work that uses the Library"
+ with a publicly distributed version of the Library to produce an
+ executable file containing portions of the Library, and distribute
+ that executable file under terms of your choice, without any of the
+ additional requirements listed in clause 6 of the GNU Lesser General
+ Public License. By "a publicly distributed version of the Library",
+ we mean either the unmodified Library as distributed, or a modified
+ version of the Library that is distributed under the conditions
+ defined in clause 3 of the GNU Library General Public License. This
+ exception does not however invalidate any other reasons why the
+ executable file might be covered by the GNU Lesser General Public
+ License.
+ .
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+ .
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+ .
+ This version of the GNU Lesser General Public License incorporates
+ the terms and conditions of version 3 of the GNU General Public
+ License, supplemented by the additional permissions listed below.
+ .
+ 0. Additional Definitions.
+ .
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+ General Public License, and the "GNU GPL" refers to version 3 of the GNU
+ General Public License.
+ .
+ "The Library" refers to a covered work governed by this License,
+ other than an Application or a Combined Work as defined below.
+ .
+ An "Application" is any work that makes use of an interface provided
+ by the Library, but which is not otherwise based on the Library.
+ Defining a subclass of a class defined by the Library is deemed a mode
+ of using an interface provided by the Library.
+ .
+ A "Combined Work" is a work produced by combining or linking an
+ Application with the Library. The particular version of the Library
+ with which the Combined Work was made is also called the "Linked
+ Version".
+ .
+ The "Minimal Corresponding Source" for a Combined Work means the
+ Corresponding Source for the Combined Work, excluding any source code
+ for portions of the Combined Work that, considered in isolation, are
+ based on the Application, and not on the Linked Version.
+ .
+ The "Corresponding Application Code" for a Combined Work means the
+ object code and/or source code for the Application, including any data
+ and utility programs needed for reproducing the Combined Work from the
+ Application, but excluding the System Libraries of the Combined Work.
+ .
+ 1. Exception to Section 3 of the GNU GPL.
+ .
+ You may convey a covered work under sections 3 and 4 of this License
+ without being bound by section 3 of the GNU GPL.
+ .
+ 2. Conveying Modified Versions.
+ .
+ If you modify a copy of the Library, and, in your modifications, a
+ facility refers to a function or data to be supplied by an Application
+ that uses the facility (other than as an argument passed when the
+ facility is invoked), then you may convey a copy of the modified
+ version:
+ .
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+ .
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+ .
+ 3. Object Code Incorporating Material from Library Header Files.
+ .
+ The object code form of an Application may incorporate material from
+ a header file that is part of the Library. You may convey such object
+ code under terms of your choice, provided that, if the incorporated
+ material is not limited to numerical parameters, data structure
+ layouts and accessors, or small macros, inline functions and templates
+ (ten or fewer lines in length), you do both of the following:
+ .
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+ .
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+ .
+ 4. Combined Works.
+ .
+ You may convey a Combined Work under terms of your choice that,
+ taken together, effectively do not restrict modification of the
+ portions of the Library contained in the Combined Work and reverse
+ engineering for debugging such modifications, if you also do each of
+ the following:
+ .
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+ .
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+ .
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+ .
+ d) Do one of the following:
+ .
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+ .
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+ .
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+ .
+ 5. Combined Libraries.
+ .
+ You may place library facilities that are a work based on the
+ Library side by side in a single library together with other library
+ facilities that are not Applications and are not covered by this
+ License, and convey such a combined library under terms of your
+ choice, if you do both of the following:
+ .
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+ .
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+ .
+ 6. Revised Versions of the GNU Lesser General Public License.
+ .
+ The Free Software Foundation may publish revised and/or new versions
+ of the GNU Lesser General Public License from time to time. Such new
+ versions will be similar in spirit to the present version, but may
+ differ in detail to address new problems or concerns.
+ .
+ Each version is given a distinguishing version number. If the
+ Library as you received it specifies that a certain numbered version
+ of the GNU Lesser General Public License "or any later version"
+ applies to it, you have the option of following the terms and
+ conditions either of that published version or of any later version
+ published by the Free Software Foundation. If the Library as you
+ received it does not specify a version number of the GNU Lesser
+ General Public License, you may choose any version of the GNU Lesser
+ General Public License ever published by the Free Software Foundation.
+ .
+ If the Library as you received it specifies that a proxy can decide
+ whether future versions of the GNU Lesser General Public License shall
+ apply, that proxy's public statement of acceptance of any version is
+ permanent authorization for you to choose that version for the
+ Library.
-As a special exception to the GNU Lesser General Public License, you
-may link, statically or dynamically, a "work that uses the Library"
-with a publicly distributed version of the Library to produce an
-executable file containing portions of the Library, and distribute
-that executable file under terms of your choice, without any of the
-additional requirements listed in clause 6 of the GNU Lesser General
-Public License. By "a publicly distributed version of the Library",
-we mean either the unmodified Library as distributed, or a modified
-version of the Library that is distributed under the conditions
-defined in clause 3 of the GNU Library General Public License. This
-exception does not however invalidate any other reasons why the
-executable file might be covered by the GNU Lesser General Public
-License.
Files: debian/*
-Copyright: (C) 2006-2008 Sylvain Le Gall
+Copyright: 2006-2008 Sylvain Le Gall
+ 2013 Hendrik Tews
License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libbenchmark-ocaml-dev.dirs.in b/debian/libbenchmark-ocaml-dev.dirs.in
deleted file mode 100644
index cc51687..0000000
--- a/debian/libbenchmark-ocaml-dev.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlStdlibDir@
diff --git a/debian/libbenchmark-ocaml-dev.docs b/debian/libbenchmark-ocaml-dev.docs
index e845566..b43bf86 100644
--- a/debian/libbenchmark-ocaml-dev.docs
+++ b/debian/libbenchmark-ocaml-dev.docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/libbenchmark-ocaml-dev.install b/debian/libbenchmark-ocaml-dev.install
deleted file mode 100644
index 10cd087..0000000
--- a/debian/libbenchmark-ocaml-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-doc/* /usr/share/doc/libbenchmark-ocaml-dev/html/api
diff --git a/debian/libbenchmark-ocaml-dev.ocamldoc b/debian/libbenchmark-ocaml-dev.ocamldoc
index c01ade2..6b5948a 100644
--- a/debian/libbenchmark-ocaml-dev.ocamldoc
+++ b/debian/libbenchmark-ocaml-dev.ocamldoc
@@ -1 +1 @@
-# Nothing
+-d html/api --doc-base-generate
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fdf467e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-03makedoc
diff --git a/debian/patches/02gettimeofday.dpatch b/debian/patches/02gettimeofday.dpatch
deleted file mode 100755
index dfaeebc..0000000
--- a/debian/patches/02gettimeofday.dpatch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /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
-
diff --git a/debian/patches/03makedoc.dpatch b/debian/patches/03makedoc.dpatch
deleted file mode 100755
index c80b017..0000000
--- a/debian/patches/03makedoc.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03makedoc.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 ocaml-benchmark~/Makefile ocaml-benchmark/Makefile
---- ocaml-benchmark~/Makefile 2009-05-01 20:26:13.000000000 +0200
-+++ ocaml-benchmark/Makefile 2009-05-01 20:27:07.000000000 +0200
-@@ -23,8 +23,8 @@
-
- ######################################################################
-
--ML_FILES := $(wildcard *.ml)
--MLI_FILES := $(wildcard *.mli)
-+ML_FILES := benchmark.ml
-+MLI_FILES := benchmark.mli
- CMI_FILES := $(addsuffix .cmi,$(basename $(MLI_FILES)))
-
- BYTE_OBJS := $(if $(ML_FILES),$(PKGNAME).cmo $(BYTE_OBJS),)
diff --git a/debian/rules b/debian/rules
index 9d50126..6e21371 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,45 +1,35 @@
#!/usr/bin/make -f
-# debian/rules for ocaml-benchmark package
-# Copyright (C) 2006-2008 Sylvain Le Gall <gildor at debian.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/makefile.mk
-
-PACKAGE_DEV := libbenchmark-ocaml-dev
-DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
-
-DEB_MAKE_CLEAN_TARGET := clean
-
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET := opt
-else
-DEB_MAKE_BUILD_TARGET := byte
-endif
-DEB_MAKE_BUILD_TARGET += doc
-
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_INSTALL_TARGET := install
-else
-DEB_MAKE_INSTALL_TARGET := installbyte
-endif
-DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
-
-clean::
- -$(RM) '$(CURDIR)/.depend'
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+# export DH_OPTIONS=-v
+
+DESTDIR=$(CURDIR)/debian/libbenchmark-ocaml-dev
+
+include /usr/share/ocaml/ocamlvars.mk
+
+OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR
+OCAMLFIND_LDCONF=ignore
+export OCAMLFIND_LDCONF
+
+%:
+ dh $@ --with ocaml
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+ ocaml setup.ml -clean
+
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+ ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libbenchmark-ocaml-dev/html
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+ ocaml setup.ml -build
+ ocaml setup.ml -doc
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+ mkdir -p '$(OCAMLFIND_DESTDIR)'
+ ocaml setup.ml -install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/utils/purify_benchmark b/debian/utils/purify_benchmark
deleted file mode 100755
index b2917da..0000000
--- a/debian/utils/purify_benchmark
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-SOURCE=$1
-
-case $SOURCE in
- *.bz2)
- bunzip2 $SOURCE
- SOURCE=${SOURCE%%.bz2}
- gzip $SOURCE
- SOURCE=$SOURCE.gz
- ;;
-esac
-
-DST=${SOURCE/.tar.gz/.orig.tar.gz}
-DST=${DST/-/_}
-DST=ocaml-$DST
-
-mv $SOURCE $DST
--
ocaml-benchmark packaging
More information about the Pkg-ocaml-maint-commits
mailing list