[Pkg-ocaml-maint-commits] [SCM] ocaml-mad packaging branch, master, updated. debian/0.3.5-3-13-g6e237c8

Mon Oct 12 09:43:36 UTC 2009

The following commit has been merged in the master branch:
commit 6e237c876df375db76416df88089a726f627310c
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Oct 12 04:45:33 2009 -0500

    Prepared new upstream release

diff --git a/debian/changelog b/debian/changelog
index 15a3080..7275ea8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-mad (0.3.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Dropped patch applied upstream 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 12 Oct 2009 04:27:22 -0500
+
 ocaml-mad (0.3.5-3) unstable; urgency=low
 
   * Add a patch to not link system libraries into cma (Closes: #549761)
diff --git a/debian/control b/debian/control
index e164ce2..1822f80 100644
--- a/debian/control
+++ b/debian/control
@@ -6,27 +6,18 @@ Uploaders:
  Romain Beauxis <toots at rastageeks.org>,
  Mehdi Dogguy <mehdi at debian.org>,
  Samuel Mimram <smimram at debian.org>
-Build-Depends:
- cdbs (>= 0.4.23-1.1),
- ocaml-nox (>= 3.11),
- debhelper (>= 7),
+Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.1), ocaml-nox, dh-ocaml (>= 0.9),
  libmad0-dev,
- ocaml-findlib (>= 1.2.5),
- pkg-config,
- dh-ocaml,
- quilt
+ ocaml-findlib,
+ pkg-config
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-mad.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-mad.git
 
 Package: libmad-ocaml
 Architecture: any
-Depends:
- ${ocaml:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Provides:
- ${ocaml:Provides}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for the MAD library (Runtime library)
  This OCaml library interfaces the MAD C library to decode MPEG files.
  The MAD library currently only supports the MPEG 1 standard, but fully
@@ -42,13 +33,8 @@ Description: OCaml bindings for the MAD library (Runtime library)
 
 Package: libmad-ocaml-dev
 Architecture: any
-Depends:
- ${ocaml:Depends},
- libmad0-dev,
- libmad-ocaml (= ${binary:Version}),
- ${misc:Depends}
-Provides:
- ${ocaml:Depends}
+Depends: ${ocaml:Depends}, libmad0-dev, libmad-ocaml (= ${binary:Version}), ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for the MAD library (Development package)
  This OCaml library interfaces the MAD C library to decode MPEG files.
  The MAD library currently only supports the MPEG 1 standard, but fully
diff --git a/debian/control.in b/debian/control.in
index ad909e9..c840294 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,18 +1,24 @@
 Source: ocaml-mad
-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), libmad0-dev, ocaml-findlib (>= 1.2.4), pkg-config, dh-ocaml
-Standards-Version: 3.8.0
+Uploaders:
+ Romain Beauxis <toots at rastageeks.org>,
+ Mehdi Dogguy <mehdi at debian.org>,
+ Samuel Mimram <smimram at debian.org>
+Build-Depends: @cdbs@,
+ libmad0-dev,
+ ocaml-findlib,
+ pkg-config
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-mad.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-mad.git
 
 Package: libmad-ocaml
-Section: libs
 Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
-Description: OCaml bindings for the MAD library
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: OCaml bindings for the MAD library (Runtime library)
  This OCaml library interfaces the MAD C library to decode MPEG files.
  The MAD library currently only supports the MPEG 1 standard, but fully
  implements all three audio layers (Layer I, Layer II, and Layer III, the
@@ -26,10 +32,10 @@ Description: OCaml bindings for the MAD library
  This package contains only the shared runtime stub libraries.
 
 Package: libmad-ocaml-dev
-Section: libdevel
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libmad0-dev, libmad-ocaml (= ${binary:Version}), ${misc:Depends}
-Description: OCaml bindings for the MAD library
+Depends: ${ocaml:Depends}, libmad0-dev, libmad-ocaml (= ${binary:Version}), ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: OCaml bindings for the MAD library (Development package)
  This OCaml library interfaces the MAD C library to decode MPEG files.
  The MAD library currently only supports the MPEG 1 standard, but fully
  implements all three audio layers (Layer I, Layer II, and Layer III, the
diff --git a/debian/patches/0001-Do-not-link-system-libraries-into-cma.patch b/debian/patches/0001-Do-not-link-system-libraries-into-cma.patch
deleted file mode 100644
index 7937501..0000000
--- a/debian/patches/0001-Do-not-link-system-libraries-into-cma.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Tue, 6 Oct 2009 00:06:30 +0200
-Subject: [PATCH] Do not link system libraries into cma
-
----
- src/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 12cf401..4e8034e 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -28,7 +28,7 @@ RES_CLIB_SUF = _stubs
- RESULT = mad
- LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.cmx *.a *.so)
- OCAMLLDFLAGS =
--LIBS = unix
-+LIBS =
- ACLIBS = @LIBS@ @MAD_LIBS@
- LDFLAGS = @LDFLAGS@ @MAD_LDFLAGS@
- CLIBS = $(ACLIBS:-l%=%)
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a5928c3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Do-not-link-system-libraries-into-cma.patch
diff --git a/debian/rules b/debian/rules
index b0b24cd..ece29f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/ocaml.mk

-- 
ocaml-mad packaging

