[Pkg-ocaml-maint-commits] r6078 - in /trunk/packages/ocaml-dtools/trunk/debian: changelog control control.in libdtools-ocaml-dev.install.in rules

Sat Dec 13 22:26:21 UTC 2008

Author: toots
Date: Sat Dec 13 22:26:21 2008
New Revision: 6078

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6078
Log:
Prepared next upload..

Added:
    trunk/packages/ocaml-dtools/trunk/debian/control
    trunk/packages/ocaml-dtools/trunk/debian/control.in   (contents, props changed)
      - copied, changed from r6077, trunk/packages/ocaml-dtools/trunk/debian/control
Modified:
    trunk/packages/ocaml-dtools/trunk/debian/changelog
    trunk/packages/ocaml-dtools/trunk/debian/libdtools-ocaml-dev.install.in
    trunk/packages/ocaml-dtools/trunk/debian/rules

Modified: trunk/packages/ocaml-dtools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/debian/changelog?rev=6078&op=diff
==============================================================================

--- trunk/packages/ocaml-dtools/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-dtools/trunk/debian/changelog Sat Dec 13 22:26:21 2008
@@ -1,3 +1,13 @@
+ocaml-dtools (0.1.6-2) experimental; urgency=low
+
+  * New upload to experimental to build against ocaml 3.11.
+  * Versioned ocaml-related build-dep to avoid confusion.
+  * Switched to cdbs
+  * Added dh-ocaml to build-deps.
+  * Updated standards to 3.8.0.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Sat, 13 Dec 2008 23:19:31 +0100
+
 ocaml-dtools (0.1.6-1) unstable; urgency=low
 
   [ Stefano Zacchiroli ] 

Added: trunk/packages/ocaml-dtools/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/debian/control?rev=6078&op=file
==============================================================================
--- trunk/packages/ocaml-dtools/trunk/debian/control (added)
+++ trunk/packages/ocaml-dtools/trunk/debian/control Sat Dec 13 22:26:21 2008
@@ -1,0 +1,22 @@
+Source: ocaml-dtools
+Section: devel
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org>
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), ocaml-nox (>= 3.11.0-1), ocaml-findlib (>= 1.2.3), dh-ocaml
+Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/
+
+Package: libdtools-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, ${misc:Depends}
+Description: library for writing daemons in OCaml
+ dtools is a set of useful functions for writing daemon services in OCaml.
+ .
+ It includes support for:
+  * configuration options
+  * logging
+  * detaching and writing PID file
+  * start-up and shutdown task manager

Copied: trunk/packages/ocaml-dtools/trunk/debian/control.in (from r6077, trunk/packages/ocaml-dtools/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/debian/control.in?rev=6078&op=diff
==============================================================================
--- trunk/packages/ocaml-dtools/trunk/debian/control (original)
+++ trunk/packages/ocaml-dtools/trunk/debian/control.in Sat Dec 13 22:26:21 2008
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.2.0), ocaml-nox (>= 3.10), ocaml-findlib
-Standards-Version: 3.7.3
+Build-Depends: @cdbs@, ocaml-findlib, dh-ocaml
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/
 
 Package: libdtools-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, ${misc:Depends}
 Description: library for writing daemons in OCaml
  dtools is a set of useful functions for writing daemon services in OCaml.
  .

Propchange: trunk/packages/ocaml-dtools/trunk/debian/control.in
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: trunk/packages/ocaml-dtools/trunk/debian/libdtools-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/debian/libdtools-ocaml-dev.install.in?rev=6078&op=diff
==============================================================================
--- trunk/packages/ocaml-dtools/trunk/debian/libdtools-ocaml-dev.install.in (original)
+++ trunk/packages/ocaml-dtools/trunk/debian/libdtools-ocaml-dev.install.in Sat Dec 13 22:26:21 2008
@@ -1,4 +1,1 @@
-usr/lib/ocaml/@OCamlABI@/dtools/META
-usr/lib/ocaml/@OCamlABI@/dtools/*.cm*
-usr/lib/ocaml/@OCamlABI@/dtools/*.ml*
-usr/lib/ocaml/@OCamlABI@/dtools/*.a
+src/META src/*.a src/*.cm* usr/lib/ocaml/@OCamlABI@/dtools

Modified: trunk/packages/ocaml-dtools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/debian/rules?rev=6078&op=diff
==============================================================================
--- trunk/packages/ocaml-dtools/trunk/debian/rules (original)
+++ trunk/packages/ocaml-dtools/trunk/debian/rules Sat Dec 13 22:26:21 2008
@@ -1,70 +1,16 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+# In order to regenerate 'debian/control' :
+#   DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+# Then check manually if everything's ok
 
-DESTDIR := $(CURDIR)/debian/tmp/$(shell ocamlc -where)
+DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
+DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
-config.status: configure
-	dh_testdir
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-build: ocamlinit build-stamp
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	[ ! -f src/Makefile ] || $(MAKE) clean
-	rm -f config.log config.status
-	rm -rf debian/doc/
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
+build/libdtools-ocaml-dev::
 	mkdir -p $(DESTDIR)
-	$(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-	$(MAKE) doc
-
-binary-indep:
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=debian/tmp --list-missing
-	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+	make doc


