[Pkg-ocaml-maint-commits] r4326 - in /trunk/packages/cryptokit/trunk/debian: changelog control libcryptokit-ocaml-dev.doc-base libcryptokit-ocaml-dev.install.in rules
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Mon Sep 3 23:11:38 UTC 2007
Author: gildor
Date: Mon Sep 3 23:11:38 2007
New Revision: 4326
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4326
Log:
* Use CDBS ocamldoc generation (replace upstream doc)
* Build for ocaml 3.10.0
Removed:
trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.doc-base
Modified:
trunk/packages/cryptokit/trunk/debian/changelog
trunk/packages/cryptokit/trunk/debian/control
trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.install.in
trunk/packages/cryptokit/trunk/debian/rules
Modified: trunk/packages/cryptokit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/changelog?rev=4326&op=diff
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/changelog (original)
+++ trunk/packages/cryptokit/trunk/debian/changelog Mon Sep 3 23:11:38 2007
@@ -1,3 +1,12 @@
+cryptokit (1.3-6) unstable; urgency=low
+
+ * Build for ocaml 3.10.0
+ * Generate documentation with ocamldoc, doesn't ship the one provided by
+ upstream (generate almost the same thing, but with a more recent version
+ of ocamldoc and in the right place)
+
+ -- Sylvain Le Gall <gildor at debian.org> Tue, 04 Sep 2007 00:26:44 +0200
+
cryptokit (1.3-5) experimental; urgency=low
* Add dependency on ocaml package
Modified: trunk/packages/cryptokit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/control?rev=4326&op=diff
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/control (original)
+++ trunk/packages/cryptokit/trunk/debian/control Mon Sep 3 23:11:38 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Julien Cristau <julien.cristau at ens-lyon.org>, Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sven Luther <luther at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), zlib1g-dev, dpkg-dev (>= 1.13.19)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), zlib1g-dev, dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/cryptokit
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/
@@ -11,7 +11,7 @@
Package: libcryptokit-ocaml
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ocaml-base-${F:OCamlABI}, ${shlibs:Depends}
Description: cryptographic algorithm library for OCaml - runtime
The Cryptokit library for Objective Caml provides a variety of
cryptographic primitives that can be used to implement cryptographic
@@ -37,7 +37,7 @@
Package: libcryptokit-ocaml-dev
Section: libdevel
Architecture: any
-Depends: libcryptokit-ocaml (= ${binary:Version})
+Depends: ocaml-${F:OCamlABI}, libcryptokit-ocaml (= ${binary:Version})
Description: cryptographic algorithm library for OCaml - development
The Cryptokit library for Objective Caml provides a variety of
cryptographic primitives that can be used to implement cryptographic
Modified: trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.install.in?rev=4326&op=diff
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.install.in (original)
+++ trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.install.in Mon Sep 3 23:11:38 2007
@@ -1,2 +1,1 @@
debian/META.cryptokit @OCamlStdlibDir@/METAS
-doc/* /usr/share/doc/libcryptokit-ocaml-dev/html
Modified: trunk/packages/cryptokit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/rules?rev=4326&op=diff
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/rules (original)
+++ trunk/packages/cryptokit/trunk/debian/rules Mon Sep 3 23:11:38 2007
@@ -39,9 +39,9 @@
DEB_MAKE_INSTALL_TARGET := install \
INSTALLDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/cryptokit"
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
-DEB_DH_INSTALL_ARGS := -X .cvsignore
+OCAML_OCAMLDOC_PACKAGES := libcryptokit-ocaml-dev
clean::
-$(RM) debian/META.cryptokit
@@ -55,82 +55,3 @@
sed -i "s/@VERSION@/$$VERSION/g" debian/META.cryptokit
mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/cryptokit/stublibs \
$(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/dllcryptokit.so
-
-##!/usr/bin/make -f
-#
-#OCAMLIBDIR := $(shell ocamlc -where)
-#OCAMLABI=$(shell ocamlc -version)
-#PKGNAME = libcryptokit-ocaml
-#PKGDIR = $(CURDIR)/debian/$(PKGNAME)
-#DOCDIR = $(PKGDIR)-dev/usr/share/doc/$(PKGNAME)-dev
-#VERSION=$(shell dpkg-parsechangelog | awk "/Version: .*/ { gsub(\"Version: \",\"\"); gsub(\"-.*\",\"\"); print; }")
-#
-#CFLAGS = -Wall -g -fPIC
-#
-#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-# CFLAGS += -O0
-#else
-# CFLAGS += -O2
-#endif
-#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-# INSTALL_PROGRAM += -s
-#endif
-#
-#
-#include /usr/share/dpatch/dpatch.make
-#
-#
-#debian/META: debian/META.in
-# sed -e 's%@VERSION@%$(VERSION)%' $< > $@
-#
-#build: build-stamp
-#build-stamp: patch-stamp
-# dh_testdir
-# dh_clean -k
-# $(MAKE) all
-# if [ -e /usr/bin/ocamlopt ] ; then \
-# $(MAKE) allopt; \
-# fi
-# touch build-stamp
-#
-#clean: patch clean1 unpatch
-#clean1:
-# dh_testdir
-# -$(MAKE) clean
-# $(RM) build-stamp
-# dh_clean
-#
-#install: build-stamp debian/META
-# dh_testdir
-# dh_testroot
-# dh_installdirs
-# mkdir -p $(PKGDIR)-dev$(OCAMLIBDIR)/cryptokit
-# mkdir -p $(PKGDIR)-dev$(OCAMLIBDIR)/METAS
-# $(MAKE) install INSTALLDIR=$(PKGDIR)-dev/$(OCAMLIBDIR)/cryptokit
-# cp -p debian/META $(PKGDIR)-dev$(OCAMLIBDIR)/METAS/META.cryptokit
-# mkdir -p $(PKGDIR)/$(OCAMLIBDIR)/stublibs/
-# mv $(PKGDIR)-dev/$(OCAMLIBDIR)/cryptokit/stublibs \
-# $(PKGDIR)/$(OCAMLIBDIR)/stublibs/dllcryptokit.so
-#
-#binary-indep: install
-#
-#binary-arch: install
-# dh_testdir
-# dh_testroot
-# dh_installchangelogs Changes
-# dh_installdocs -s
-# mv $(DOCDIR)/doc $(DOCDIR)/html
-# $(RM) $(DOCDIR)/html/.cvsignore
-# dh_installexamples -s
-# dh_strip -s
-# dh_link -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-arch
-#.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-ocaml-maint-commits
mailing list