[Pkg-ocaml-maint-commits] [SCM] ocamldap packaging branch, master, updated. debian/2.1.8-6
Sylvain Le Gall
gildor at debian.org
Thu Mar 19 16:28:22 UTC 2009
The following commit has been merged in the master branch:
commit f05f1939575352e7f65fc41d1fd8eb964a2fe088
Author: Sylvain Le Gall <gildor at debian.org>
Date: Thu Mar 19 17:27:22 2009 +0100
Prepare 0Caml 3.11 migration
* Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
* Set maintainer to Debian OCaml Maintainers
* Add dh-ocaml build-dependency (rules/ocaml.mk)
* Upgrade debian/compat to 7 (use debian/clean)
* Upgrade Standards-Version to 3.8.0 (debian/README.source)
* Add Homepage field to debian/control
* Use OCAML_OCAMLDOC_* variables to generate documentatio
* Add ${misc:Depends} to dependencies
* Update debian/copyright file to use
http://wiki.debian.org/Proposals/CopyrightFormat
* Remove obsolete debian/control.in related variables and files
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..62605d2
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+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 774e68e..399d68c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,21 @@
-ocamldap (2.1.8-6) UNRELEASED; urgency=low
-
- [ Sylvain Le Gall ]
- * NOT RELEASED YET
- * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
+ocamldap (2.1.8-6) unstable; urgency=low
[ Stefano Zacchiroli ]
* fix vcs-svn field to point just above the debian/ dir
[ Sylvain Le Gall ]
+ * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
* Switch packaging to git
+ * Set maintainer to Debian OCaml Maintainers
+ * Add dh-ocaml build-dependency (rules/ocaml.mk)
+ * Upgrade debian/compat to 7 (use debian/clean)
+ * Upgrade Standards-Version to 3.8.0 (debian/README.source)
+ * Add Homepage field to debian/control
+ * Use OCAML_OCAMLDOC_* variables to generate documentatio
+ * Add ${misc:Depends} to dependencies
+ * Update debian/copyright file to use
+ http://wiki.debian.org/Proposals/CopyrightFormat
+ * Remove obsolete debian/control.in related variables and files
-- Sylvain Le Gall <gildor at debian.org> Thu, 05 Mar 2009 01:12:21 +0100
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..5f6c9e7
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+varcc.cmo
+varcc.cmi
+varcc
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 7a4057e..8644051 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,24 @@
Source: ocamldap
Section: libdevel
Priority: optional
-Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-9), ocaml-findlib (>= 1.1.2pl1-4), libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3)
-Standards-Version: 3.7.2
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Sylvain Le Gall <gildor at debian.org>
+Build-Depends: cdbs (>= 0.4.23-1.1),
+ debhelper (>= 7),
+ dpatch,
+ ocaml-nox (>= 3.10.0-9),
+ ocaml-findlib (>= 1.1.2pl1-4),
+ libocamlnet-ocaml-dev (>= 2.2.9-6),
+ libssl-ocaml-dev (>= 0.4.3-2),
+ dh-ocaml (>= 0.4.1)
+Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamldap.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamldap.git
+Homepage: http://sourceforge.net/projects/ocamldap/
Package: libldap-ocaml-dev
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3)
+Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3), ${misc:Depends}
Description: LDAP bindings for OCaml
It supports the core ldap-client functions, including search, add,
modify, and delete.
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 6d58f55..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: ocamldap
-Section: libdevel
-Priority: optional
-Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocaml-findlib (>= 1.1.2pl1-4), libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3)
-Standards-Version: 3.7.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/
-
-Package: libldap-ocaml-dev
-Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3)
-Description: LDAP bindings for OCaml
- It supports the core ldap-client functions, including search, add,
- modify, and delete.
- .
- It has now an object oriented interface which supports the above
- features, and some additional ones. Such as, nice data structures
- for local ldap entries which record local modifications and can sync
- them with the server, fewer arguments needed to perform simple
- tasks, and an API modeled after Perl's Net::LDAP.
-
diff --git a/debian/copyright b/debian/copyright
index 5f40dab..9660fa2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,17 @@
-This package was debianized by Sylvain Le Gall <gildor at debian.org> on
-Wed, 04 Sep 2003 00:05:39 +0200.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Eric Stokes
+ Matthew Backe
+ Miles Egan (initial upstream)
+Packaged-By: Sylvain Le Gall <gildor at debian.org>
+Packaged-Date: Wed, 04 Sep 2003 00:05:39 +0200
+Original-Source-Location: http://sourceforge.net/projects/ocamldap/
-It was downloaded from :
+Files: *
+Copyright: (C) 2004 Eric Stokes
+ (C) 2004 Matthew Backes
+ (C) 2004 The California State University at Northridge
+License: LGPL-2.1+
-http://sf.net/ocamldap/
-
-Upstream Authors:
- Eric Stokes
- Matthew Backe
- (initial upstream: Miles Egan)
-
-Copyright:
-
- Copyright (C) 2004 Eric Stokes, Matthew Backes, and The California
- State University at Northridge
-
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
diff --git a/debian/rules b/debian/rules
index dca6875..58f81c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,13 +17,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA.
-# Generate debian/control using
-# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-
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
+include /usr/share/cdbs/1/rules/ocaml.mk
PACKAGE_DEV := libldap-ocaml-dev
DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
@@ -38,18 +35,6 @@ endif
DEB_MAKE_INSTALL_TARGET := install \
OCAMLFIND_INSTFLAGS="-ldconf ignore -destdir $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-9),$(CDBS_BUILD_DEPENDS))
-
-OCAML_OCAMLDOC_PACKAGES_DOCBASE := libmlpcap-ocaml-dev
-
-clean::
- -$(RM) '$(CURDIR)/varcc.cmo'
- -$(RM) '$(CURDIR)/varcc.cmi'
- -$(RM) '$(CURDIR)/varcc'
- -$(RM) '$(CURDIR)/debian/libldap-ocaml-dev.dirs'
- -$(RM) '$(CURDIR)/debian/libldap-ocaml-dev.doc-base.ocamldoc-apiref'
-
-install/libldap-ocaml-dev::
- ocamlfind ocamldoc -package ssl -html -d \
- $(DESTDIR_DEV)/usr/share/doc/libldap-ocaml-dev/html/api/ *.mli
+OCAML_OCAMLDOC_PACKAGES := libldap-ocaml-dev
+OCAML_OCAMLDOC_OCAMLFIND_FLAGS := -package ssl
--
ocamldap packaging
More information about the Pkg-ocaml-maint-commits
mailing list