[Pkg-ocaml-maint-commits] r2130 - trunk/packages/ocaml-mad/trunk/debian

[Samuel Mimram]

Author: smimram-guest
Date: 2005-11-26 10:59:43 +0000 (Sat, 26 Nov 2005)
New Revision: 2130

Added:
   trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install.in
   trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install.in
Removed:
   trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install
   trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install
Modified:
   trunk/packages/ocaml-mad/trunk/debian/changelog
   trunk/packages/ocaml-mad/trunk/debian/control
   trunk/packages/ocaml-mad/trunk/debian/rules
   trunk/packages/ocaml-mad/trunk/debian/watch
Log:
Updated to OCaml 3.09.0.

Modified: trunk/packages/ocaml-mad/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-mad/trunk/debian/changelog	2005-11-26 10:09:02 UTC (rev 2129)
+++ trunk/packages/ocaml-mad/trunk/debian/changelog	2005-11-26 10:59:43 UTC (rev 2130)
@@ -1,3 +1,12 @@
+ocaml-mad (0.1.3-2) unstable; urgency=low
+
+  * Rebuild with OCaml 3.09.0.
+  * No longer hardcoding OCaml's ABI in the package.
+  * Updated standards version to 3.6.2, no changes needed.
+  * Updated watch file.
+
+ -- Samuel Mimram <smimram at debian.org>  Sat, 26 Nov 2005 11:51:16 +0100
+
 ocaml-mad (0.1.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/ocaml-mad/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-mad/trunk/debian/control	2005-11-26 10:09:02 UTC (rev 2129)
+++ trunk/packages/ocaml-mad/trunk/debian/control	2005-11-26 10:59:43 UTC (rev 2130)
@@ -2,17 +2,17 @@
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libmad0-dev, ocaml-nox-3.08.3, ocaml-findlib
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>> 4.0.0), libmad0-dev, ocaml-nox (>= 3.09.0), ocaml-findlib
+Standards-Version: 3.6.2
 
 Package: libmad-ocaml
 Section: libs
 Architecture: any
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs: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 
+ 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:
@@ -25,11 +25,11 @@
 Package: libmad-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-3.08.3, libmad0-dev, libmad-ocaml (= ${Source-Version})
+Depends: ocaml-nox-${F:OCamlABI}, libmad0-dev, libmad-ocaml (= ${Source-Version})
 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 
+ 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:

Deleted: trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install
===================================================================
--- trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install	2005-11-26 10:09:02 UTC (rev 2129)
+++ trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install	2005-11-26 10:59:43 UTC (rev 2130)
@@ -1,4 +0,0 @@
-usr/lib/ocaml/3.08.3/mad/META
-usr/lib/ocaml/3.08.3/mad/*.a
-usr/lib/ocaml/3.08.3/mad/*.cm*
-usr/lib/ocaml/3.08.3/mad/*.ml*

Copied: trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install.in (from rev 1430, trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install)
===================================================================
--- trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install	2005-07-04 10:15:09 UTC (rev 1430)
+++ trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml-dev.install.in	2005-11-26 10:59:43 UTC (rev 2130)
@@ -0,0 +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*

Deleted: trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install
===================================================================
--- trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install	2005-11-26 10:09:02 UTC (rev 2129)
+++ trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install	2005-11-26 10:59:43 UTC (rev 2130)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/mad/dllmad_stubs.so	usr/lib/ocaml/3.08.3/stublibs/

Copied: trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install.in (from rev 1430, trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install)
===================================================================
--- trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install	2005-07-04 10:15:09 UTC (rev 1430)
+++ trunk/packages/ocaml-mad/trunk/debian/libmad-ocaml.install.in	2005-11-26 10:59:43 UTC (rev 2130)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/mad/dllmad_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/ocaml-mad/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-mad/trunk/debian/rules	2005-11-26 10:09:02 UTC (rev 2129)
+++ trunk/packages/ocaml-mad/trunk/debian/rules	2005-11-26 10:59:43 UTC (rev 2130)
@@ -5,14 +5,21 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+
 DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
+
 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: build-stamp
+build: ocamlinit build-stamp
 build-stamp: config.status
 	dh_testdir
 
@@ -54,9 +61,9 @@
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install ocamlinit

Modified: trunk/packages/ocaml-mad/trunk/debian/watch
===================================================================
--- trunk/packages/ocaml-mad/trunk/debian/watch	2005-11-26 10:09:02 UTC (rev 2129)
+++ trunk/packages/ocaml-mad/trunk/debian/watch	2005-11-26 10:59:43 UTC (rev 2130)
@@ -1,2 +1,3 @@
-version=2
-ftp://ftp2.sf.net/pub/sourceforge/s/sa/savonet/ocaml-mad-([0-9\.]*)\.tar\.gz debian uupdate
+version=3
+
+http://sf.net/savonet/ocaml-mad-([0-9\.]*)\.tar\.gz debian uupdate