[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. debian/1.3.2-1-11-g4f0dc9b

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 0ad2cb079abb64965339057631202e2cfdfb8e40
Author: Ralf Treinen <rt at free.fr>
Date:   Tue Mar 17 23:06:01 2009 +0100

    prepare package for dose2-1.4

diff --git a/debian/changelog b/debian/changelog
index f680783..d22e53b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 dose2 (1.4pre1-1) UNRELEASED; urgency=low
 
   * New Upstream Version
+  * Section: ocaml
+  * Standards-Version 3.8.1 (no change)
+  * Some improvements on long package dscriptions
+  * CDBS includes in debian/rules: class/ocaml.mk -> rules/ocaml.mk
+  * Add build-dependency on dh-ocaml
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 17 Mar 2009 22:21:29 +0100
+ -- Ralf Treinen <treinen at debian.org>  Tue, 17 Mar 2009 22:31:56 +0100
 
 dose2 (1.3.2-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index f70c26a..9bd3208 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,23 @@
 Source: dose2
-Section: devel
+Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: cdbs, debhelper (>= 7),
+Uploaders: Stefano Zacchiroli <zack at debian.org>,
+ Ralf Treinen <treinen at debian.org>
+Build-Depends: cdbs, debhelper (>= 7), dh-ocaml,
  ocaml-nox, camlp4,
  ocaml-findlib, menhir,
  librpm-dev,
  libpcre-ocaml-dev,
  libcalendar-ocaml-dev,
  libzip-ocaml-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://sodiac.gforge.inria.fr/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/dose2.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/dose2.git
 
 Package: libdose2-ocaml-dev
 Architecture: any
-Section: libdevel
 Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
  libdose2-ocaml (= ${binary:Version}),
  libpcre-ocaml-dev,
@@ -27,45 +27,44 @@ Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
  libgdbm-dev,
  ${misc:Depends}
 Description: OCaml libraries for managing packages and their dependencies
- Dose 2 is a framework made of several of OCaml libraries for managing
+ Dose2 is a framework made of several OCaml libraries for managing
  distribution packages and their dependencies.
  .
- Though not tied to any particular distribution, Dose 2 forms a
- background of libraries which enable injecting packages coming for
- various distribution. Companion libraries (e.g. ceve) and tools (e.g.
- pkglab) rely on Dose 2 to manage packages coming from various
+ Though not tied to any particular distribution, Dose 2 constitutes a
+ pool of libraries which enable injecting packages coming from various
+ distribution. Companion libraries (e.g. ceve) and tools (e.g.
+ pkglab) rely on dose2 to manage packages coming from various
  distributions, e.g. Debian and Red Hat.
  .
  Besides basic functionalities for querying and setting package
- properties, Dose 2 also implements algorithms for solving more complex
+ properties, dose also implements algorithms for solving more complex
  problems (monitoring package evolutions, correct and complete
  dependency resolution, repository-wide uninstallability checks).
  .
- This package contains the development stuff you need to use Dose 2 in
+ This package contains the development stuff you need to use dose2 in
  the development of your programs.
 
 Package: libdose2-ocaml
 Architecture: any
-Section: libs
 Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
  libpcre-ocaml,
  libzip-ocaml,
  ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml libraries for managing packages and their dependencies
- Dose 2 is a framework made of several of OCaml libraries for managing
+ Dose2 is a framework made of several OCaml libraries for managing
  distribution packages and their dependencies.
  .
- Though not tied to any particular distribution, Dose 2 forms a
- background of libraries which enable injecting packages coming for
- various distribution. Companion libraries (e.g. ceve) and tools (e.g.
- pkglab) rely on Dose 2 to manage packages coming from various
+ Though not tied to any particular distribution, dose2 constitutes a
+ pool of libraries which enable injecting packages coming from various
+ distribution. Companion libraries (e.g. ceve) and tools (e.g.
+ pkglab) rely on dose2 to manage packages coming from various
  distributions, e.g. Debian and Red Hat.
  .
  Besides basic functionalities for querying and setting package
- properties, Dose 2 also implements algorithms for solving more complex
+ properties, dose2 also implements algorithms for solving more complex
  problems (monitoring package evolutions, correct and complete
  dependency resolution, repository-wide uninstallability checks).
  .
  This package contains the runtime stuff you need to run programs using
- Dose 2.
+ dose2.
 
diff --git a/debian/rules b/debian/rules
index 563f0e1..cba8ea5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,23 @@
 #!/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/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 LIB_NAME = dose2
 DLL_PKG_NAME = lib$(LIB_NAME)-ocaml
 DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev
 DEB_MAKE_BUILD_TARGET = depend all
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)
+
 configure/$(DEV_PKG_NAME):: debian/configure-stamp
+
 debian/configure-stamp:
 	./configure
 	touch $@
+
 clean::
 	rm -f debian/configure-stamp
+
 install/$(DEV_PKG_NAME)::
 	mkdir -p debian/$(DLL_PKG_NAME)$(OCAML_DLL_DIR)
 	mv debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)/$(LIB_NAME)/*.so \
diff --git a/ocamlpkgsrc/Makefile b/ocamlpkgsrc/Makefile
index 94ef828..d802a62 100644
--- a/ocamlpkgsrc/Makefile
+++ b/ocamlpkgsrc/Makefile
@@ -11,4 +11,4 @@ PACKAGES=		pcre
 include ../Makefile.config
 include .depend
 
-CFLAGS+=   -I.. -fPIC
+override CFLAGS+=   -I.. -fPIC

-- 
dose2 packaging