[Pkg-ocaml-maint-commits] r6066 - in /trunk/packages/ocaml-alsa/trunk/debian: changelog control control.in libalsa-ocaml-dev.install.in libalsa-ocaml.install.in rules

toots at users.alioth.debian.org toots at users.alioth.debian.org
Sat Dec 13 21:40:57 UTC 2008


Author: toots
Date: Sat Dec 13 21:40:57 2008
New Revision: 6066

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6066
Log:
Prepared next upload..

Added:
    trunk/packages/ocaml-alsa/trunk/debian/control
    trunk/packages/ocaml-alsa/trunk/debian/control.in   (contents, props changed)
      - copied, changed from r6065, trunk/packages/ocaml-alsa/trunk/debian/control
Modified:
    trunk/packages/ocaml-alsa/trunk/debian/changelog
    trunk/packages/ocaml-alsa/trunk/debian/libalsa-ocaml-dev.install.in
    trunk/packages/ocaml-alsa/trunk/debian/libalsa-ocaml.install.in
    trunk/packages/ocaml-alsa/trunk/debian/rules

Modified: trunk/packages/ocaml-alsa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk/debian/changelog?rev=6066&op=diff
==============================================================================
--- trunk/packages/ocaml-alsa/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-alsa/trunk/debian/changelog Sat Dec 13 21:40:57 2008
@@ -1,3 +1,13 @@
+ocaml-alsa (0.1.3-2) experimental; urgency=low
+
+  * New upload to experimental to build against ocaml 3.11.
+  * Versioned ocaml-related build-dep to avoid confusion. 
+  * Switched to cdbs
+  * Changed maintainer to the debian ocaml team.
+  * Added dh-ocaml to build-deps.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Sat, 13 Dec 2008 22:29:42 +0100
+
 ocaml-alsa (0.1.3-1) unstable; urgency=low
 
   [ Stefano Zacchiroli ]

Added: trunk/packages/ocaml-alsa/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk/debian/control?rev=6066&op=file
==============================================================================
--- trunk/packages/ocaml-alsa/trunk/debian/control (added)
+++ trunk/packages/ocaml-alsa/trunk/debian/control Sat Dec 13 21:40:57 2008
@@ -1,0 +1,30 @@
+Source: ocaml-alsa
+Section: devel
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), ocaml-nox (>= 3.11.0-1), pkg-config, libasound2-dev, ocaml-findlib (>= 1.2.3), dh-ocaml
+Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk/
+
+Package: libalsa-ocaml
+Section: libs
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml bindings for the ALSA library
+ This OCaml library interfaces the ALSA library libasound to access audio
+ devices.
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libalsa-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libasound2-dev, libalsa-ocaml (= ${binary:Version}), ${misc:Depends}
+Description: OCaml bindings for the ALSA library
+ This OCaml library interfaces the ALSA library libasound to access audio
+ devices.
+ .
+ This package contains all the development stuff you need to use ocaml-alsa
+ in your programs.

Copied: trunk/packages/ocaml-alsa/trunk/debian/control.in (from r6065, trunk/packages/ocaml-alsa/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk/debian/control.in?rev=6066&op=diff
==============================================================================
--- trunk/packages/ocaml-alsa/trunk/debian/control (original)
+++ trunk/packages/ocaml-alsa/trunk/debian/control.in Sat Dec 13 21:40:57 2008
@@ -1,17 +1,17 @@
 Source: ocaml-alsa
 Section: devel
 Priority: optional
-Maintainer: Liquidsoap Debian Packaging <savonet-debian at lists.sourceforge.net>
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
-Build-Depends: debhelper (>> 4.0.0), dpkg-dev (>= 1.13.19), pkg-config, libasound2-dev, ocaml-nox (>= 3.10), ocaml-findlib
-Standards-Version: 3.7.3
+Build-Depends: @cdbs@, pkg-config, libasound2-dev, ocaml-findlib (>= 1.2.3), dh-ocaml
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk/
 
 Package: libalsa-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 ALSA library
  This OCaml library interfaces the ALSA library libasound to access audio
  devices.
@@ -21,7 +21,7 @@
 Package: libalsa-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libasound2-dev, libalsa-ocaml (= ${binary:Version})
+Depends: ocaml-nox-${F:OCamlABI}, libasound2-dev, libalsa-ocaml (= ${binary:Version}), ${misc:Depends}
 Description: OCaml bindings for the ALSA library
  This OCaml library interfaces the ALSA library libasound to access audio
  devices.

Propchange: trunk/packages/ocaml-alsa/trunk/debian/control.in
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: trunk/packages/ocaml-alsa/trunk/debian/libalsa-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk/debian/libalsa-ocaml-dev.install.in?rev=6066&op=diff
==============================================================================
--- trunk/packages/ocaml-alsa/trunk/debian/libalsa-ocaml-dev.install.in (original)
+++ trunk/packages/ocaml-alsa/trunk/debian/libalsa-ocaml-dev.install.in Sat Dec 13 21:40:57 2008
@@ -1,4 +1,1 @@
-usr/lib/ocaml/@OCamlABI@/alsa/META
-usr/lib/ocaml/@OCamlABI@/alsa/*.a
-usr/lib/ocaml/@OCamlABI@/alsa/*.cm*
-usr/lib/ocaml/@OCamlABI@/alsa/*.ml*
+src/META src/*.a src/*.cm* usr/lib/ocaml/@OCamlABI@/alsa

Modified: trunk/packages/ocaml-alsa/trunk/debian/libalsa-ocaml.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk/debian/libalsa-ocaml.install.in?rev=6066&op=diff
==============================================================================
--- trunk/packages/ocaml-alsa/trunk/debian/libalsa-ocaml.install.in (original)
+++ trunk/packages/ocaml-alsa/trunk/debian/libalsa-ocaml.install.in Sat Dec 13 21:40:57 2008
@@ -1,1 +1,1 @@
-usr/lib/ocaml/@OCamlABI@/alsa/dllalsa_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+src/dllalsa_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/ocaml-alsa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-alsa/trunk/debian/rules?rev=6066&op=diff
==============================================================================
--- trunk/packages/ocaml-alsa/trunk/debian/rules (original)
+++ trunk/packages/ocaml-alsa/trunk/debian/rules Sat Dec 13 21:40:57 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/libalsa-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