[Pkg-ocaml-maint-commits] r3498 - in
/trunk/packages/camlimages/trunk/debian: META META.camlimages.in
changelog compat control control.in libcamlimages-ocaml-dev.dirs.in
libcamlimages-ocaml-dev.install.in libcamlimages-ocaml-doc.install
libcamlimages-ocaml.dirs.in rules watch
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Sun Jan 7 22:53:11 CET 2007
Author: gildor
Date: Sun Jan 7 22:53:10 2007
New Revision: 3498
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3498
Log:
[copy and paste changelog]
* Upgrade debian/watch version to 3,
* Upgrade debhelper debian/compat to 5,
* Replace dependency Source-Version by binary:Version,
* Use CDBS for debian/rules,
* Use @OCamlTeam@ for Uploaders field in debian/control.in,
* Add versioned Build-Depends on dpkg-dev (>= 1.13.19),
* Add an epoch to reflect the change in the upstream
numbering scheme and update debian/watch file accordingly,
-- SLG
Added:
trunk/packages/camlimages/trunk/debian/META.camlimages.in
- copied, changed from r3272, trunk/packages/camlimages/trunk/debian/META
trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.dirs.in
trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.install.in
trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-doc.install
trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs.in
Removed:
trunk/packages/camlimages/trunk/debian/META
Modified:
trunk/packages/camlimages/trunk/debian/changelog
trunk/packages/camlimages/trunk/debian/compat
trunk/packages/camlimages/trunk/debian/control
trunk/packages/camlimages/trunk/debian/control.in
trunk/packages/camlimages/trunk/debian/rules
trunk/packages/camlimages/trunk/debian/watch
Copied: trunk/packages/camlimages/trunk/debian/META.camlimages.in (from r3272, trunk/packages/camlimages/trunk/debian/META)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/META.camlimages.in?rev=3498&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/META (original)
+++ trunk/packages/camlimages/trunk/debian/META.camlimages.in Sun Jan 7 22:53:10 2007
@@ -1,4 +1,4 @@
-version="2.12"
+version="@VERSION@"
description="image format handler"
directory="^camlimages"
Modified: trunk/packages/camlimages/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/changelog?rev=3498&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/changelog (original)
+++ trunk/packages/camlimages/trunk/debian/changelog Sun Jan 7 22:53:10 2007
@@ -1,3 +1,16 @@
+camlimages (1:2.2.0-1) UNRELEASED; urgency=low
+
+ * Upgrade debian/watch version to 3,
+ * Upgrade debhelper debian/compat to 5,
+ * Replace dependency Source-Version by binary:Version,
+ * Use CDBS for debian/rules,
+ * Use @OCamlTeam@ for Uploaders field in debian/control.in,
+ * Add versioned Build-Depends on dpkg-dev (>= 1.13.19),
+ * Add an epoch to reflect the change in the upstream
+ numbering scheme and update debian/watch file accordingly,
+
+ -- Sylvain Le Gall <gildor at debian.org> Thu, 9 Nov 2006 23:39:55 +0100
+
camlimages (2.20-8) unstable; urgency=low
* Change my email address to gildor at debian.org,
Modified: trunk/packages/camlimages/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/compat?rev=3498&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/compat (original)
+++ trunk/packages/camlimages/trunk/debian/compat Sun Jan 7 22:53:10 2007
@@ -1,1 +1,1 @@
-4
+5
Modified: trunk/packages/camlimages/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/control?rev=3498&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/control (original)
+++ trunk/packages/camlimages/trunk/debian/control Sun Jan 7 22:53:10 2007
@@ -2,10 +2,12 @@
Section: devel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml (>= 3.09.2), ocaml-findlib, libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev ( >= 2.1.7 ), libungif4-dev, liblablgtk2-ocaml-dev, gs, dpatch, chrpath
+Uploaders: Julien Cristau <julien.cristau at ens-lyon.org>, Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram 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-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), ocaml, ocaml-findlib, libpng12-dev,
+ libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev ( >= 2.1.7 ),
+ libungif4-dev, liblablgtk2-ocaml-dev, gs, chrpath, dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlimages
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlimages
Package: libcamlimages-ocaml
Architecture: any
@@ -33,7 +35,7 @@
Package: libcamlimages-ocaml-dev
Architecture: any
Section: libdevel
-Depends: ocaml-${F:OCamlABI}, libcamlimages-ocaml (= ${Source-Version}), libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev, libungif4-dev, liblablgtk2-ocaml-dev
+Depends: ocaml-${F:OCamlABI}, libcamlimages-ocaml (= ${binary:Version}), libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev, libungif4-dev, liblablgtk2-ocaml-dev
Description: OCaml image processing library
CamlImages is an image processing library for Objective CAML,
which provides:
Modified: trunk/packages/camlimages/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/control.in?rev=3498&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/control.in (original)
+++ trunk/packages/camlimages/trunk/debian/control.in Sun Jan 7 22:53:10 2007
@@ -2,8 +2,10 @@
Section: devel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Sylvain Le Gall <gildor at debian.org>
-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
+Uploaders: @OCamlTeam@
+Build-Depends: @cdbs@, ocaml, ocaml-findlib, libpng12-dev,
+ libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev ( >= 2.1.7 ),
+ libungif4-dev, liblablgtk2-ocaml-dev, gs, chrpath, dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlimages
@@ -33,7 +35,7 @@
Package: libcamlimages-ocaml-dev
Architecture: any
Section: libdevel
-Depends: ocaml-${F:OCamlABI}, libcamlimages-ocaml (= ${Source-Version}), libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev, libungif4-dev, liblablgtk2-ocaml-dev
+Depends: ocaml-${F:OCamlABI}, libcamlimages-ocaml (= ${binary:Version}), libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev, libungif4-dev, liblablgtk2-ocaml-dev
Description: OCaml image processing library
CamlImages is an image processing library for Objective CAML,
which provides:
Added: trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.dirs.in?rev=3498&op=file
==============================================================================
--- trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.dirs.in (added)
+++ trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.dirs.in Sun Jan 7 22:53:10 2007
@@ -1,0 +1,1 @@
+ at OCamlStdlibDir@/camlimages
Added: trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.install.in?rev=3498&op=file
==============================================================================
--- trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.install.in (added)
+++ trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-dev.install.in Sun Jan 7 22:53:10 2007
@@ -1,0 +1,1 @@
+debian/META.camlimages @OCamlStdlibDir@/METAS
Added: trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-doc.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-doc.install?rev=3498&op=file
==============================================================================
--- trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-doc.install (added)
+++ trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml-doc.install Sun Jan 7 22:53:10 2007
@@ -1,0 +1,1 @@
+doc/* /usr/share/doc/libcamlimages-ocaml-doc/html
Added: trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs.in?rev=3498&op=file
==============================================================================
--- trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs.in (added)
+++ trunk/packages/camlimages/trunk/debian/libcamlimages-ocaml.dirs.in Sun Jan 7 22:53:10 2007
@@ -1,0 +1,1 @@
+ at OCamlStdlibDir@/stublibs
Modified: trunk/packages/camlimages/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/rules?rev=3498&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/rules (original)
+++ trunk/packages/camlimages/trunk/debian/rules Sun Jan 7 22:53:10 2007
@@ -1,123 +1,78 @@
#!/usr/bin/make -f
+# debian/rules for camlimages package
+# Copyright (C) 2006 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/dpatch/dpatch.make
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-BUILD_LABLGTK2=yes
-BUILD_LABLGTK =no
+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
-OCAMLIBDIR := $(shell ocamlc -where)
-OCAMLABI=$(shell ocamlc -version)
+PACKAGE := libcamlimages-ocaml
+DESTDIR := $(CURDIR)/debian/$(PACKAGE)
-ifeq ($(BUILD_LABLGTK2),yes)
+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)
-LABGTK2_CONF = --with-labgtk2=$(LABGTK2_DIR)
-else
-LABGTK2_CONF = --without-labgtk2
+
+DEB_CONFIGURE_EXTRA_FLAGS := --with-lablgtk2="$(LABLGTK2_DIR)" \
+ --without-lablgtk
+
+DEB_MAKE_CLEAN_TARGET := veryclean
+
+DEB_MAKE_BUILD_TARGET := byt
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET += opt
endif
-ifeq ($(BUILD_LABLGTK),yes)
-LABLGTK_DIR := $(shell ocamlfind query lablgtk)
-LABGTK_CONF = --with-labgtk=$(LABGTK_DIR)
-else
-LABGTK_CONF = --without-labgtk
+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)"
-DESTDIR = $(CURDIR)/debian/libcamlimages-ocaml
-DESTDIR_DEV = $(CURDIR)/debian/libcamlimages-ocaml-dev
-DESTDIR_DOC = $(CURDIR)/debian/libcamlimages-ocaml-doc
+DEB_INSTALL_EXAMPLES_libcamlimages-ocaml-doc := -X Makefile -X .depend
+DEB_DH_INSTALL_ARGS := -X LICENSE -X README -X INSTALL -X Makefile
-debian/control: debian/control.in
- sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
-configure: configure-stamp
-configure-stamp: patch-stamp
- dh_testdir
- ./configure $(LABLGTK_CONF) $(LABLGTK2_CONF)
- touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp patch-stamp
- dh_testdir
- $(MAKE) byt
- if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then \
- $(MAKE) opt; \
- fi
- touch build-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- # Clean documentation links
+clean::
-test -L html && $(RM) html
-test -L doc/index.html && $(RM) doc/index.html
- -$(MAKE) veryclean
-$(RM) Makefile.config
-$(RM) -r freetype
- dh_clean
+ -$(RM) debian/META.camlimages
+ -$(RM) debian/libcamlimages-ocaml.dirs
+ -$(RM) debian/libcamlimages-ocaml-dev.dirs
+ -$(RM) debian/libcamlimages-ocaml-dev.install
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- # Creating install dirs
- mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)/camlimages
- mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)/METAS
- mkdir -p $(DESTDIR)/$(OCAMLIBDIR)/stublibs
- # Install
- $(MAKE) install.byt DESTDIR=$(DESTDIR_DEV)
- if [ -x /usr/bin/ocamlopt ]; then \
- $(MAKE) install.opt DESTDIR=$(DESTDIR_DEV); \
- fi
- # Move the file to their correct destination
- mv -f $(DESTDIR_DEV)/$(OCAMLIBDIR)/camlimages/*.so \
- $(DESTDIR)/$(OCAMLIBDIR)/stublibs/
- cp debian/META \
- $(DESTDIR_DEV)/$(OCAMLIBDIR)/METAS/META.camlimages
- # Remove the rpath
- chrpath -d $(DESTDIR)/$(OCAMLIBDIR)/stublibs/*.so
+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_STDLIB_DIR)/stublibs/
+ chrpath -d $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/*.so
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_link -i
- # Set up documentation links
- # Install documentation
- cp -rf doc/* \
- $(DESTDIR_DOC)/usr/share/doc/libcamlimages-ocaml-doc/html
- $(RM) $(DESTDIR_DOC)/usr/share/doc/libcamlimages-ocaml-doc/html/LICENSE
- $(RM) $(DESTDIR_DOC)/usr/share/doc/libcamlimages-ocaml-doc/html/README
- $(RM) $(DESTDIR_DOC)/usr/share/doc/libcamlimages-ocaml-doc/html/INSTALL
- dh_installdocs -i
- dh_installchangelogs -i CHANGES
- dh_installexamples -i
- # remove Makefile and .depend files (because they are relative to source
- # tree of camlimages)
- -find \
- debian/libcamlimages-ocaml-doc \
- \( -name .depend -or -name Makefile \) -exec rm {} \;
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_installdocs -a
- dh_installchangelogs -a CHANGES
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure debian/control
Modified: trunk/packages/camlimages/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlimages/trunk/debian/watch?rev=3498&op=diff
==============================================================================
--- trunk/packages/camlimages/trunk/debian/watch (original)
+++ trunk/packages/camlimages/trunk/debian/watch Sun Jan 7 22:53:10 2007
@@ -1,2 +1,2 @@
-version=2
-ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/camlimages-([0-9].*)\.tgz
+version=3
+ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/camlimages-([0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*)\.tgz
More information about the Pkg-ocaml-maint-commits
mailing list