[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/2.2.9-6-2-g184c7a6
Stephane Glondu
steph at glondu.net
Mon Jul 27 19:02:29 UTC 2009
The following commit has been merged in the master branch:
commit 184c7a6f9716d75defd2af3e1c7ee7198a2da87a
Author: Stephane Glondu <steph at glondu.net>
Date: Mon Jul 27 17:35:55 2009 +0200
Adapt to new dh-ocaml
diff --git a/debian/changelog b/debian/changelog
index a029916..3d968a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
ocamlnet (2.2.9-7) UNRELEASED; urgency=low
+ [ Stefano Zacchiroli ]
* debian/copyright: point to GPL-2 under /usr/share/common-licenses/
+ [ Stephane Glondu ]
+ * debian/control:
+ - move to section ocaml
+ - update Standards-Version to 3.8.2
+ - adapt to new dh-ocaml
+
-- Stefano Zacchiroli <zack at debian.org> Sat, 28 Feb 2009 11:57:46 +0100
ocamlnet (2.2.9-6) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f40ba64..c981661 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: ocamlnet
-Section: devel
+Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Stefano Zacchiroli <zack at debian.org>
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>> 7),
dpatch,
cdbs,
- dh-ocaml (>= 0.4),
+ dh-ocaml (>= 0.9),
ocaml-nox (>= 3.11),
camlp4 (>= 3.11),
ocaml-findlib (>= 1.2.4),
@@ -16,22 +16,26 @@ Build-Depends:
libcryptgps-ocaml-dev (>= 0.2.1-6),
libssl-ocaml-dev (>= 0.4.3-2),
apache2-prefork-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
Homepage: http://projects.camlcity.org/projects/ocamlnet.html
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlnet.git
Package: libocamlnet-ocaml-dev
Architecture: any
-Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
- libocamlnet-ocaml (= ${binary:Version}),
- libpcre-ocaml-dev (>= 5.11.1),
- libcryptgps-ocaml-dev,
+Depends:
+ ocaml-findlib,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
${misc:Depends}
-Recommends: libocamlnet-ocaml-doc,
+Recommends:
+ libocamlnet-ocaml-doc,
libnethttpd-ocaml-dev
-Provides: libequeue-ocaml-dev, libnetclient-ocaml-dev, librpc-ocaml-dev
+Provides:
+ libequeue-ocaml-dev,
+ libnetclient-ocaml-dev,
+ librpc-ocaml-dev,
+ ${ocaml:Provides}
Replaces: libequeue-ocaml-dev (<< 2.2.3-1), libnetclient-ocaml-dev (<< 2.2.3-1), librpc-ocaml-dev (<< 2.2.3-1)
Conflicts: libequeue-ocaml-dev (<< 2.2.3-1), libnetclient-ocaml-dev (<< 2.2.3-1), librpc-ocaml-dev (<< 2.2.3-1)
Description: OCaml application-level Internet libraries - core development libraries
@@ -66,11 +70,13 @@ Description: OCaml application-level Internet libraries - core development libra
Package: libocamlnet-ocaml
Architecture: any
-Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI},
- libpcre-ocaml,
- ${shlibs:Depends}, ${misc:Depends}
-Provides: libequeue-ocaml
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides:
+ libequeue-ocaml,
+ ${ocaml:Provides}
Replaces: libequeue-ocaml (<< 2.2.3-1)
Conflicts: libequeue-ocaml (<< 2.2.3-1)
Description: OCaml application-level Internet libraries - core runtime libraries
@@ -101,8 +107,10 @@ Description: OCaml application-level Internet libraries - core runtime libraries
Package: libocamlnet-ocaml-bin
Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
Recommends: libocamlnet-ocaml-dev
Replaces: librpc-ocaml-dev (<< 2.2.3-1)
Conflicts: librpc-ocaml-dev (<< 2.2.3-1)
@@ -134,12 +142,15 @@ Description: OCaml application-level Internet libraries - binaries
Package: libocamlnet-gtk2-ocaml-dev
Architecture: any
-Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
- libocamlnet-ocaml-dev (= ${binary:Version}),
+Depends:
+ ocaml-findlib,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
${misc:Depends}
Recommends: libocamlnet-ocaml-doc
-Provides: libequeue-gtk2-ocaml-dev
+Provides:
+ libequeue-gtk2-ocaml-dev,
+ ${ocaml:Provides}
Replaces: libequeue-gtk2-ocaml-dev (<< 2.2.3-1)
Conflicts: libequeue-gtk2-ocaml-dev (<< 2.2.3-1)
Description: OCaml application-level Internet libraries - GTK2 development libraries
@@ -169,11 +180,10 @@ Description: OCaml application-level Internet libraries - GTK2 development libra
Package: libocamlnet-ssl-ocaml-dev
Architecture: any
-Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
- libocamlnet-ssl-ocaml (= ${binary:Version}),
- libocamlnet-ocaml-dev (= ${binary:Version}),
- libssl-ocaml-dev,
+Depends:
+ ocaml-findlib,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
${misc:Depends}
Recommends: libocamlnet-ocaml-doc
Description: OCaml application-level Internet libraries - SSL development libraries
@@ -203,11 +213,11 @@ Description: OCaml application-level Internet libraries - SSL development librar
Package: libocamlnet-ssl-ocaml
Architecture: any
-Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI},
- libocamlnet-ocaml (= ${binary:Version}),
- libssl-ocaml,
- ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
Description: OCaml application-level Internet libraries - SSL runtime libraries
Ocamlnet is a collection of OCaml libraries focusing focus on
application-level Internet protocols and conventions.
@@ -235,10 +245,12 @@ Description: OCaml application-level Internet libraries - SSL runtime libraries
Package: libnethttpd-ocaml-dev
Architecture: any
-Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
- libocamlnet-ocaml-dev (= ${binary:Version}),
+Depends:
+ ocaml-findlib,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
${misc:Depends}
+Provides: ${ocaml:Provides}
Recommends: libocamlnet-ocaml-doc
Description: OCaml application-level Internet libraries - HTTP daemon development libraries
Ocamlnet is a collection of OCaml libraries focusing focus on
@@ -268,9 +280,13 @@ Description: OCaml application-level Internet libraries - HTTP daemon developmen
Package: libapache2-mod-ocamlnet
Architecture: any
Section: net
-Depends: libocamlnet-ocaml-dev (= ${binary:Version}),
+Depends:
apache2.2-common,
- ${shlibs:Depends}, ${misc:Depends}
+ libocamlnet-ocaml-dev (= ${binary:Version}),
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+# This package contains only an Apache module, dh_ocaml doesn't work on it!
Description: OCaml application-level Internet libraries - netcgi2 Apache2 connector
Ocamlnet is a collection of OCaml libraries focusing focus on
application-level Internet protocols and conventions.
@@ -329,4 +345,3 @@ Description: OCaml application-level Internet libraries - documentation and exam
.
This package contains the Ocamlnet reference manual in HTML format and
several examples about how to use the various libraries.
-
diff --git a/debian/libocamlnet-ocaml-doc.doc-base.ocamldoc-apiref b/debian/libocamlnet-ocaml-doc.doc-base.ocamldoc-apiref
new file mode 100644
index 0000000..a382983
--- /dev/null
+++ b/debian/libocamlnet-ocaml-doc.doc-base.ocamldoc-apiref
@@ -0,0 +1,8 @@
+Document: libocamlnet-ocaml-dev-ocamldoc-api-reference
+Title: libocamlnet-ocaml-dev OCamldoc API Reference
+Abstract: API reference manual for libocamlnet-ocaml-dev (generated via OCamldoc)
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libocamlnet-ocaml-dev/html/api/index.html
+Files: /usr/share/doc/libocamlnet-ocaml-dev/html/api/*
diff --git a/debian/rules b/debian/rules
index de44301..ccf4ad2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/ocaml.mk
+include /usr/share/cdbs/1/class/makefile.mk
PKGNAME = libocamlnet-ocaml-dev
@@ -41,8 +41,4 @@ endif
touch debian/configure-stamp
clean::
rm -f debian/configure-stamp
-
-build/libocamlnet-ocaml-doc::
- /usr/share/ocaml/ocamldoc-api-ref-config --doc-base-generate $(PKGNAME)
- mv debian/libocamlnet-ocaml-dev.doc-base.ocamldoc-apiref \
- debian/libocamlnet-ocaml-doc.doc-base.ocamldoc-apiref
+ rm -Rf src/netcgi2-apache/.libs/
--
ocamlnet packaging
More information about the Pkg-ocaml-maint-commits
mailing list