[Pkg-ocaml-maint-commits] [SCM] ocaml-magic packaging branch, master, updated. debian/0.7.3-4-1-gbf42e30
Romain Beauxis
toots at rastageeks.org
Mon Oct 12 23:05:49 UTC 2009
The following commit has been merged in the master branch:
commit bf42e305989602b8c48916d680c3645f36bb84fc
Author: Romain Beauxis <toots at rastageeks.org>
Date: Mon Oct 12 18:08:39 2009 -0500
Updated package
diff --git a/debian/changelog b/debian/changelog
index 9294f1e..99c22a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ocaml-magic (0.7.3-5) unstable; urgency=low
+
+ * Bumped standards version to 3.8.3
+ * Switch to new automatic dependency system.
+ * Changed section to ocaml.
+ * Versioned licenses in debian/copyright
+ * Fixed Vcs-* fields.
+ * Added patch to build with NO_CUSTOM
+ * Added doc-base registration.
+ * Clean generated files in debian/rules clean
+
+ -- Romain Beauxis <toots at rastageeks.org> Mon, 12 Oct 2009 17:51:23 -0500
+
ocaml-magic (0.7.3-4) unstable; urgency=low
* Rebuild with OCaml 3.11.
diff --git a/debian/control b/debian/control
index 288858c..df697df 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,19 @@
Source: ocaml-magic
-Section: devel
+Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), ocaml-nox (>= 3.11), debhelper (>= 7), libmagic-dev, ocaml-findlib (>= 1.2.4), dh-ocaml
-Standards-Version: 3.8.0
+Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.1), ocaml-nox, dh-ocaml (>= 0.9), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27),
+ libmagic-dev, ocaml-findlib (>= 1.2.4)
+Standards-Version: 3.8.3
Homepage: http://sourceforge.net/projects/ocaml-magic/
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-magic.git
+Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-magic.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-magic.git
Package: libmagic-ocaml
Architecture: any
-Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
Description: OCaml bindings for the File type determination library
Libmagic is a library for classifying files according to magic number tests.
This package provides OCaml interface to the C library.
@@ -21,8 +22,8 @@ Description: OCaml bindings for the File type determination library
Package: libmagic-ocaml-dev
Architecture: any
-Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libmagic-dev, libmagic-ocaml (= ${binary:Version}), ${misc:Depends}
+Depends: ${ocaml:Depends}, libmagic-dev, libmagic-ocaml (= ${binary:Version}), ${misc:Depends}
+Provides: ${ocaml:Provides}
Description: OCaml bindings for the File type determination library
Libmagic is a library for classifying files according to magic number tests.
This package provides OCaml interface to the C library.
diff --git a/debian/control.in b/debian/control.in
index f38fd55..13d292a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,18 +1,19 @@
Source: ocaml-magic
-Section: devel
+Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: @cdbs@, debhelper (>= 7), libmagic-dev, ocaml-findlib (>= 1.2.4), dh-ocaml
-Standards-Version: 3.8.0
+Build-Depends: @cdbs@,
+ libmagic-dev, ocaml-findlib (>= 1.2.4)
+Standards-Version: 3.8.3
Homepage: http://sourceforge.net/projects/ocaml-magic/
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-magic.git
+Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-magic.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-magic.git
Package: libmagic-ocaml
Architecture: any
-Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
Description: OCaml bindings for the File type determination library
Libmagic is a library for classifying files according to magic number tests.
This package provides OCaml interface to the C library.
@@ -21,8 +22,8 @@ Description: OCaml bindings for the File type determination library
Package: libmagic-ocaml-dev
Architecture: any
-Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libmagic-dev, libmagic-ocaml (= ${binary:Version}), ${misc:Depends}
+Depends: ${ocaml:Depends}, libmagic-dev, libmagic-ocaml (= ${binary:Version}), ${misc:Depends}
+Provides: ${ocaml:Provides}
Description: OCaml bindings for the File type determination library
Libmagic is a library for classifying files according to magic number tests.
This package provides OCaml interface to the C library.
diff --git a/debian/copyright b/debian/copyright
index b0fe620..46e3ee2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ It was downloaded from <http://sourceforge.net/projects/ocaml-magic/>
Upstream Author: Christophe Troestler <christophe.troestler at umh.ac.be>
-Copyright: Copyright (C) 2005 Christophe Troestler
+Copyright: Copyright © 2005 Christophe Troestler
License:
@@ -31,7 +31,7 @@ the executable file might be covered by the GNU Library General Public License.
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian 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'.
-The Debian packaging is (C) 2007, Romain Beauxis <toots at rastageeks.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is © 2007, Romain Beauxis <toots at rastageeks.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/libmagic-ocaml-dev.doc-base b/debian/libmagic-ocaml-dev.doc-base
new file mode 100644
index 0000000..9e43b32
--- /dev/null
+++ b/debian/libmagic-ocaml-dev.doc-base
@@ -0,0 +1,9 @@
+Document: libmagic-ocaml-dev
+Title: OCaml Magic module documentation
+Author: Christophe Troestler
+Abstract: Documentation of the OCaml Magic module
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libmagic-ocaml-dev/html/index.html
+Files: /usr/share/doc/libmagic-ocaml-dev/html/*
diff --git a/debian/patches/add_no_custom.patch b/debian/patches/add_no_custom.patch
new file mode 100644
index 0000000..716390e
--- /dev/null
+++ b/debian/patches/add_no_custom.patch
@@ -0,0 +1,12 @@
+Index: ocaml-magic/src/Makefile.in
+===================================================================
+--- ocaml-magic.orig/src/Makefile.in 2009-10-12 17:55:21.000000000 -0500
++++ ocaml-magic/src/Makefile.in 2009-10-12 17:55:27.000000000 -0500
+@@ -11,6 +11,7 @@
+ LIBS = @all_requires@
+ CLIBS = @CLIBS@
+ CFLAGS = @CFLAGS@
++NO_CUSTOM = yes
+ #CFLAGS += -DWANT_DEBUG
+
+ .PHONY: all byte opt install uninstall update
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..849ead6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+add_no_custom.patch
diff --git a/debian/rules b/debian/rules
index ee08876..366137c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/ocaml.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# In order to regenerate 'debian/control' :
# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
@@ -14,3 +15,6 @@ DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF
build/libmagic-ocaml-dev::
mkdir -p $(DESTDIR)
make doc
+
+clean::
+ rm -rf Makefile examples/Makefile src/META src/Makefile
--
ocaml-magic packaging
More information about the Pkg-ocaml-maint-commits
mailing list