[Pkg-ocaml-maint-commits] [SCM] camlimages packaging branch, master, updated. debian/3.0.1-5-35-gc8d43ef

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 95c59b8777196235d9cb83f10ff7238abd50153d
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jun 28 09:58:57 2011 +0200

    Update packaging, rewrite debian/rules using dh with overrides

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..3c10214
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+.omakedb
+.omakedb.lock
+config.h
diff --git a/debian/control b/debian/control
index 4e56a6d..f132a54 100644
--- a/debian/control
+++ b/debian/control
@@ -17,10 +17,9 @@ Build-Depends: cdbs (>= 0.4.23),
  libfreetype6-dev (>= 2.1.7),
  libgif-dev,
  liblablgtk2-ocaml-dev (>> 2.12.0-3),
- chrpath,
  ghostscript,
  dh-ocaml (>= 0.9),
- automake1.9
+ omake
 Standards-Version: 3.8.3
 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
deleted file mode 100644
index cc51687..0000000
--- a/debian/libcamlimages-ocaml-dev.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlStdlibDir@
diff --git a/debian/libcamlimages-ocaml-dev.install.in b/debian/libcamlimages-ocaml-dev.install.in
index 1a5dc7d..278b760 100644
--- a/debian/libcamlimages-ocaml-dev.install.in
+++ b/debian/libcamlimages-ocaml-dev.install.in
@@ -1 +1 @@
-debian/tmp/usr/lib/ocaml/site-lib/camlimages @OCamlStdlibDir@
+ at OCamlStdlibDir@/camlimages
diff --git a/debian/libcamlimages-ocaml-doc.doc-base.1 b/debian/libcamlimages-ocaml-doc.doc-base.1
index 6911e60..d9bee7f 100644
--- a/debian/libcamlimages-ocaml-doc.doc-base.1
+++ b/debian/libcamlimages-ocaml-doc.doc-base.1
@@ -5,5 +5,5 @@ Abstract: This is a short introduction to CamlImages
 Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/libcamlimages-ocaml-doc/doc/eng.html
-Files: /usr/share/doc/libcamlimages-ocaml-doc/doc/*
+Index: /usr/share/doc/libcamlimages-ocaml-doc/doc/old/eng.htm
+Files: /usr/share/doc/libcamlimages-ocaml-doc/doc/old/*
diff --git a/debian/libcamlimages-ocaml-doc.ocamldoc.in b/debian/libcamlimages-ocaml-doc.ocamldoc.in
index 508c183..551f580 100644
--- a/debian/libcamlimages-ocaml-doc.ocamldoc.in
+++ b/debian/libcamlimages-ocaml-doc.ocamldoc.in
@@ -1,2 +1,2 @@
  -package lablgtk2
---include debian/tmp/@OCamlStdlibDir@/site-lib/camlimages/
+--include debian/tmp/@OCamlStdlibDir@/camlimages/
diff --git a/debian/libcamlimages-ocaml.dirs.in b/debian/libcamlimages-ocaml.dirs.in
deleted file mode 100644
index a8131b4..0000000
--- a/debian/libcamlimages-ocaml.dirs.in
+++ /dev/null
@@ -1 +0,0 @@
- at OCamlDllDir@
diff --git a/debian/libcamlimages-ocaml.install.in b/debian/libcamlimages-ocaml.install.in
new file mode 100644
index 0000000..1d5ce78
--- /dev/null
+++ b/debian/libcamlimages-ocaml.install.in
@@ -0,0 +1 @@
+ at OCamlDllDir@/*.so
diff --git a/debian/rules b/debian/rules
index a1931e8..d19db15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,50 +1,40 @@
 #!/usr/bin/make -f
-# debian/rules for camlimages package
-# Copyright (C) 2006-2008 Sylvain Le Gall <gildor at debian.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-PACKAGE := libcamlimages-ocaml
-DESTDIR := $(CURDIR)/debian/$(PACKAGE)
-
-PACKAGE_DEV := libcamlimages-ocaml-dev
-DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
-
-PACKAGE_DOC := libcamlimages-ocaml-doc
-DESTDIR_DOC := $(CURDIR)/debian/$(PACKAGE_DOC)
-
-LABLGTK2_DIR := $(shell ocamlfind query lablgtk2)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --with-lablgtk2 --without-lablgtk --enable-dependency-tracking
-
-DEB_MAKE_CLEAN_TARGET     := clean
-
-DEB_INSTALL_EXAMPLES_libcamlimages-ocaml-doc := -X Makefile -X .depend
-DEB_DH_INSTALL_ARGS                          := -X LICENSE -X README -X INSTALL -X Makefile
-
-OCAML_OCAMLDOC_FLAGS := $(shell ocamlfind query -i-format lablgtk2)
-
-install/libcamlimages-ocaml-doc::
-	$(MAKE) -C '$(CURDIR)/examples' clean
-
-install/libcamlimages-ocaml-dev::
-	mv '$(CURDIR)/debian/tmp/usr/lib/ocaml/stublibs/dllcamlimages.so' \
-	 '$(DESTDIR)/$(OCAML_DLL_DIR)/'
-	chrpath -d $(DESTDIR)/$(OCAML_DLL_DIR)/*.so
+# -*- makefile -*-
+
+include /usr/share/ocaml/ocamlvars.mk
+
+DESTDIR=$(CURDIR)/debian/tmp
+OCAMLFIND_DESTDIR=$(DESTDIR)$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR
+
+%:
+	dh $@ --with ocaml
+
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	omake
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	mkdir -p $(OCAMLFIND_DESTDIR) $(DESTDIR)$(OCAML_DLL_DIR)
+	omake install
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	omake clean
+	find -name '*.omc' -delete
+
+.PHONY: override_dh_install
+override_dh_install:
+	dh_install --fail-missing -X.so.owner
+
+.PHONY: override_dh_installexamples
+override_dh_installexamples:
+	dh_installexamples -X'.cm*' -X.o -Xliv-furuse -X.cvsignore
+
+.PHONY: override_dh_compress
+override_dh_compress:
+	dh_compress -Xexamples

-- 
camlimages packaging