[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:21 UTC 2009
The following commit has been merged in the master branch:
commit c78b641b37c8d907121741e8609574107392b3c5
Author: Sylvain Le Gall <gildor at debian.org>
Date: Tue Mar 17 23:39:59 2009 +0100
Prepare upload for OCaml 3.11 migration
* Add ${misc:Depends} to dependencies
* Update Homepage field into debian/control and debian/copyright
* Add license version for debian packaging
* Directly use eng.html rather than creating a linked index.html file
diff --git a/debian/changelog b/debian/changelog
index f58a0a4..679751a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ camlimages (1:3.0.1-1) unstable; urgency=low
OCaml 3.11 migration)
* Depends on version 2.12 of lablgtk2
* Add dh-ocaml build-dependency (rules/ocaml.mk)
+ * Add ${misc:Depends} to dependencies
+ * Update Homepage field into debian/control and debian/copyright
+ * Add license version for debian packaging
+ * Directly use eng.html rather than creating a linked index.html file
-- Sylvain Le Gall <gildor at debian.org> Thu, 05 Mar 2009 00:19:32 +0100
diff --git a/debian/control b/debian/control
index 9c4479f..9baa940 100644
--- a/debian/control
+++ b/debian/control
@@ -6,20 +6,31 @@ Uploaders: Ralf Treinen <treinen at debian.org>,
Stefano Zacchiroli <zack 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.12.0-2), chrpath,
- ghostscript, dh-ocaml (>= 0.4.1), automake1.9
+ 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.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
-Homepage: http://pauillac.inria.fr/camlimages/
+Homepage: http://gallium.inria.fr/camlimages/
Package: libcamlimages-ocaml
Architecture: any
Section: libs
-Depends: ocaml-base-${F:OCamlABI}, liblablgtk2-ocaml, ${shlibs:Depends}
+Depends: ocaml-base-${F:OCamlABI}, liblablgtk2-ocaml, ${shlibs:Depends}, ${misc:Depends}
Description: OCaml image processing library
CamlImages is an image processing library for OCaml, which provides:
.
@@ -44,7 +55,7 @@ Description: OCaml image processing library
Package: libcamlimages-ocaml-dev
Architecture: any
Section: libdevel
-Depends: ocaml-${F:OCamlABI}, libcamlimages-ocaml (= ${binary:Version}), libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev, libgif-dev, liblablgtk2-ocaml-dev
+Depends: ocaml-${F:OCamlABI}, libcamlimages-ocaml (= ${binary:Version}), libpng12-dev, libjpeg62-dev, libtiff4-dev, libxpm-dev, libfreetype6-dev, libgif-dev, liblablgtk2-ocaml-dev, ${misc:Depends}
Description: OCaml image processing library
CamlImages is an image processing library for OCaml, which provides:
.
@@ -71,6 +82,7 @@ Package: libcamlimages-ocaml-doc
Architecture: all
Section: doc
Suggests: libcamlimages-ocaml-dev
+Depends: ${misc:Depends}
Description: OCaml CamlImages library documentation
This package provides documentation for the OCaml CamlImages
library.
diff --git a/debian/copyright b/debian/copyright
index db57ab5..ac00155 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Packaged-By: Stefano Zacchiroli <zack at debian.org>
Packaged-Date: Fri, 11 Jan 2002 23:56:25 +0100
Upstream-Author: Jun Furuse <Jun.Furuse at inria.fr>
Pierre Weis <Pierre.Weis at inria.fr>
-Original-Source-Location: http://pauillac.inria.fr/camlimages/
+Original-Source-Location: http://gallium.inria.fr/camlimages/
Files: *
Copyright: © 1999-2004, INRIA
@@ -31,7 +31,7 @@ Copyright: © 2004-2008 Sylvain Le Gall <gildor at debian.org>
© 2002-2008 Stefano Zacchiroli <zack at debian.org>
© 2003-2004 Sven Luther <luther at debian.org>
© 2008 Ralf Treinen <treinen at debian.org>
-License: GPL
+License: GPL-2+
The Debian packaging is licensed under the GNU General Public License, see
-`/usr/share/common-licenses/GPL' for the full text.
+`/usr/share/common-licenses/GPL-2' for the full text.
diff --git a/debian/libcamlimages-ocaml-doc.doc-base b/debian/libcamlimages-ocaml-doc.doc-base
index 4af1c43..a15fc11 100644
--- a/debian/libcamlimages-ocaml-doc.doc-base
+++ b/debian/libcamlimages-ocaml-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is a short introduction to CamlImages
Section: Programming/OCaml
Format: HTML
-Index: /usr/share/doc/libcamlimages-ocaml-doc/html/index.html
+Index: /usr/share/doc/libcamlimages-ocaml-doc/html/eng.html
Files: /usr/share/doc/libcamlimages-ocaml-doc/html/*
diff --git a/debian/libcamlimages-ocaml-doc.links b/debian/libcamlimages-ocaml-doc.links
deleted file mode 100644
index 2ee261c..0000000
--- a/debian/libcamlimages-ocaml-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libcamlimages-ocaml-doc/html/eng.htm usr/share/doc/libcamlimages-ocaml-doc/html/index.html
diff --git a/debian/rules b/debian/rules
index adca9ac..4363107 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,14 +35,14 @@ LABLGTK2_DIR := $(shell ocamlfind query lablgtk2)
DEB_CONFIGURE_EXTRA_FLAGS := --with-lablgtk2 --without-lablgtk
-DEB_MAKE_CLEAN_TARGET := distclean
+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 := $(shell ocamlfind query -i-format lablgtk2)
-#-I $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/camlimages/
+
install/libcamlimages-ocaml-doc::
$(MAKE) -C '$(CURDIR)/examples' clean
--
camlimages packaging
More information about the Pkg-ocaml-maint-commits
mailing list