[Pkg-ocaml-maint-commits] r6082 - in /trunk/packages/ocaml-mad/trunk/debian: changelog control control.in libmad-ocaml-dev.install.in libmad-ocaml.install.in rules
toots at users.alioth.debian.org
toots at users.alioth.debian.org
Sat Dec 13 22:42:29 UTC 2008
Author: toots
Date: Sat Dec 13 22:42:28 2008
New Revision: 6082
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6082
Log:
Prepared next upload..
Added:
trunk/packages/ocaml-mad/trunk/debian/control
trunk/packages/ocaml-mad/trunk/debian/control.in (contents, props changed)
- copied, changed from r6057, trunk/packages/ocaml-mad/trunk/debian/control
Modified:
trunk/packages/ocaml-mad/trunk/debian/changelog
trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install.in
trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install.in
trunk/packages/ocaml-mad/trunk/debian/rules
Modified: trunk/packages/ocaml-mad/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk/debian/changelog?rev=6082&op=diff
==============================================================================
--- trunk/packages/ocaml-mad/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-mad/trunk/debian/changelog Sat Dec 13 22:42:28 2008
@@ -1,3 +1,13 @@
+ocaml-mad (0.3.4-3) experimental; urgency=low
+
+ * New upload to experimental to build against ocaml 3.11.
+ * Versioned ocaml-related build-dep to avoid confusion.
+ * Switched to cdbs
+ * Added dh-ocaml to build-deps.
+ * Updated standards to 3.8.0.
+
+ -- Romain Beauxis <toots at rastageeks.org> Sat, 13 Dec 2008 23:37:47 +0100
+
ocaml-mad (0.3.4-2) unstable; urgency=low
* Upload to unstable now that the transition is over.
Added: trunk/packages/ocaml-mad/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk/debian/control?rev=6082&op=file
==============================================================================
--- trunk/packages/ocaml-mad/trunk/debian/control (added)
+++ trunk/packages/ocaml-mad/trunk/debian/control Sat Dec 13 22:42:28 2008
@@ -1,0 +1,44 @@
+Source: ocaml-mad
+Section: devel
+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), debhelper (>= 4.2.0), ocaml-nox (>= 3.11.0-1), libmad0-dev, ocaml-findlib (>= 1.2.3), pkg-config, dh-ocaml
+Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk/
+
+Package: libmad-ocaml
+Section: libs
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml bindings for the MAD 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
+ latter often colloquially known as MP3.)
+ .
+ MAD has the following special features:
+ - 100% fixed-point (integer) computation
+ - completely new implementation based on the ISO/IEC 11172-3 standard
+ - distributed under the terms of the GNU General Public License (GPL)
+ .
+ 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
+ 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
+ latter often colloquially known as MP3.)
+ .
+ MAD has the following special features:
+ - 100% fixed-point (integer) computation
+ - completely new implementation based on the ISO/IEC 11172-3 standard
+ - distributed under the terms of the GNU General Public License (GPL)
+ .
+ This package contains all the development stuff you need to use ocaml-mad
+ in your programs.
Copied: trunk/packages/ocaml-mad/trunk/debian/control.in (from r6057, trunk/packages/ocaml-mad/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk/debian/control.in?rev=6082&op=diff
==============================================================================
--- trunk/packages/ocaml-mad/trunk/debian/control (original)
+++ trunk/packages/ocaml-mad/trunk/debian/control.in Sat Dec 13 22:42:28 2008
@@ -3,15 +3,15 @@
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: debhelper (>> 4.0.0), dpkg-dev (>= 1.13.19), libmad0-dev, ocaml-nox (>= 3.10), ocaml-findlib, pkg-config
-Standards-Version: 3.7.3
+Build-Depends: @cdbs@, libmad0-dev, ocaml-findlib, pkg-config, dh-ocaml
+Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk/
Package: libmad-ocaml
Section: libs
Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
Description: OCaml bindings for the MAD 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
@@ -28,7 +28,7 @@
Package: libmad-ocaml-dev
Section: libdevel
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libmad0-dev, libmad-ocaml (= ${binary:Version})
+Depends: ocaml-nox-${F:OCamlABI}, libmad0-dev, libmad-ocaml (= ${binary:Version}), ${misc:Depends}
Description: OCaml bindings for the MAD 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
Propchange: trunk/packages/ocaml-mad/trunk/debian/control.in
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install.in?rev=6082&op=diff
==============================================================================
--- trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install.in (original)
+++ trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install.in Sat Dec 13 22:42:28 2008
@@ -1,4 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/mad/META
-usr/lib/ocaml/@OCamlABI@/mad/*.a
-usr/lib/ocaml/@OCamlABI@/mad/*.cm*
-usr/lib/ocaml/@OCamlABI@/mad/*.ml*
+debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/META
+debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/*.a
+debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/*.cm*
+debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/*.ml*
Modified: trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install.in?rev=6082&op=diff
==============================================================================
--- trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install.in (original)
+++ trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install.in Sat Dec 13 22:42:28 2008
@@ -1,1 +1,1 @@
-usr/lib/ocaml/@OCamlABI@/mad/dllmad_stubs.so usr/lib/ocaml/@OCamlABI@/stublibs/
+debian/tmp/usr/lib/ocaml/@OCamlABI@/mad/dllmad_stubs.so usr/lib/ocaml/@OCamlABI@/stublibs/
Modified: trunk/packages/ocaml-mad/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-mad/trunk/debian/rules?rev=6082&op=diff
==============================================================================
--- trunk/packages/ocaml-mad/trunk/debian/rules (original)
+++ trunk/packages/ocaml-mad/trunk/debian/rules Sat Dec 13 22:42:28 2008
@@ -1,71 +1,16 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/ocaml.mk
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+# In order to regenerate 'debian/control' :
+# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+# Then check manually if everything's ok
DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
+DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-CFLAGS = -O2 -g -fPIC
-
-ocamlinit:
- for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
-config.status: configure
- dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-build: ocamlinit build-stamp
-build-stamp: config.status
- dh_testdir
-
- $(MAKE) CFLAGS="$(CFLAGS)"
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.log config.status
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
+build/libmad-ocaml-dev::
mkdir -p $(DESTDIR)
- $(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
- $(MAKE) doc
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGES
- dh_installdocs
- dh_installexamples
- dh_install --sourcedir=debian/tmp --list-missing
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
- dh_md5sums
- dh_builddeb
-
-binary-indep:
-
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install ocamlinit
+ make doc
More information about the Pkg-ocaml-maint-commits
mailing list