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

Samuel Mimram smimram-guest at costa.debian.org
Tue Nov 15 21:39:55 UTC 2005


Author: smimram-guest
Date: 2005-11-15 21:39:55 +0000 (Tue, 15 Nov 2005)
New Revision: 2053

Added:
   trunk/packages/ocaml-vorbis/trunk/debian/control.in
   trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install.in
   trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install.in
Modified:
   trunk/packages/ocaml-vorbis/trunk/debian/changelog
   trunk/packages/ocaml-vorbis/trunk/debian/control
   trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install
   trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install
   trunk/packages/ocaml-vorbis/trunk/debian/rules
   trunk/packages/ocaml-vorbis/trunk/debian/watch
Log:
New upstream release.

Modified: trunk/packages/ocaml-vorbis/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/changelog	2005-11-15 21:09:42 UTC (rev 2052)
+++ trunk/packages/ocaml-vorbis/trunk/debian/changelog	2005-11-15 21:39:55 UTC (rev 2053)
@@ -1,3 +1,12 @@
+ocaml-vorbis (0.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated to OCaml 3.09.0.
+  * No longer hardcoding OCaml's ABI in debian/* files.
+  * Updated watch file.
+
+ -- Samuel Mimram <smimram at debian.org>  Tue, 15 Nov 2005 22:09:58 +0100
+
 ocaml-vorbis (0.2.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/ocaml-vorbis/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/control	2005-11-15 21:09:42 UTC (rev 2052)
+++ trunk/packages/ocaml-vorbis/trunk/debian/control	2005-11-15 21:39:55 UTC (rev 2053)
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libvorbis-dev, ocaml-nox-3.08.3, ocaml-findlib
+Build-Depends: debhelper (>> 4.0.0), libvorbis-dev, ocaml-nox (>= 3.09.0), ocaml-findlib
 Standards-Version: 3.6.2
 
 Package: libvorbis-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 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
@@ -23,7 +23,7 @@
 Package: libvorbis-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-3.08.3, libvorbis-dev, libvorbis-ocaml (= ${Source-Version})
+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

Copied: trunk/packages/ocaml-vorbis/trunk/debian/control.in (from rev 2052, trunk/packages/ocaml-vorbis/trunk/debian/control)
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/control	2005-11-15 21:09:42 UTC (rev 2052)
+++ trunk/packages/ocaml-vorbis/trunk/debian/control.in	2005-11-15 21:39:55 UTC (rev 2053)
@@ -0,0 +1,37 @@
+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.

Modified: trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install	2005-11-15 21:09:42 UTC (rev 2052)
+++ trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install	2005-11-15 21:39:55 UTC (rev 2053)
@@ -1,4 +1,4 @@
-usr/lib/ocaml/3.08.3/vorbis/META
-usr/lib/ocaml/3.08.3/vorbis/*.a
-usr/lib/ocaml/3.08.3/vorbis/*.cm*
-usr/lib/ocaml/3.08.3/vorbis/*.ml*
+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*

Copied: trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install.in (from rev 2051, trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install)
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install	2005-11-15 20:51:52 UTC (rev 2051)
+++ trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml-dev.install.in	2005-11-15 21:39:55 UTC (rev 2053)
@@ -0,0 +1,4 @@
+usr/lib/ocaml/@OCamlABI@/vorbis/META
+usr/lib/ocaml/@OCamlABI@/vorbis/*.a
+usr/lib/ocaml/@OCamlABI@/vorbis/*.cm*
+usr/lib/ocaml/@OCamlABI@/vorbis/*.ml*

Modified: trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install	2005-11-15 21:09:42 UTC (rev 2052)
+++ trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install	2005-11-15 21:39:55 UTC (rev 2053)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3/vorbis/dllvorbis_stubs.so	usr/lib/ocaml/3.08.3/stublibs/
+usr/lib/ocaml/3.09.0/vorbis/dllvorbis_stubs.so	usr/lib/ocaml/3.09.0/stublibs/

Copied: trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install.in (from rev 2051, trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install)
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install	2005-11-15 20:51:52 UTC (rev 2051)
+++ trunk/packages/ocaml-vorbis/trunk/debian/libvorbis-ocaml.install.in	2005-11-15 21:39:55 UTC (rev 2053)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/vorbis/dllvorbis_stubs.so	usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/ocaml-vorbis/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/rules	2005-11-15 21:09:42 UTC (rev 2052)
+++ trunk/packages/ocaml-vorbis/trunk/debian/rules	2005-11-15 21:39:55 UTC (rev 2053)
@@ -5,6 +5,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+
 DESTDIR = $(CURDIR)/debian/tmp/$(shell ocamlc -where)
 CFLAGS = -Wall -g -fPIC
 
@@ -17,6 +20,9 @@
         INSTALL_PROGRAM += -s
 endif
 
+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
@@ -63,7 +69,7 @@
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb
 

Modified: trunk/packages/ocaml-vorbis/trunk/debian/watch
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/watch	2005-11-15 21:09:42 UTC (rev 2052)
+++ trunk/packages/ocaml-vorbis/trunk/debian/watch	2005-11-15 21:39:55 UTC (rev 2053)
@@ -1,3 +1,3 @@
-version=2
+version=3
 
-http://heanet.dl.sourceforge.net/sourceforge/savonet/ocaml-vorbis-([0-9\.]*)\.tar\.gz debian uupdate
+http://sf.net/savonet/ocaml-vorbis-([0-9\.]*)\.tar\.gz debian uupdate




More information about the Pkg-ocaml-maint-commits mailing list