[Pkg-ocaml-maint-commits] [SCM] camlimages packaging branch, master, updated. debian/3.0.1-1
Sylvain Le Gall
gildor at debian.org
Tue Mar 17 22:41:19 UTC 2009
The following commit has been merged in the master branch:
commit 7be810bc7a39eb1fc383f39b34525753a6f6f7b4
Author: Sylvain Le Gall <gildor at debian.org>
Date: Tue Mar 17 23:03:47 2009 +0100
New upstream version
* Remove useless patches
* Adapt debian/rules and other debhelper files
* Add debian/patches/fix_3_0_1 to fix various problem (probably due to
OCaml 3.11 migration)
* Depends on version 2.12 of lablgtk2
* Add dh-ocaml build-dependency (rules/ocaml.mk)
diff --git a/debian/META.camlimages.in b/debian/META.camlimages.in
deleted file mode 100644
index 37566eb..0000000
--- a/debian/META.camlimages.in
+++ /dev/null
@@ -1,39 +0,0 @@
-version="@VERSION@"
-description="image format handler"
-directory="^camlimages"
-
-archive(byte) ="ci_core.cma"
-archive(byte) +="ci_freetype.cma"
-archive(byte) +="ci_gif.cma"
-archive(byte) +="ci_jpeg.cma"
-archive(byte) +="ci_tiff.cma"
-archive(byte) +="ci_bmp.cma"
-archive(byte) +="ci_ppm.cma"
-archive(byte) +="ci_png.cma"
-archive(byte) +="ci_xvthumb.cma"
-archive(byte) +="ci_xpm.cma"
-archive(byte) +="ci_ps.cma"
-
-archive(native) ="ci_core.cmxa"
-archive(native)+="ci_freetype.cmxa"
-archive(native)+="ci_gif.cmxa"
-archive(native)+="ci_jpeg.cmxa"
-archive(native)+="ci_tiff.cmxa"
-archive(native)+="ci_bmp.cmxa"
-archive(native)+="ci_ppm.cmxa"
-archive(native)+="ci_png.cmxa"
-archive(native)+="ci_xvthumb.cmxa"
-archive(native)+="ci_xpm.cmxa"
-archive(native)+="ci_ps.cmxa"
-
-package "lablgtk2" (
- requires="camlimages lablgtk2"
- archive(byte)="ci_lablgtk2.cma"
- archive(native)="ci_lablgtk2.cmxa"
-)
-
-package "graphics" (
- requires="camlimages graphics"
- archive(byte)="ci_graphics.cma"
- archive(native)="ci_graphics.cmxa"
-)
diff --git a/debian/changelog b/debian/changelog
index c8dac44..f58a0a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-camlimages (1:3.0.1-1) UNRELEASED; urgency=low
+camlimages (1:3.0.1-1) unstable; urgency=low
[ Ralf Treinen ]
* Updated debian/watch.
[ Sylvain Le Gall ]
- * New upstream version
+ * New upstream version:
+ * Remove useless patches
+ * Adapt debian/rules and other debhelper files
+ * Add debian/patches/fix_3_0_1 to fix various problem (probably due to
+ OCaml 3.11 migration)
+ * Depends on version 2.12 of lablgtk2
+ * Add dh-ocaml build-dependency (rules/ocaml.mk)
-- Sylvain Le Gall <gildor at debian.org> Thu, 05 Mar 2009 00:19:32 +0100
diff --git a/debian/control b/debian/control
index aa245b5..9c4479f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,13 @@ Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Ralf Treinen <treinen 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),
debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), ocaml,
ocaml-findlib (>= 1.1.2pl1-4), libpng12-dev, libjpeg62-dev,
libtiff4-dev, libxpm-dev, libfreetype6-dev (>= 2.1.7),
- libgif-dev, liblablgtk2-ocaml-dev (>= 2.6.0-11), chrpath,
- ghostscript
+ libgif-dev, liblablgtk2-ocaml-dev (>= 2.12.0-2), chrpath,
+ ghostscript, dh-ocaml (>= 0.4.1), automake1.9
Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlimages.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlimages.git
diff --git a/debian/libcamlimages-ocaml-dev.dirs.in b/debian/libcamlimages-ocaml-dev.dirs.in
index 278b760..cc51687 100644
--- a/debian/libcamlimages-ocaml-dev.dirs.in
+++ b/debian/libcamlimages-ocaml-dev.dirs.in
@@ -1 +1 @@
- at OCamlStdlibDir@/camlimages
+ at OCamlStdlibDir@
diff --git a/debian/libcamlimages-ocaml-dev.install.in b/debian/libcamlimages-ocaml-dev.install.in
index 4fa36b5..1a5dc7d 100644
--- a/debian/libcamlimages-ocaml-dev.install.in
+++ b/debian/libcamlimages-ocaml-dev.install.in
@@ -1 +1 @@
-debian/META.camlimages @OCamlStdlibDir@/METAS
+debian/tmp/usr/lib/ocaml/site-lib/camlimages @OCamlStdlibDir@
diff --git a/debian/libcamlimages-ocaml-doc.docs b/debian/libcamlimages-ocaml-doc.docs
index f1f1f8d..e845566 100644
--- a/debian/libcamlimages-ocaml-doc.docs
+++ b/debian/libcamlimages-ocaml-doc.docs
@@ -1,2 +1 @@
-Announce-2.2
README
diff --git a/debian/patches/00list b/debian/patches/00list
index edc3047..e56af52 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1 @@
-install
-05_tiffread
+fix_3_0_1_release
diff --git a/debian/patches/01_fix_freetype_build.dpatch b/debian/patches/01_fix_freetype_build.dpatch
deleted file mode 100755
index 051c481..0000000
--- a/debian/patches/01_fix_freetype_build.dpatch
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh -e
-## 01_fix_freetype_build.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/camlimages/camlimages-2.11/freetype2/ftintf.c camlimages-2.11/freetype2/ftintf.c
---- /mnt/nfs0/gildor/deb/ocaml-package/camlimages/camlimages-2.11/freetype2/ftintf.c 2001-12-17 16:25:21.000000000 +0100
-+++ camlimages-2.11/freetype2/ftintf.c 2004-01-14 15:46:40.000000000 +0100
-@@ -20,7 +20,8 @@
-
- #if (HAVE_FREETYPE && HAVE_FREETYPE2)
-
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-
- value init_FreeType()
- {
diff --git a/debian/patches/02_fix_lablgtk2_build.dpatch b/debian/patches/02_fix_lablgtk2_build.dpatch
deleted file mode 100755
index 9eec399..0000000
--- a/debian/patches/02_fix_lablgtk2_build.dpatch
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh -e
-## 02_fix_lablgtk2_build.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/camlimages/camlimages-2.11/lablgtk/oXimage.mli camlimages-2.11/lablgtk/oXimage.mli
---- /mnt/nfs0/gildor/deb/ocaml-package/camlimages/camlimages-2.11/lablgtk/oXimage.mli 2001-05-22 12:05:45.000000000 +0200
-+++ camlimages-2.11/lablgtk/oXimage.mli 2004-01-14 17:08:41.000000000 +0100
-@@ -14,7 +14,7 @@
- val create :
- kind:Gdk.Image.image_type -> visual:Gdk.visual ->
- width: int -> height: int -> ximage
--val get_image : 'a Gdk.drawable ->
-+val get_image : [>`drawable] Gobject.obj ->
- x:int -> y:int -> width:int -> height:int -> ximage
- val of_image :
- Gdk.visual -> (float -> unit) option -> OImage.oimage -> ximage
-diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/camlimages/camlimages-2.11/lablgtk/ximage.mli camlimages-2.11/lablgtk/ximage.mli
---- /mnt/nfs0/gildor/deb/ocaml-package/camlimages/camlimages-2.11/lablgtk/ximage.mli 2004-01-14 17:08:04.000000000 +0100
-+++ camlimages-2.11/lablgtk/ximage.mli 2004-01-14 17:08:06.000000000 +0100
-@@ -34,7 +34,7 @@
- val get : t -> int -> int -> elt
- val set : t -> int -> int -> elt -> unit
-
--val get_image : 'a Gdk.drawable -> x:int -> y:int ->
-+val get_image : [>`drawable] Gobject.obj -> x:int -> y:int ->
- width:int -> height:int -> t
- (* Same as Gdk.Image.get, but with size info *)
-
diff --git a/debian/patches/03_fix_ld_conf.dpatch b/debian/patches/03_fix_ld_conf.dpatch
deleted file mode 100755
index 2a51638..0000000
--- a/debian/patches/03_fix_ld_conf.dpatch
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh -e
-## 03_fix_ld_conf.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/camlimages/camlimages-2.11/Makefile camlimages-2.11/Makefile
---- /mnt/nfs0/gildor/deb/ocaml-package/camlimages/camlimages-2.11/Makefile 2003-01-24 11:44:01.000000000 +0100
-+++ camlimages-2.11/Makefile 2004-01-14 17:21:55.000000000 +0100
-@@ -62,10 +62,6 @@
-
- install:
- mkdir -p $(LIBDIR)
-- if test -w $(CAMLDIR)/ld.conf \
-- && test `grep -s -c '^$(LIBDIR)$$' $(CAMLDIR)/ld.conf` = 0; then \
-- echo $(LIBDIR) >> $(CAMLDIR)/ld.conf; \
-- fi
- for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install) || exit $$?; done
- cp Makefile.config $(LIBDIR)
- cp config.h $(LIBDIR)
diff --git a/debian/patches/04_destdir.dpatch b/debian/patches/04_destdir.dpatch
deleted file mode 100755
index f6631a3..0000000
--- a/debian/patches/04_destdir.dpatch
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh -e
-## 04_destdir.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/camlimages/camlimages-2.11/Makefile camlimages-2.11/Makefile
---- /mnt/nfs0/gildor/deb/ocaml-package/camlimages/camlimages-2.11/Makefile 2004-01-14 17:36:14.000000000 +0100
-+++ camlimages-2.11/Makefile 2004-01-14 17:37:45.000000000 +0100
-@@ -61,11 +61,11 @@
- $(WITH_FREETYPE)
-
- install:
-- mkdir -p $(LIBDIR)
-- for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install) || exit $$?; done
-- cp Makefile.config $(LIBDIR)
-- cp config.h $(LIBDIR)
-- $(RANLIB) $(LIBDIR)/*.a
-+ mkdir -p $(DESTDIR)$(LIBDIR)
-+ for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install LIBDIR=$(DESTDIR)$(LIBDIR)) || exit $$?; done
-+ cp Makefile.config $(DESTDIR)$(LIBDIR)
-+ cp config.h $(DESTDIR)$(LIBDIR)
-+ $(RANLIB) $(DESTDIR)$(LIBDIR)/*.a
-
- depend:
- for i in $(BUILDDIRS); do (cd $$i; $(MAKE) depend) || exit $$?; done
diff --git a/debian/patches/05_tiffread.dpatch b/debian/patches/05_tiffread.dpatch
deleted file mode 100755
index 67dbb24..0000000
--- a/debian/patches/05_tiffread.dpatch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_tiffread.dpatch by Sylvain Le Gall <gildor at debian.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
-
diff --git a/debian/patches/fix_3_0_1_release.dpatch b/debian/patches/fix_3_0_1_release.dpatch
new file mode 100755
index 0000000..0e7c083
--- /dev/null
+++ b/debian/patches/fix_3_0_1_release.dpatch
@@ -0,0 +1,97 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_3_0_1_release.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix bugs in the release 3.0.1 for OCaml 3.11 migration
+
+ at DPATCH@
+diff -urNad camlimages~/examples/liv/liv.ml camlimages/examples/liv/liv.ml
+--- camlimages~/examples/liv/liv.ml 2009-03-17 22:47:59.000000000 +0100
++++ camlimages/examples/liv/liv.ml 2009-03-17 22:49:11.000000000 +0100
+@@ -12,6 +12,9 @@
+
+ (* $Id: liv.ml,v 1.7 2006/09/29 13:21:41 rousse Exp $ *)
+
++module D = Display
++open D
++
+ open Images;;
+ open OImages;;
+
+@@ -21,14 +24,13 @@
+
+ open Livmisc;;
+ open Gui;;
+-open Display;;
+ open Tout;;
+
+ open Gc;;
+
+ exception Skipped;;
+
+-let base_filters = ref ([] : Display.filter list);;
++let base_filters = ref ([] : D.filter list);;
+
+ let r = Gc.get () in
+ r.max_overhead <- 0; Gc.set r;
+@@ -52,15 +54,15 @@
+ "-root",
+ Arg.String
+ (function
+- | "center" -> Display.root_mode := `CENTER
+- | "random" -> Display.root_mode := `RANDOM
++ | "center" -> D.root_mode := `CENTER
++ | "random" -> D.root_mode := `RANDOM
+ | _ -> raise (Failure "root mode")),
+ ": on root [center|random]";
+ "-transition",
+ Arg.String
+ (function
+- | "myst" -> Display.transition := `MYST
+- | "transparent" -> Display.transition := `TRANSPARENT
++ | "myst" -> D.transition := `MYST
++ | "transparent" -> D.transition := `TRANSPARENT
+ | _ -> raise (Failure "transition")),
+ ": transition [myst|transparent]";
+ "-transparentborder",
+diff -urNad camlimages~/src/Makefile.am camlimages/src/Makefile.am
+--- camlimages~/src/Makefile.am 2009-03-17 22:47:59.000000000 +0100
++++ camlimages/src/Makefile.am 2009-03-17 22:49:11.000000000 +0100
+@@ -85,6 +85,7 @@
+ oColor.mli \
+ oImages.mli \
+ reduce.mli \
++ geometry.mli \
+ blend.mli \
+ graphic_image.mli \
+ bmp.mli \
+diff -urNad camlimages~/src/Makefile.in camlimages/src/Makefile.in
+--- camlimages~/src/Makefile.in 2009-03-17 22:47:59.000000000 +0100
++++ camlimages/src/Makefile.in 2009-03-17 22:49:11.000000000 +0100
+@@ -341,6 +341,7 @@
+ images.mli \
+ oColor.mli \
+ oImages.mli \
++ geometry.mli \
+ reduce.mli \
+ blend.mli \
+ graphic_image.mli \
+diff -urNad camlimages~/src/geometry.mli camlimages/src/geometry.mli
+--- camlimages~/src/geometry.mli 1970-01-01 01:00:00.000000000 +0100
++++ camlimages/src/geometry.mli 2009-03-17 22:49:26.000000000 +0100
+@@ -0,0 +1,15 @@
++type size = Scale of float | Pixel of int | Guess
++type aspect_opts = Keep_at_most | Keep_at_least | Dont_keep
++type resize_switch = Always | Bigger_only | Smaller_only
++type from = TopLeft | BottomRight | Center
++type position = AtPixel of from * int | AtScale of from * float
++type t = { geom_width : int; geom_height : int; geom_x : int; geom_y : int; }
++type spec = {
++ spec_width : size;
++ spec_height : size;
++ spec_aspect : aspect_opts;
++ spec_switch : resize_switch;
++ spec_x : int;
++ spec_y : int;
++}
++val compute : spec -> int -> int -> t
diff --git a/debian/patches/install.dpatch b/debian/patches/install.dpatch
deleted file mode 100644
index 62530cf..0000000
--- a/debian/patches/install.dpatch
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh -e
-## install.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urN camlimages-2.2/Makefile camlimages-2.2-debian/Makefile
---- camlimages-2.2/Makefile 2004-10-02 17:49:05.000000000 +0200
-+++ camlimages-2.2-debian/Makefile 2004-10-22 16:05:28.620631504 +0200
-@@ -89,18 +89,18 @@
- $(WITH_XPM) \
- $(WITH_FREETYPE)
-
--installopt: install
-+install.byt: byt
-+ mkdir -p $(DESTDIR)$(LIBDIR)
-+ for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install.byt LIBDIR=$(DESTDIR)$(LIBDIR)) || exit $$?; done
-+ $(CP) Makefile.config $(DESTDIR)$(LIBDIR)
-+ $(CP) config.h $(DESTDIR)$(LIBDIR)
-+
-+install.opt: opt
-+ for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install.opt LIBDIR=$(DESTDIR)$(LIBDIR)) || exit $$?; done
-+
-+install: install.byt
-+ $(RANLIB) $(DESTDIR)``:$(LIBDIR)/*.a
-
--install: all
-- mkdir -p $(LIBDIR)
-- if test -w $(CAMLDIR)/ld.conf \
-- && test `grep -s -c '^$(LIBDIR)$$' $(CAMLDIR)/ld.conf` = 0; then \
-- echo $(LIBDIR) >> $(CAMLDIR)/ld.conf; \
-- fi
-- for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install) || exit $$?; done
-- $(CP) Makefile.config $(LIBDIR)
-- $(CP) config.h $(LIBDIR)
-- $(RANLIB) $(LIBDIR)/*.a
-
- depend:
- for i in $(BUILDDIRS); do (cd $$i; $(MAKE) depend) || exit $$?; done
-diff -urN camlimages-2.2/Makefile.shared camlimages-2.2-debian/Makefile.shared
---- camlimages-2.2/Makefile.shared 2004-10-02 16:20:09.000000000 +0200
-+++ camlimages-2.2-debian/Makefile.shared 2004-10-22 16:07:24.053083104 +0200
-@@ -44,10 +44,15 @@
- clean::
- rm -f *.cm[iox] *.o *.cma *.cmxa *.a *.so *~
-
--install:: all
-+install.byt:: byt
- - mkdir -p $(LIBDIR)
-- - cp -p *.mli *.cm[iox] *.o *.cma *.cmxa *.a *.so $(LIBDIR)
-+ - cp -p *.mli *.cm[io] *.o *.cma *.a *.so $(LIBDIR)
-
-+install.opt:: opt
-+ - mkdir -p $(LIBDIR)
-+ - cp -p *.mli *.cmx *.o *.cmxa *.a *.so $(LIBDIR)
-+
-+install:: install.byt install.opt
- #######
-
- .SUFFIXES:
diff --git a/debian/rules b/debian/rules
index 4587177..adca9ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
PACKAGE := libcamlimages-ocaml
DESTDIR := $(CURDIR)/debian/$(PACKAGE)
@@ -33,45 +33,22 @@ DESTDIR_DOC := $(CURDIR)/debian/$(PACKAGE_DOC)
LABLGTK2_DIR := $(shell ocamlfind query lablgtk2)
-DEB_CONFIGURE_EXTRA_FLAGS := --with-lablgtk2="$(LABLGTK2_DIR)" \
- --without-lablgtk
+DEB_CONFIGURE_EXTRA_FLAGS := --with-lablgtk2 --without-lablgtk
-DEB_MAKE_CLEAN_TARGET := veryclean
-
-DEB_MAKE_BUILD_TARGET := byt
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET += opt
-endif
-
-DEB_MAKE_INSTALL_TARGET := install.byt
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_INSTALL_TARGET += install.opt
-endif
-DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
+DEB_MAKE_CLEAN_TARGET := distclean
DEB_INSTALL_EXAMPLES_libcamlimages-ocaml-doc := -X Makefile -X .depend
DEB_DH_INSTALL_ARGS := -X LICENSE -X README -X INSTALL -X Makefile
OCAML_OCAMLDOC_PACKAGES := $(PACKAGE_DEV)
-OCAML_OCAMLDOC_FLAGS := -I $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/camlimages/ \
- $(shell ocamlfind query -i-format lablgtk2)
-
-clean::
- -test -L '$(CURDIR)/html' && $(RM) '$(CURDIR)/html'
- -test -L '$(CURDIR)/doc/index.html' && $(RM) '$(CURDIR)/doc/index.html'
- -$(RM) '$(CURDIR)/Makefile.config'
- -$(RM) -r '$(CURDIR)/freetype'
- -$(RM) '$(CURDIR)/debian/META.camlimages'
- -$(RM) '$(CURDIR)/debian/libcamlimages-ocaml.dirs'
- -$(RM) '$(CURDIR)/debian/libcamlimages-ocaml-dev.dirs'
- -$(RM) '$(CURDIR)/debian/libcamlimages-ocaml-dev.install'
+OCAML_OCAMLDOC_FLAGS := $(shell ocamlfind query -i-format lablgtk2)
+#-I $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/camlimages/
+install/libcamlimages-ocaml-doc::
+ $(MAKE) -C '$(CURDIR)/examples' clean
install/libcamlimages-ocaml-dev::
- VERSION=$(DEB_NOEPOCH_VERSION); \
- VERSION=$${VERSION%%-*}; \
- sed -i "s/@VERSION@/$$VERSION/g" debian/META.camlimages
- mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/camlimages/*.so \
- $(DESTDIR)/$(OCAML_DLL_DIR)/
+ mv '$(CURDIR)/debian/tmp/usr/lib/ocaml/stublibs/dllcamlimages.so' \
+ '$(DESTDIR)/$(OCAML_DLL_DIR)/'
chrpath -d $(DESTDIR)/$(OCAML_DLL_DIR)/*.so
--
camlimages packaging
More information about the Pkg-ocaml-maint-commits
mailing list