[Pkg-ocaml-maint-commits] [SCM] ocaml-fileutils packaging branch, master, updated. debian/0.3.0-14-1-g7b6653b

Sylvain Le Gall gildor at debian.org
Sat Mar 7 13:45:20 UTC 2009


The following commit has been merged in the master branch:
commit 6077520b28cde7189399ed1046c00c0a1484a89d
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sat Mar 7 14:44:07 2009 +0100

    Migration to ocaml 3.11 and updated copyright file format
    
    * Add dh-ocaml build-dependency (rules/ocaml.mk)
    * Set maintainer to Debian OCaml Maintainers
    * Upgrade Standards-Version to 3.8.0 (debian/README.source)
    * Add Homepage field to debian/control
    * Add ${misc:Depends} to dependencies
    * Update debian/copyright file to use
      http://wiki.debian.org/Proposals/CopyrightFormat
    * Remove obsolete debian/control.in related variables and files
    * Rewrite description of debian/control

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..62605d2
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+This package use dpatch for patching the source. 
+
+Please consider reading dpatch manpage to patch the source.
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sun, 22 Jun 2008 23:26:52 +0200
diff --git a/debian/changelog b/debian/changelog
index 92dabca..7103365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,19 @@
-ocaml-fileutils (0.3.0-14) UNRELEASED; urgency=low
+ocaml-fileutils (0.3.0-14) unstable; urgency=low
 
-  [ Sylvain Le Gall ]
-  * NOT RELEASED YET
   * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
   * Add patch to handle largefile in 'du'
-
-  [ Stefano Zacchiroli ]
-  * fix vcs-svn field to point just above the debian/ dir
-
-  [ Sylvain Le Gall ]
   * Switch packaging to git
-
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 05 Mar 2009 10:39:22 +0100
+  * Add dh-ocaml build-dependency (rules/ocaml.mk)
+  * Set maintainer to Debian OCaml Maintainers
+  * Upgrade Standards-Version to 3.8.0 (debian/README.source)
+  * Add Homepage field to debian/control
+  * Add ${misc:Depends} to dependencies
+  * Update debian/copyright file to use
+    http://wiki.debian.org/Proposals/CopyrightFormat
+  * Remove obsolete debian/control.in related variables and files
+  * Rewrite description of debian/control
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sat, 07 Mar 2009 14:37:08 +0100
 
 ocaml-fileutils (0.3.0-13) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8e97439..cb5a5d3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,28 @@
 Source: ocaml-fileutils
 Section: libdevel
 Priority: optional
-Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-9), ocaml-findlib (>= 1.1.2pl1-4), camlp4 (>= 3.10.0-4)
-Standards-Version: 3.7.2
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Sylvain Le Gall <gildor at debian.org>
+Build-Depends: cdbs (>= 0.4.23-1.1), 
+ debhelper (>= 5),
+ dpatch,
+ ocaml-nox (>= 3.10.0-9),
+ ocaml-findlib (>= 1.1.2pl1-4),
+ camlp4 (>= 3.10.0-4),
+ dh-ocaml (>= 0.4.1)
+Standards-Version: 3.8.0
 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
 
 Package: libfileutils-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}
+Depends: ocaml-nox-${F:OCamlABI}, ${misc:Depends}
 Description: File manipulation for OCaml
  This library provides some functions which operate on the file system
- for the Objective Caml (OCaml) programming language.
- The aim is to enhance the basic functionality provided by the 
- Ocaml Standard Filename library.
- It provides functions for manipulating filenames: 
-  - make_relative : make a filename relative to a root
-  - make_absolute : make an absolute filename
-  - reduce : remove any a/./b a/../b
+ for the Objective Caml (OCaml) programming language. The aim is to enhance
+ the basic functionality provided by the OCaml standard Filename module.
  .
- It also provides functions, written in pure OCaml, for manipulating files:
-  - mv
-  - cp
-  - mkdir
-  - ...
+ It provides functions, written in pure OCaml, for manipulating files (mv, cp,
+ mkdir et al) and abstract filename (make_relative, make_absolute et al).
 
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 1874d1f..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,28 +0,0 @@
-Source: ocaml-fileutils
-Section: libdevel
-Priority: optional
-Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocaml-findlib (>= 1.1.2pl1-4), camlp4 (>= 3.10.0-4)
-Standards-Version: 3.7.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-fileutils/trunk/
-
-Package: libfileutils-ocaml-dev
-Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}
-Description: File manipulation for OCaml
- This library provides some functions which operate on the file system
- for the Objective Caml (OCaml) programming language.
- The aim is to enhance the basic functionality provided by the 
- Ocaml Standard Filename library.
- It provides functions for manipulating filenames: 
-  - make_relative : make a filename relative to a root
-  - make_absolute : make an absolute filename
-  - reduce : remove any a/./b a/../b
- .
- It also provides functions, written in pure OCaml, for manipulating files:
-  - mv
-  - cp
-  - mkdir
-  - ...
-
diff --git a/debian/copyright b/debian/copyright
index 5ee4f2d..f03aacf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,30 @@
-This package was debianized by Sylvain Le Gall <gildor at debian.org> on
-Sun, 1 Jun 2003 17:10:39 +0100.
-
-It was downloaded from :
-
-http://www.gallu.homelinux.org/download/
-
-
-Upstream Authors:
- Sylvain Le Gall <gildor at debian.org>
-
-Copyright:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as 
-   published by the Free Software Foundation; version 2.1 dated February, 1999.
-
-   This package 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 Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this package; if not, write to the Free Software Foundation, 
-   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Sylvain Le Gall
+Packaged-By: Sylvain Le Gall <gildor at debian.org> 
+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
+License: LGPL-2.1+
+
+As a special exception to the GNU Library General Public License, you
+may link, statically or dynamically, a "work that uses the Library"
+with a publicly distributed version of the Library to produce an
+executable file containing portions of the Library, and distribute
+that executable file under terms of your choice, without any of the
+additional requirements listed in clause 6 of the GNU Library General
+Public License.  By "a publicly distributed version of the Library",
+we mean either the unmodified Library as distributed by INRIA, or a
+modified version of the Library that is distributed under the
+conditions defined in clause 3 of the GNU Library General Public
+License.  This exception does not however invalidate any other reasons
+why the executable file might be covered by the GNU Library General
+Public License.
+
+On Debian GNU/Linux systems, the complete text of the GNU Library General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: debian/*
+Copyright: (C) 2006-2009 Sylvain Le Gall
+License: GPL-2+
diff --git a/debian/rules b/debian/rules
index 5007866..1fb8958 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # debian/rules for ocaml-fileutils package
-# Copyright (C) 2006 Sylvain Le Gall <gildor at debian.org>
+# Copyright (C) 2006-2009 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
@@ -17,13 +17,10 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-# Generate debian/control using
-# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-
 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_DEV := libfileutils-ocaml-dev
 DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
@@ -36,18 +33,13 @@ DEB_CONFIGURE_EXTRA_FLAGS = --prefix="$(DESTDIR_DEV)/usr" \
 			    --with-docdir="$(DESTDIR_DEV)/usr/share/ocaml-doc" \
 			    --libdir="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-9),$(CDBS_BUILD_DEPENDS))
-
 OCAML_OCAMLDOC_PACKAGES_DOCBASE := libfileutils-ocaml-dev
 
-clean::
-	-$(RM) $(CURDIR)/debian/libfileutils-ocaml-dev.dirs 
-
 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
+	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
+	  > '$(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
+	  > '$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/fileutils/fileUtil.mli'
 

-- 
ocaml-fileutils packaging



More information about the Pkg-ocaml-maint-commits mailing list