[Pkg-ocaml-maint-commits] r3500 - in
/trunk/packages/cryptokit/trunk/debian: META.cryptokit.in META.in
changelog compat control control.in libcryptokit-ocaml-dev.dirs.in
libcryptokit-ocaml-dev.docs libcryptokit-ocaml-dev.install.in
libcryptokit-ocaml.dirs.in rules watch
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Sun Jan 7 22:55:48 CET 2007
Author: gildor
Date: Sun Jan 7 22:55:46 2007
New Revision: 3500
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3500
Log:
[copy and paste changelog]
* Upgrade debian/watch version to 3,
* Upgrade debhelper debian/compat to 5,
* Replace dependency Source-Version by source:Version,
* Use CDBS for debian/rules,
* Use @OCamlTeam@ for Uploaders field in debian/control.in,
* Add versioned Build-Depends on dpkg-dev (>= 1.13.19),
-- SLG
Added:
trunk/packages/cryptokit/trunk/debian/META.cryptokit.in
- copied unchanged from r3272, trunk/packages/cryptokit/trunk/debian/META.in
trunk/packages/cryptokit/trunk/debian/control.in
- copied, changed from r3272, trunk/packages/cryptokit/trunk/debian/control
trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.dirs.in
trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.install.in
trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml.dirs.in
Removed:
trunk/packages/cryptokit/trunk/debian/META.in
Modified:
trunk/packages/cryptokit/trunk/debian/changelog
trunk/packages/cryptokit/trunk/debian/compat
trunk/packages/cryptokit/trunk/debian/control
trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.docs
trunk/packages/cryptokit/trunk/debian/rules
trunk/packages/cryptokit/trunk/debian/watch
Modified: trunk/packages/cryptokit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/changelog?rev=3500&op=diff
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/changelog (original)
+++ trunk/packages/cryptokit/trunk/debian/changelog Sun Jan 7 22:55:46 2007
@@ -1,4 +1,12 @@
cryptokit (1.3-4) UNRELEASED; urgency=low
+
+ [ Sylvain Le Gall ]
+ * Upgrade debian/watch version to 3,
+ * Upgrade debhelper debian/compat to 5,
+ * Replace dependency Source-Version by source:Version,
+ * Use CDBS for debian/rules,
+ * Use @OCamlTeam@ for Uploaders field in debian/control.in,
+ * Add versioned Build-Depends on dpkg-dev (>= 1.13.19),
[ Samuel Mimram ]
* Updated doc-base entry, closes: #318423.
Modified: trunk/packages/cryptokit/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/compat?rev=3500&op=diff
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/compat (original)
+++ trunk/packages/cryptokit/trunk/debian/compat Sun Jan 7 22:55:46 2007
@@ -1,1 +1,1 @@
-4
+5
Modified: trunk/packages/cryptokit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/control?rev=3500&op=diff
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/control (original)
+++ trunk/packages/cryptokit/trunk/debian/control Sun Jan 7 22:55:46 2007
@@ -2,15 +2,15 @@
Section: libdevel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>, Mike Furr <mfurr at debian.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: ocaml-nox (>= 3.09.1), zlib1g-dev, debhelper (>> 4.0.0), dpatch
+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)
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/cryptokit
Package: libcryptokit-ocaml
Section: libs
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ${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
@@ -36,7 +36,7 @@
Package: libcryptokit-ocaml-dev
Section: libdevel
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libcryptokit-ocaml (= ${Source-Version})
+Depends: 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
Copied: trunk/packages/cryptokit/trunk/debian/control.in (from r3272, trunk/packages/cryptokit/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/control.in?rev=3500&op=diff
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/control (original)
+++ trunk/packages/cryptokit/trunk/debian/control.in Sun Jan 7 22:55:46 2007
@@ -2,15 +2,15 @@
Section: libdevel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>, Michael K. Edwards <medwards-debian at sane.net>, Mike Furr <mfurr at debian.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: ocaml-nox (>= 3.09.1), zlib1g-dev, debhelper (>> 4.0.0), dpatch
+Uploaders: @OCamlTeam@
+Build-Depends: @cdbs@, 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
Package: libcryptokit-ocaml
Section: libs
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ${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
@@ -36,7 +36,7 @@
Package: libcryptokit-ocaml-dev
Section: libdevel
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libcryptokit-ocaml (= ${Source-Version})
+Depends: 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
Added: trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.dirs.in?rev=3500&op=file
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.dirs.in (added)
+++ trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.dirs.in Sun Jan 7 22:55:46 2007
@@ -1,0 +1,1 @@
+ at OCamlStdlibDir@/cryptokit
Modified: trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.docs?rev=3500&op=diff
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.docs (original)
+++ trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.docs Sun Jan 7 22:55:46 2007
@@ -1,2 +1,1 @@
README
-doc
Added: 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=3500&op=file
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.install.in (added)
+++ trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml-dev.install.in Sun Jan 7 22:55:46 2007
@@ -1,0 +1,2 @@
+debian/META.cryptokit @OCamlStdlibDir@/METAS
+doc/* /usr/share/doc/libcryptokit-ocaml-dev/html
Added: trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml.dirs.in?rev=3500&op=file
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml.dirs.in (added)
+++ trunk/packages/cryptokit/trunk/debian/libcryptokit-ocaml.dirs.in Sun Jan 7 22:55:46 2007
@@ -1,0 +1,1 @@
+ at OCamlStdlibDir@/stublibs
Modified: trunk/packages/cryptokit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/rules?rev=3500&op=diff
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/rules (original)
+++ trunk/packages/cryptokit/trunk/debian/rules Sun Jan 7 22:55:46 2007
@@ -1,78 +1,136 @@
#!/usr/bin/make -f
+# debian/rules for cryptokit 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.
-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; }")
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-CFLAGS = -Wall -g -fPIC
+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
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
+PACKAGE := libcryptokit-ocaml
+DESTDIR := $(CURDIR)/debian/$(PACKAGE)
+
+PACKAGE_DEV := libcryptokit-ocaml-dev
+DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
+
+DEB_MAKE_CLEAN_TARGET := clean
+DEB_MAKE_BUILD_TARGET := all
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET += allopt
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
+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))
-include /usr/share/dpatch/dpatch.make
+DEB_DH_INSTALL_ARGS := -X .cvsignore
+clean::
+ -$(RM) debian/META.cryptokit
+ -$(RM) debian/libcryptokit-ocaml-dev.dirs
+ -$(RM) debian/libcryptokit-ocaml-dev.install
+ -$(RM) debian/libcryptokit-ocaml.dirs
-debian/META: debian/META.in
- sed -e 's%@VERSION@%$(VERSION)%' $< > $@
+install/libcryptokit-ocaml-dev::
+ VERSION=$(DEB_NOEPOCH_VERSION); \
+ VERSION=$${VERSION%%-*}; \
+ sed -i "s/@VERSION@/$$VERSION/g" debian/META.cryptokit
+ mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/cryptokit/stublibs \
+ $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/dllcryptokit.so
-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 -f 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 -f $(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
+##!/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 -f 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 -f $(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
Modified: trunk/packages/cryptokit/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cryptokit/trunk/debian/watch?rev=3500&op=diff
==============================================================================
--- trunk/packages/cryptokit/trunk/debian/watch (original)
+++ trunk/packages/cryptokit/trunk/debian/watch Sun Jan 7 22:55:46 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
http://caml.inria.fr/distrib/bazar-ocaml/cryptokit-([0-9].*)\.tar\.gz
More information about the Pkg-ocaml-maint-commits
mailing list