[Pkg-ocaml-maint-commits] [SCM] ocaml-fileutils packaging branch, master, updated. debian/0.3.0-14-5-gdc446b4
Sylvain Le Gall
gildor at debian.org
Wed Sep 16 19:08:54 UTC 2009
The following commit has been merged in the master branch:
commit 4bcfce71a98507de9c48b48670605b9d3e62ae30
Author: Sylvain Le Gall <gildor at debian.org>
Date: Wed Sep 16 17:20:11 2009 +0000
New Upstream Version
* New Upstream Version
* Upgrade Standards-Version to 3.8.3 (section ocaml)
diff --git a/debian/changelog b/debian/changelog
index 8e3ecab..7207009 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-ocaml-fileutils (0.3.0-15) UNRELEASED; urgency=low
+ocaml-fileutils (0.4.0-1) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * New Upstream Version
+ * Upgrade Standards-Version to 3.8.3 (section ocaml)
- -- Sylvain Le Gall <gildor at debian.org> Sat, 07 Mar 2009 14:45:04 +0100
+ -- Sylvain Le Gall <gildor at debian.org> Wed, 16 Sep 2009 16:45:47 +0000
ocaml-fileutils (0.3.0-14) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cb5a5d3..05ee5a3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: ocaml-fileutils
-Section: libdevel
+Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Sylvain Le Gall <gildor at debian.org>
@@ -10,7 +10,7 @@ Build-Depends: cdbs (>= 0.4.23-1.1),
ocaml-findlib (>= 1.1.2pl1-4),
camlp4 (>= 3.10.0-4),
dh-ocaml (>= 0.4.1)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-fileutils.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-fileutils.git
Homepage: http://le-gall.net/sylvain+violaine/ocaml-fileutils.html
diff --git a/debian/copyright b/debian/copyright
index f03aacf..62f71d1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Packaged-Date: Sun, 1 Jun 2003 17:10:39 +0100
Original-Source-Location: http://le-gall.net/sylvain+violaine/download/
Files: *
-Copyright: (C) 2003-2004 Sylvain Le Gall
+Copyright: (C) 2003-2009 Sylvain Le Gall
License: LGPL-2.1+
As a special exception to the GNU Library General Public License, you
diff --git a/debian/libfileutils-ocaml-dev.dirs.in b/debian/libfileutils-ocaml-dev.dirs.in
index 4b9f041..cc51687 100644
--- a/debian/libfileutils-ocaml-dev.dirs.in
+++ b/debian/libfileutils-ocaml-dev.dirs.in
@@ -1,3 +1 @@
-usr/share/ocaml-doc
-usr/share/doc/libfileutils-ocaml-dev/html/api
@OCamlStdlibDir@
diff --git a/debian/patches/00list b/debian/patches/00list
index 8794f2a..e69de29 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +0,0 @@
-01_correct_non_opt_build
-stat-largefile
diff --git a/debian/patches/01_correct_non_opt_build.dpatch b/debian/patches/01_correct_non_opt_build.dpatch
deleted file mode 100755
index bd29f56..0000000
--- a/debian/patches/01_correct_non_opt_build.dpatch
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh -e
-## 01_correct_non_opt_build.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct the generation for non native compilation platform.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/ocaml-fileutils/ocaml-fileutils-0.3.0/TopMakefile.in ocaml-fileutils-0.3.0/TopMakefile.in
---- /mnt/nfs0/gildor/deb/ocaml-package/ocaml-fileutils/ocaml-fileutils-0.3.0/TopMakefile.in 2004-08-27 00:39:47.000000000 +0200
-+++ ocaml-fileutils-0.3.0/TopMakefile.in 2004-08-27 00:40:17.000000000 +0200
-@@ -54,6 +54,7 @@
- USE_OCAMLFIND=@USE_OCAMLFIND@
-
- OCAMLBEST = @OCAMLBEST@
-+OCAMLBESTLIB = $(if $(filter opt,$(OCAMLBEST)),byte opt,byte)
- OCAMLVERSION = @OCAMLVERSION@
- OCAMLWIN32 = @OCAMLWIN32@
- OCAMLP4 = @OCAMLP4@
-@@ -161,12 +162,24 @@
- $(NAME).cmxa: $(CMX)
- $(call CLI_OCAMLOLIB,$(REQUIRES),$(PREDICATES),$(NAME)) $(INCLUDES) $(CMX)
-
--install-buildlib: byte opt
-+install-buildlib: $(OCAMLBESTLIB)
- -$(call CLI_REMOVELIB,$(TEMPBUILDLIB),$(NAME))
-- $(call CLI_INSTALLIB,$(TEMPBUILDLIB),$(NAME),$(INSTALLIB))
-+ $(call CLI_INSTALLIB,$(TEMPBUILDLIB),$(NAME), \
-+ $(if $(filter opt,$(OCAMLBEST)), \
-+ $(INSTALLIB) \
-+ , \
-+ $(filter-out %.a,$(filter-out %.cmx,$(filter-out %.cmxa,$(INSTALLIB)))) \
-+ ) \
-+ )
-
--install-lib: byte opt
-- $(call CLI_INSTALLIB,$(LIBDIR),$(NAME),$(INSTALLIB))
-+install-lib: $(OCAMLBESTLIB)
-+ $(call CLI_INSTALLIB,$(LIBDIR),$(NAME), \
-+ $(if $(filter opt,$(OCAMLBEST)), \
-+ $(INSTALLIB) \
-+ , \
-+ $(filter-out %.a,$(filter-out %.cmx,$(filter-out %.cmxa,$(INSTALLIB)))) \
-+ ) \
-+ )
-
- uninstall-lib:
- $(call CLI_REMOVELIB,$(LIBDIR),$(NAME))
diff --git a/debian/patches/stat-largefile.dpatch b/debian/patches/stat-largefile.dpatch
deleted file mode 100755
index 6e205de..0000000
--- a/debian/patches/stat-largefile.dpatch
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## stat-largefile.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 ocaml-fileutils-0.3.0~/libfileutils-ocaml/fileUtil.ml ocaml-fileutils-0.3.0/libfileutils-ocaml/fileUtil.ml
---- ocaml-fileutils-0.3.0~/libfileutils-ocaml/fileUtil.ml 2004-06-28 22:21:32.000000000 +0200
-+++ ocaml-fileutils-0.3.0/libfileutils-ocaml/fileUtil.ml 2008-12-21 12:25:40.000000000 +0100
-@@ -520,10 +520,10 @@
-
- let stat filename =
- try
-- let stats = Unix.stat filename
-+ let stats = Unix.LargeFile.stat filename
- in
- let kind =
-- match stats.Unix.st_kind with
-+ match stats.Unix.LargeFile.st_kind with
- Unix.S_REG -> File
- | Unix.S_DIR -> Dir
- | Unix.S_CHR -> Dev_char
-@@ -533,20 +533,20 @@
- | Unix.S_SOCK -> Socket
- in
- let is_link =
-- let stats = Unix.lstat filename
-+ let stats = Unix.LargeFile.lstat filename
- in
-- stats.Unix.st_kind = Unix.S_LNK
-+ stats.Unix.LargeFile.st_kind = Unix.S_LNK
- in
- {
- kind = kind;
- is_link = is_link;
-- permission = permission_of_int stats.Unix.st_perm;
-- size = B (float_of_int stats.Unix.st_size);
-- owner = stats.Unix.st_uid;
-- group_owner = stats.Unix.st_gid;
-- access_time = stats.Unix.st_atime;
-- modification_time = stats.Unix.st_mtime;
-- creation_time = stats.Unix.st_ctime;
-+ permission = permission_of_int stats.Unix.LargeFile.st_perm;
-+ size = B (Int64.to_float stats.Unix.LargeFile.st_size);
-+ owner = stats.Unix.LargeFile.st_uid;
-+ group_owner = stats.Unix.LargeFile.st_gid;
-+ access_time = stats.Unix.LargeFile.st_atime;
-+ modification_time = stats.Unix.LargeFile.st_mtime;
-+ creation_time = stats.Unix.LargeFile.st_ctime;
- }
- with Unix.Unix_error(_) ->
- raise FileDoesntExist
diff --git a/debian/rules b/debian/rules
index 1fb8958..9cff5d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,19 +27,8 @@ DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
DEB_MAKE_CLEAN_TARGET := distclean
DEB_MAKE_BUILD_TARGET := all
-DEB_MAKE_INSTALL_TARGET := install
+DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
-DEB_CONFIGURE_EXTRA_FLAGS = --prefix="$(DESTDIR_DEV)/usr" \
- --with-docdir="$(DESTDIR_DEV)/usr/share/ocaml-doc" \
- --libdir="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
-
-OCAML_OCAMLDOC_PACKAGES_DOCBASE := libfileutils-ocaml-dev
-
-install/libfileutils-ocaml-dev::
- ocamldoc -html -d '$(DESTDIR_DEV)/usr/share/doc/libfileutils-ocaml-dev/html/api' \
- -load '$(DESTDIR_DEV)/usr/share/ocaml-doc/fileutils.odoc'
- ocamlc -I libfileutils-ocaml/ -i libfileutils-ocaml/filePath.ml \
- > '$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/fileutils/filePath.mli'
- ocamlc -I libfileutils-ocaml/ -i libfileutils-ocaml/fileUtil.ml \
- > '$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/fileutils/fileUtil.mli'
+OCAML_OCAMLDOC_PACKAGES_DOCBASE := $(PACKAGE_DEV)
+DEB_CONFIGURE_EXTRA_FLAGS = --htmldir="$(DESTDIR_DEV)/usr/share/doc/$(PACKAGE_DEV)/html"
--
ocaml-fileutils packaging
More information about the Pkg-ocaml-maint-commits
mailing list