[Pkg-ocaml-maint-commits] [SCM] mlpcap packaging branch, master, updated. debian/0.9-14-1-gdeaa93b

Fri Mar 6 23:14:27 UTC 2009

The following commit has been merged in the master branch:
commit ee59d1139e80ca1f1f2eda6542c395d0383a05d9
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sat Mar 7 00:13:25 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 debian/compat to 7 (use debian/clean)
    * Upgrade Standards-Version to 3.8.0 (debian/README.source)
    * Add Homepage field to debian/control
    * Update debian/copyright file to use
      http://wiki.debian.org/Proposals/CopyrightFormat
    * Add ${misc:Depends} to dependencies
    * Remove obsolete debian/control.in related variables and files

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 6b7b80c..7e37dc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-mlpcap (0.9-14) UNRELEASED; urgency=low
+mlpcap (0.9-14) unstable; urgency=low
 
-  * NOT RELEASED YET
   * Switch packaging to git
-
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 05 Mar 2009 00:42:26 +0100
+  * Add dh-ocaml build-dependency (rules/ocaml.mk)
+  * Set maintainer to Debian OCaml Maintainers
+  * Upgrade debian/compat to 7 (use debian/clean)
+  * Upgrade Standards-Version to 3.8.0 (debian/README.source)
+  * Add Homepage field to debian/control
+  * Update debian/copyright file to use
+    http://wiki.debian.org/Proposals/CopyrightFormat
+  * Add ${misc:Depends} to dependencies
+  * Remove obsolete debian/control.in related variables and files
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sat, 07 Mar 2009 00:04:19 +0100
 
 mlpcap (0.9-13) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..8ad26a0
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+config.log
+config.status
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index ce32e4a..d6aa4cb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,26 @@
 Source: mlpcap
 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), camlidl (>= 1.05-10), libffcall1-dev, ocaml-findlib (>= 1.1.2pl1-4), 
- libpcap0.8-dev
-Standards-Version: 3.7.3
+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 (>= 7), 
+ dpatch, 
+ ocaml-nox (>= 3.10.0-9), 
+ camlidl (>= 1.05-10), 
+ libffcall1-dev, 
+ ocaml-findlib (>= 1.1.2pl1-4), 
+ libpcap0.8-dev,
+ dh-ocaml (>= 0.4.1)
+Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mlpcap.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mlpcap.git
+Homepage: http://www.drugphish.ch/~jonny/mlpcap.html
 
 Package: libmlpcap-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: binding of libpcap for OCaml
  MLpcap implements OCaml stubs to libpcap. It allows to call almost
  all function of libpcap from OCaml.
@@ -19,7 +28,7 @@ Description: binding of libpcap for OCaml
 Package: libmlpcap-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libmlpcap-ocaml (= ${binary:Version}), libffcall1-dev
+Depends: ocaml-nox-${F:OCamlABI}, libmlpcap-ocaml (= ${binary:Version}), libffcall1-dev, ${misc:Depends}
 Description: binding of libpcap for OCaml
  MLpcap implements OCaml stubs to libpcap. It allows to call almost
  all function of libpcap from OCaml.
diff --git a/debian/copyright b/debian/copyright
index 6a0ae61..329c41c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,27 +1,16 @@
-This package was debianized by Sylvain Le Gall <gildor at debian.org> on
-Sat, 21 Feb 2004 20:45:00 +0200.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Jonathan Heusser <jonny at drugphish.ch>
+Packaged-By: Sylvain Le Gall <gildor at debian.org>
+Packaged-Date: Sat, 21 Feb 2004 20:45:00 +0200
+Original-Source-Location: http://www.drugphish.ch/~jonny/mlpcap.html
 
-It was downloaded from http://www.drugphish.ch/~jonny/mlpcap.html
-
-Upstream Author: 
-   Jonathan Heusser <jonny at drugphish.ch>
-
-Copyright:
-   Copyright (C) 2003-2004 Jonathan Heusser <jonny at drugphish.ch>
-
-   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 dated June, 1991.
-
-   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 General Public License for more details.
-
-   You should have received a copy of the GNU 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.
+Files: *
+Copyright: (C) 2003-2004 Jonathan Heusser 
+License: LGPL-2.1+
 
 On Debian GNU/Linux systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: debian/*
+Copyright: Copyright (C) 2006-2009 Sylvain Le Gall
+License: GPL-2+
diff --git a/debian/rules b/debian/rules
index 362e6f0..2c0a7c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # debian/rules for mlpcap 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 := libmlpcap-ocaml
 DESTDIR := $(CURDIR)/debian/$(PACKAGE)
@@ -39,18 +36,14 @@ endif
 DEB_MAKE_INSTALL_TARGET  := install \
   DESTDIR="-ldconf ignore -destdir $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/"
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-9),$(CDBS_BUILD_DEPENDS))
-
 CFLAGS += -fPIC
 
 OCAML_OCAMLDOC_PACKAGES_DOCBASE := libmlpcap-ocaml-dev
 
 install/libmlpcap-ocaml-dev::
 	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/pcap/*.so \
-	 $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/
+	 '$(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/'
 
 clean::
-	-$(RM) Makefile
-	-$(RM) tests/Makefile
-	-$(RM) config.log
-	-$(RM) config.status
+	-$(RM) '$(CURDIR)/Makefile'
+	-$(RM) '$(CURDIR)/tests/Makefile'

-- 
mlpcap packaging

