[Pkg-ocaml-maint-commits] r3503 - in /trunk/packages/ocaml-benchmark/trunk/debian: changelog compat control control.in libbenchmark-ocaml-dev.dirs.in libbenchmark-ocaml-dev.docs libbenchmark-ocaml-dev.install rules watch

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Sun Jan 7 23:00:29 CET 2007 

Author: gildor
Date: Sun Jan  7 23:00:28 2007
New Revision: 3503

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3503
Log:
* Upgrade debian/watch version to 3,
* Upgrade debhelper debian/compat to 5,
* Use CDBS for debian/rules,
-- SLG

Added:
    trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.dirs.in
    trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.install
Modified:
    trunk/packages/ocaml-benchmark/trunk/debian/changelog
    trunk/packages/ocaml-benchmark/trunk/debian/compat
    trunk/packages/ocaml-benchmark/trunk/debian/control
    trunk/packages/ocaml-benchmark/trunk/debian/control.in
    trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.docs
    trunk/packages/ocaml-benchmark/trunk/debian/rules
    trunk/packages/ocaml-benchmark/trunk/debian/watch

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=3503&op=diff
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-benchmark/trunk/debian/changelog Sun Jan  7 23:00:28 2007
@@ -1,3 +1,11 @@
+ocaml-benchmark (0.6-5) UNRELEASED; urgency=low
+
+  * Upgrade debian/watch version to 3,
+  * Upgrade debhelper debian/compat to 5,
+  * Use CDBS for debian/rules,
+
+ -- Sylvain Le Gall <gildor at debian.org>  Mon,  6 Nov 2006 23:41:01 +0100
+
 ocaml-benchmark (0.6-4) unstable; urgency=low
 
   * Change my email address to gildor at debian.org,

Modified: trunk/packages/ocaml-benchmark/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark/trunk/debian/compat?rev=3503&op=diff
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/compat (original)
+++ trunk/packages/ocaml-benchmark/trunk/debian/compat Sun Jan  7 23:00:28 2007
@@ -1,1 +1,1 @@
-4
+5

Modified: trunk/packages/ocaml-benchmark/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark/trunk/debian/control?rev=3503&op=diff
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/control (original)
+++ trunk/packages/ocaml-benchmark/trunk/debian/control Sun Jan  7 23:00:28 2007
@@ -2,14 +2,14 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.2), dpatch, ocaml-findlib
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), ocaml-findlib
 Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark
 
 Package: libbenchmark-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}
+Depends:
 Description: OCaml benchmarking library
  This library implements benchmarking functions for measuring the
  run-time of one or many functions using latency (multiple

Modified: trunk/packages/ocaml-benchmark/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark/trunk/debian/control.in?rev=3503&op=diff
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/control.in (original)
+++ trunk/packages/ocaml-benchmark/trunk/debian/control.in Sun Jan  7 23:00:28 2007
@@ -2,14 +2,14 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= #OCamlABI#), dpatch, ocaml-findlib
+Build-Depends: @cdbs@, ocaml-findlib
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark
 
 Package: libbenchmark-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}
+Depends:
 Description: OCaml benchmarking library
  This library implements benchmarking functions for measuring the
  run-time of one or many functions using latency (multiple

Added: trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.dirs.in?rev=3503&op=file
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.dirs.in (added)
+++ trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.dirs.in Sun Jan  7 23:00:28 2007
@@ -1,0 +1,1 @@
+ at OCamlStdlibDir@

Modified: trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.docs?rev=3503&op=diff
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.docs (original)
+++ trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.docs Sun Jan  7 23:00:28 2007
@@ -1,2 +1,1 @@
 README
-doc

Added: trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.install?rev=3503&op=file
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.install (added)
+++ trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.install Sun Jan  7 23:00:28 2007
@@ -1,0 +1,1 @@
+doc/* /usr/share/doc/libbenchmark-ocaml-dev/html

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=3503&op=diff
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/rules (original)
+++ trunk/packages/ocaml-benchmark/trunk/debian/rules Sun Jan  7 23:00:28 2007
@@ -1,67 +1,50 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper for benchmark.
-# GNU copyright 2005 by Sylvain Le Gall.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# debian/rules for ocaml-benchmark package
+# Copyright (C) 2006 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/dpatch/dpatch.make
-PACKAGE = benchmark
-DESTDIR_DEV=$(CURDIR)/debian/libbenchmark-ocaml-dev/
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
 
-OCAMLIBDIR=`ocamlc -where`
-OCAMLABI=$(shell ocamlc -version)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-debian/control: debian/control.in
-	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+PACKAGE_DEV := libbenchmark-ocaml-dev
+DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
 
-build: build-stamp
-build-stamp: patch-stamp
-	dh_testdir
-	if [ -x /usr/bin/ocamlopt ]; then \
-		$(MAKE) opt; \
-	else \
-		$(MAKE) byte; \
-	fi
-	$(MAKE) doc
-	touch build-stamp
+DEB_MAKE_CLEAN_TARGET    := clean
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) clean
-	dh_clean
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET    := opt 
+else
+DEB_MAKE_BUILD_TARGET    := byte 
+endif
+DEB_MAKE_BUILD_TARGET    += doc
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
-	if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then \
-		$(MAKE) install DESTDIR=$(DESTDIR_DEV)/$(OCAMLIBDIR); \
-	else \
-		$(MAKE) installbyte DESTDIR=$(DESTDIR_DEV)/$(OCAMLIBDIR); \
-	fi
+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)"
 
-binary-indep: build install
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
 
-binary-arch: build install
-	dh_testdir -s
-	dh_testroot -s
-	dh_installdocs -s
-	mv $(DESTDIR_DEV)/usr/share/doc/libbenchmark-ocaml-dev/doc \
-	   $(DESTDIR_DEV)/usr/share/doc/libbenchmark-ocaml-dev/html
-	dh_installexamples -s 
-	dh_installchangelogs -s 
-	dh_link -s
-	dh_strip -s
-	dh_compress -s
-	dh_fixperms -s
-	dh_installdeb -s
-	dh_shlibdeps -s 
-	dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums -s 
-	dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure debian/control
+clean::
+	-$(RM) $(CURDIR)/debian/libbenchmark-ocaml-dev.dirs

Modified: trunk/packages/ocaml-benchmark/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-benchmark/trunk/debian/watch?rev=3503&op=diff
==============================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/watch (original)
+++ trunk/packages/ocaml-benchmark/trunk/debian/watch Sun Jan  7 23:00:28 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
 http://prdownloads.sourceforge.net/ocaml-benchmark/benchmark-([0-9\.]*)\.tar\.bz2

More information about the Pkg-ocaml-maint-commits mailing list