[Pkg-ocaml-maint-commits] r2133 - trunk/packages/ocaml-shout/trunk/debian

[Samuel Mimram]

Author: smimram-guest
Date: 2005-11-26 11:23:53 +0000 (Sat, 26 Nov 2005)
New Revision: 2133

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

Modified: trunk/packages/ocaml-shout/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-shout/trunk/debian/changelog	2005-11-26 11:03:27 UTC (rev 2132)
+++ trunk/packages/ocaml-shout/trunk/debian/changelog	2005-11-26 11:23:53 UTC (rev 2133)
@@ -1,3 +1,12 @@
+ocaml-shout (0.2.0-2) unstable; urgency=low
+
+  * Rebuild with OCaml 3.09.0.
+  * No longer hardcoding OCaml's ABI in package.
+  * Updated standards version to 3.6.2, no changes needed.
+  * Updated watch file.
+
+ -- Samuel Mimram <smimram at debian.org>  Sat, 26 Nov 2005 12:04:04 +0100
+
 ocaml-shout (0.2.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/ocaml-shout/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-shout/trunk/debian/control	2005-11-26 11:03:27 UTC (rev 2132)
+++ trunk/packages/ocaml-shout/trunk/debian/control	2005-11-26 11:23:53 UTC (rev 2133)
@@ -2,18 +2,18 @@
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libshout3-dev, ocaml-nox-3.08.3, ocaml-findlib
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>> 4.0.0), libshout3-dev, ocaml-nox (>= 3.09.0), ocaml-findlib
+Standards-Version: 3.6.2
 
 Package: libshout-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 shout library
- This OCaml library interfaces the shout C library which can be used for  
- communicating with and sending data to Icecast and Icecast 2 streaming 
- audio servers (they currently support Ogg Vorbis and MP3 audio streams). 
- It handles the socket connection, the timing of the data transmission, 
+ This OCaml library interfaces the shout C library which can be used for
+ communicating with and sending data to Icecast and Icecast 2 streaming
+ audio servers (they currently support Ogg Vorbis and MP3 audio streams).
+ It handles the socket connection, the timing of the data transmission,
  and prevents bad data from getting to the server.
  .
  This package contains only the shared runtime stub libraries.
@@ -21,12 +21,12 @@
 Package: libshout-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-3.08.3, libshout3-dev, libshout-ocaml (= ${Source-Version})
+Depends: ocaml-nox-${F:OCamlABI}, libshout3-dev, libshout-ocaml (= ${Source-Version})
 Description: OCaml bindings for the shout library
- This OCaml library interfaces the shout C library which can be used for  
- communicating with and sending data to Icecast and Icecast 2 streaming 
- audio servers (they currently support Ogg Vorbis and MP3 audio streams). 
- It handles the socket connection, the timing of the data transmission, 
+ This OCaml library interfaces the shout C library which can be used for
+ communicating with and sending data to Icecast and Icecast 2 streaming
+ audio servers (they currently support Ogg Vorbis and MP3 audio streams).
+ It handles the socket connection, the timing of the data transmission,
  and prevents bad data from getting to the server.
  .
  This package contains all the development stuff you need to use ocaml-shout

Deleted: trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml-dev.install
===================================================================
--- trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml-dev.install	2005-11-26 11:03:27 UTC (rev 2132)
+++ trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml-dev.install	2005-11-26 11:23:53 UTC (rev 2133)
@@ -1,4 +0,0 @@
-usr/lib/ocaml/3.08.3/shout/META
-usr/lib/ocaml/3.08.3/shout/*.a
-usr/lib/ocaml/3.08.3/shout/*.cm*
-usr/lib/ocaml/3.08.3/shout/*.ml*

Copied: trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml-dev.install.in (from rev 2131, trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml-dev.install)
===================================================================
--- trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml-dev.install	2005-11-26 11:00:36 UTC (rev 2131)
+++ trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml-dev.install.in	2005-11-26 11:23:53 UTC (rev 2133)
@@ -0,0 +1,4 @@
+usr/lib/ocaml/@OCamlABI@/shout/META
+usr/lib/ocaml/@OCamlABI@/shout/*.a
+usr/lib/ocaml/@OCamlABI@/shout/*.cm*
+usr/lib/ocaml/@OCamlABI@/shout/*.ml*

Deleted: trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml.install
===================================================================
--- trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml.install	2005-11-26 11:03:27 UTC (rev 2132)
+++ trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml.install	2005-11-26 11:23:53 UTC (rev 2133)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/shout/dllshout_stubs.so	usr/lib/ocaml/3.08.3/stublibs/

Copied: trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml.install.in (from rev 2131, trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml.install)
===================================================================
--- trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml.install	2005-11-26 11:00:36 UTC (rev 2131)
+++ trunk/packages/ocaml-shout/trunk/debian/libshout-ocaml.install.in	2005-11-26 11:23:53 UTC (rev 2133)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/shout/dllshout_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/ocaml-shout/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-shout/trunk/debian/rules	2005-11-26 11:03:27 UTC (rev 2132)
+++ trunk/packages/ocaml-shout/trunk/debian/rules	2005-11-26 11:23:53 UTC (rev 2133)
@@ -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
 
@@ -55,9 +62,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-shout/trunk/debian/watch
===================================================================
--- trunk/packages/ocaml-shout/trunk/debian/watch	2005-11-26 11:03:27 UTC (rev 2132)
+++ trunk/packages/ocaml-shout/trunk/debian/watch	2005-11-26 11:23:53 UTC (rev 2133)
@@ -1,2 +1,3 @@
-version=2
-ftp://ftp2.sf.net/pub/sourceforge/s/sa/savonet/ocaml-shout-([0-9\.]*)\.tar\.gz debian uupdate
+version=3
+
+http://sf.net/savonet/ocaml-shout-([0-9\.]*)\.tar\.gz debian uupdate