[Pkg-ocaml-maint-commits] r2204 - in trunk/packages/camlimages/trunk/debian: . patches

Sylvain LE GALL gildor-guest at costa.debian.org
Fri Dec 2 00:35:21 UTC 2005 

Author: gildor-guest
Date: 2005-12-02 00:35:20 +0000 (Fri, 02 Dec 2005)
New Revision: 2204

Added:
   trunk/packages/camlimages/trunk/debian/control.in
   trunk/packages/camlimages/trunk/debian/patches/05_tiffread.dpatch
Modified:
   trunk/packages/camlimages/trunk/debian/changelog
   trunk/packages/camlimages/trunk/debian/control
   trunk/packages/camlimages/trunk/debian/patches/00list
   trunk/packages/camlimages/trunk/debian/rules
Log:
Prepare to release -- SLG


Modified: trunk/packages/camlimages/trunk/debian/changelog
===================================================================
--- trunk/packages/camlimages/trunk/debian/changelog	2005-12-02 00:09:27 UTC (rev 2203)
+++ trunk/packages/camlimages/trunk/debian/changelog	2005-12-02 00:35:20 UTC (rev 2204)
@@ -3,8 +3,10 @@
   * Remove direct reference to ocaml library dir
   * Remove dependency to lablgtk, only support lablgtk2
   * Upgrade to standard version 3.6.2.0 (no change)
+  * Remove hardcoded ocaml ABI version
+  * Patch tiff/tiffread.c to remove reference to uint16
 
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 15:47:48 +0100
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Fri,  2 Dec 2005 01:30:19 +0100
 
 camlimages (2.20-4) unstable; urgency=low
 

Modified: trunk/packages/camlimages/trunk/debian/control
===================================================================
--- trunk/packages/camlimages/trunk/debian/control	2005-12-02 00:09:27 UTC (rev 2203)
+++ trunk/packages/camlimages/trunk/debian/control	2005-12-02 00:35:20 UTC (rev 2204)
@@ -3,13 +3,13 @@
 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 (in Debian context) <mkedeb at sane.net>
-Build-Depends: debhelper (>> 4.0.0), ocaml-3.08.3, ocaml-findlib, libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev ( >= 2.1.7 ), libungif4-dev, liblablgtk2-ocaml-dev, gs, dpatch, chrpath
+Build-Depends: debhelper (>> 4.0.0), ocaml (>= 3.09.0), ocaml-findlib, libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev ( >= 2.1.7 ), libungif4-dev, liblablgtk2-ocaml-dev, gs, dpatch, chrpath
 Standards-Version: 3.6.2.0
 
 Package: libcamlimages-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-3.08.3, liblablgtk2-ocaml, liblablgtk-ocaml, ${shlibs:Depends}
+Depends: ocaml-base-${F:OCamlABI}, liblablgtk2-ocaml, liblablgtk-ocaml, ${shlibs:Depends}
 Description: OCaml image processing library
  CamlImages is an image processing library for Objective CAML,
  which provides:
@@ -32,7 +32,7 @@
 Package: libcamlimages-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-3.08.3, ocaml-findlib, libcamlimages-ocaml (= ${Source-Version}), libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev, libungif4-dev, liblablgtk2-ocaml-dev, liblablgtk-ocaml-dev 
+Depends: ocaml-${F:OCamlABI}, ocaml-findlib, libcamlimages-ocaml (= ${Source-Version}), libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev, libungif4-dev, liblablgtk2-ocaml-dev, liblablgtk-ocaml-dev 
 Description: OCaml image processing library
  CamlImages is an image processing library for Objective CAML,
  which provides:

Copied: trunk/packages/camlimages/trunk/debian/control.in (from rev 2188, trunk/packages/camlimages/trunk/debian/control)
===================================================================
--- trunk/packages/camlimages/trunk/debian/control	2005-11-29 22:29:10 UTC (rev 2188)
+++ trunk/packages/camlimages/trunk/debian/control.in	2005-12-02 00:35:20 UTC (rev 2204)
@@ -0,0 +1,66 @@
+Source: camlimages
+Section: devel
+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 (in Debian context) <mkedeb at sane.net>
+Build-Depends: debhelper (>> 4.0.0), ocaml (>= #OCamlABI#), ocaml-findlib, libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev ( >= 2.1.7 ), libungif4-dev, liblablgtk2-ocaml-dev, gs, dpatch, chrpath
+Standards-Version: 3.6.2.0
+
+Package: libcamlimages-ocaml
+Architecture: any
+Section: libs
+Depends: ocaml-base-${F:OCamlABI}, liblablgtk2-ocaml, liblablgtk-ocaml, ${shlibs:Depends}
+Description: OCaml image processing library
+ CamlImages is an image processing library for Objective CAML,
+ which provides:
+  basic functions for image processing and loading/saving
+ various image file formats (hence providing a translation
+ facility from format to format)
+  an interface with the Caml graphics library allows to display
+ images in the Graphics module screen and to mix them with Caml
+ drawings
+  a freetype interface, integrated into the library: you can
+ draw texts into images using any truetype fonts
+ .
+ In addition, the library can handle huge images that cannot be
+ (or can hardly be) stored into the main memory (the library then
+ automatically creates swap files and escapes them to reduce the
+ memory usage).
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libcamlimages-ocaml-dev
+Architecture: any
+Section: libdevel
+Depends: ocaml-${F:OCamlABI}, ocaml-findlib, libcamlimages-ocaml (= ${Source-Version}), libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev, libungif4-dev, liblablgtk2-ocaml-dev, liblablgtk-ocaml-dev 
+Description: OCaml image processing library
+ CamlImages is an image processing library for Objective CAML,
+ which provides:
+  basic functions for image processing and loading/saving
+ various image file formats (hence providing a translation
+ facility from format to format)
+  an interface with the Caml graphics library allows to display
+ images in the Graphics module screen and to mix them with Caml
+ drawings
+  a freetype interface, integrated into the library: you can
+ draw texts into images using any truetype fonts
+ .
+ In addition, the library can handle huge images that cannot be
+ (or can hardly be) stored into the main memory (the library then
+ automatically creates swap files and escapes them to reduce the
+ memory usage).
+ .
+ This package contains the development part of the camlimages
+ library.
+
+Package: libcamlimages-ocaml-doc
+Architecture: all
+Section: doc
+Suggests: libcamlimages-ocaml-dev
+Description: OCaml CamlImages library documentation
+ This package provides documentation for the OCaml CamlImages
+ library.
+ .
+ The library itself is provided in the libcamlimages-ocaml and
+ libcamlimages-ocaml-dev packages.
+

Modified: trunk/packages/camlimages/trunk/debian/patches/00list
===================================================================
--- trunk/packages/camlimages/trunk/debian/patches/00list	2005-12-02 00:09:27 UTC (rev 2203)
+++ trunk/packages/camlimages/trunk/debian/patches/00list	2005-12-02 00:35:20 UTC (rev 2204)
@@ -1 +1,2 @@
 install
+05_tiffread

Added: trunk/packages/camlimages/trunk/debian/patches/05_tiffread.dpatch
===================================================================
--- trunk/packages/camlimages/trunk/debian/patches/05_tiffread.dpatch	2005-12-02 00:09:27 UTC (rev 2203)
+++ trunk/packages/camlimages/trunk/debian/patches/05_tiffread.dpatch	2005-12-02 00:35:20 UTC (rev 2204)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_tiffread.dpatch by Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad camlimages-2.20~/tiff/tiffread.c camlimages-2.20/tiff/tiffread.c
+--- camlimages-2.20~/tiff/tiffread.c	2004-09-21 23:56:44.000000000 +0200
++++ camlimages-2.20/tiff/tiffread.c	2005-12-02 01:25:31.000000000 +0100
+@@ -21,15 +21,11 @@
+ #if HAVE_TIFF
+ 
+ /* These are defined in caml/config.h */
+-#define int16 int16tiff
+-#define uint16 uint16tiff
+ #define int32 int32tiff
+ #define uint32 uint32tiff
+ 
+ #include <tiffio.h>
+ 
+-#undef int16
+-#undef uint16
+ #undef int32
+ #undef uint32
+ 


Property changes on: trunk/packages/camlimages/trunk/debian/patches/05_tiffread.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/camlimages/trunk/debian/rules
===================================================================
--- trunk/packages/camlimages/trunk/debian/rules	2005-12-02 00:09:27 UTC (rev 2203)
+++ trunk/packages/camlimages/trunk/debian/rules	2005-12-02 00:35:20 UTC (rev 2204)
@@ -6,6 +6,7 @@
 BUILD_LABLGTK =no
 
 OCAMLIBDIR := $(shell ocamlc -where)
+OCAMLABI=$(shell ocamlc -version)
 
 ifeq ($(BUILD_LABLGTK2),yes)
 LABLGTK2_DIR := $(shell ocamlfind query lablgtk2)
@@ -25,6 +26,8 @@
 DESTDIR_DEV = $(CURDIR)/debian/libcamlimages-ocaml-dev
 DESTDIR_DOC = $(CURDIR)/debian/libcamlimages-ocaml-doc
 
+debian/control: debian/control.in
+	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
 
 configure: configure-stamp
 configure-stamp: patch-stamp
@@ -112,7 +115,7 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
-	dh_gencontrol -a
+	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums -a
 	dh_builddeb -a

More information about the Pkg-ocaml-maint-commits mailing list