[Pkg-ocaml-maint-commits] r2432 - trunk/packages/ocaml-vorbis/trunk/debian

[Samuel Mimram]

Author: smimram
Date: 2006-01-08 17:15:21 +0000 (Sun, 08 Jan 2006)
New Revision: 2432

Removed:
   trunk/packages/ocaml-vorbis/trunk/debian/control.in
   trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install
   trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install
Modified:
   trunk/packages/ocaml-vorbis/trunk/debian/changelog
   trunk/packages/ocaml-vorbis/trunk/debian/control
   trunk/packages/ocaml-vorbis/trunk/debian/rules
Log:
Rebuild with OCaml 3.09.1.

Modified: trunk/packages/ocaml-vorbis/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/changelog	2006-01-08 17:11:31 UTC (rev 2431)
+++ trunk/packages/ocaml-vorbis/trunk/debian/changelog	2006-01-08 17:15:21 UTC (rev 2432)
@@ -1,3 +1,10 @@
+ocaml-vorbis (0.2.1-2) unstable; urgency=low
+
+  * Rebuild with OCaml 3.09.1.
+  * Correctly handling OCaml's ABI stuff in package.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun,  8 Jan 2006 18:14:07 +0100
+
 ocaml-vorbis (0.2.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/ocaml-vorbis/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/control	2006-01-08 17:11:31 UTC (rev 2431)
+++ trunk/packages/ocaml-vorbis/trunk/debian/control	2006-01-08 17:15:21 UTC (rev 2432)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libvorbis-dev, ocaml-nox (>= 3.09.0), ocaml-findlib
+Build-Depends: debhelper (>> 4.0.0), libvorbis-dev, ocaml-nox (>= 3.09.1), ocaml-findlib
 Standards-Version: 3.6.2
 
 Package: libvorbis-ocaml

Deleted: trunk/packages/ocaml-vorbis/trunk/debian/control.in
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/control.in	2006-01-08 17:11:31 UTC (rev 2431)
+++ trunk/packages/ocaml-vorbis/trunk/debian/control.in	2006-01-08 17:15:21 UTC (rev 2432)
@@ -1,37 +0,0 @@
-Source: ocaml-vorbis
-Section: devel
-Priority: optional
-Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libvorbis-dev, ocaml-nox (>= @OCamlABI@), ocaml-findlib
-Standards-Version: 3.6.2
-
-Package: libvorbis-ocaml
-Section: libs
-Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
-Description: OCaml bindings for vorbis library
- This OCaml library interfaces the vorbis C library. It can be used to
- decode from or encode to the Ogg Vorbis compressed audio format as well
- as to get informations about an Ogg Vorbis file.
- .
- Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
- general-purpose compressed audio format for audio and music at fixed
- and variable bitrates from 16 to 128 kbps/channel.
- .
- This package contains only the shared runtime stub libraries.
-
-Package: libvorbis-ocaml-dev
-Section: libdevel
-Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libvorbis-dev, libvorbis-ocaml (= ${Source-Version})
-Description: OCaml bindings for the vorbis library
- This OCaml library interfaces the vorbis C library. It can be used to
- decode from or encode to the Ogg Vorbis compressed audio format as well
- as to get informations about an Ogg Vorbis file.
- .
- Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
- general-purpose compressed audio format for audio and music at fixed
- and variable bitrates from 16 to 128 kbps/channel.
- .
- This package contains all the development stuff you need to use ocaml-vorbis
- in your programs.

Deleted: trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install	2006-01-08 17:11:31 UTC (rev 2431)
+++ trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install	2006-01-08 17:15:21 UTC (rev 2432)
@@ -1,4 +0,0 @@
-usr/lib/ocaml/3.09.0/vorbis/META
-usr/lib/ocaml/3.09.0/vorbis/*.a
-usr/lib/ocaml/3.09.0/vorbis/*.cm*
-usr/lib/ocaml/3.09.0/vorbis/*.ml*

Deleted: trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install	2006-01-08 17:11:31 UTC (rev 2431)
+++ trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install	2006-01-08 17:15:21 UTC (rev 2432)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.09.0/vorbis/dllvorbis_stubs.so	usr/lib/ocaml/3.09.0/stublibs/

Modified: trunk/packages/ocaml-vorbis/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/rules	2006-01-08 17:11:31 UTC (rev 2431)
+++ trunk/packages/ocaml-vorbis/trunk/debian/rules	2006-01-08 17:15:21 UTC (rev 2432)
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
 
 DESTDIR = $(CURDIR)/debian/tmp/$(shell ocamlc -where)
 CFLAGS = -Wall -g -fPIC
@@ -27,7 +27,7 @@
 	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
 
@@ -74,4 +74,4 @@
 	dh_builddeb
 
 binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install ocamlinit