[Pkg-ocaml-maint-commits] r6068 - in /trunk/packages/ocaml-ao/trunk/debian: changelog control control.in libao-ocaml-dev.install.in libao-ocaml.install.in rules watch

toots at users.alioth.debian.org toots at users.alioth.debian.org
Sat Dec 13 21:51:32 UTC 2008 

Author: toots
Date: Sat Dec 13 21:51:32 2008
New Revision: 6068

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

Added:
    trunk/packages/ocaml-ao/trunk/debian/control
    trunk/packages/ocaml-ao/trunk/debian/control.in   (contents, props changed)
      - copied, changed from r6067, trunk/packages/ocaml-ao/trunk/debian/control
    trunk/packages/ocaml-ao/trunk/debian/watch
Modified:
    trunk/packages/ocaml-ao/trunk/debian/changelog
    trunk/packages/ocaml-ao/trunk/debian/libao-ocaml-dev.install.in
    trunk/packages/ocaml-ao/trunk/debian/libao-ocaml.install.in
    trunk/packages/ocaml-ao/trunk/debian/rules

Modified: trunk/packages/ocaml-ao/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/changelog?rev=6068&op=diff
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-ao/trunk/debian/changelog Sat Dec 13 21:51:32 2008
@@ -1,3 +1,15 @@
+ocaml-ao (0.1.9-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.
+  * Updated standards to 3.8.0.
+  * Added watch file.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Sat, 13 Dec 2008 22:46:13 +0100
+
 ocaml-ao (0.1.9-1) unstable; urgency=low
 
   [ Stefano Zacchiroli ]

Added: trunk/packages/ocaml-ao/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/control?rev=6068&op=file
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/control (added)
+++ trunk/packages/ocaml-ao/trunk/debian/control Sat Dec 13 21:51:32 2008
@@ -1,0 +1,28 @@
+Source: ocaml-ao
+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), libao-dev, ocaml-findlib (>= 1.2.3), pkg-config
+Standards-Version: 3.8.0
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk
+
+Package: libao-ocaml
+Section: libs
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml bindings for libao
+ OCaml bindings for the cross platform audio output library.
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libao-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libao-dev, libao-ocaml (= ${binary:Version}), ${misc:Depends}
+Description: OCaml bindings for libao
+ OCaml bindings for the cross platform audio output library.
+ .
+ This package contains all the development stuff you need to use ocaml-ao
+ in your programs.

Copied: trunk/packages/ocaml-ao/trunk/debian/control.in (from r6067, trunk/packages/ocaml-ao/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/control.in?rev=6068&op=diff
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/control (original)
+++ trunk/packages/ocaml-ao/trunk/debian/control.in Sat Dec 13 21:51:32 2008
@@ -1,17 +1,17 @@
 Source: ocaml-ao
 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), libao-dev, ocaml-nox (>= 3.10), ocaml-findlib, pkg-config, dpkg-dev (>= 1.13.19)
-Standards-Version: 3.7.3
+Build-Depends: @cdbs@, libao-dev, ocaml-findlib (>= 1.2.3), pkg-config
+Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk
 
 Package: libao-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 libao
  OCaml bindings for the cross platform audio output library.
  .
@@ -20,7 +20,7 @@
 Package: libao-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libao-dev, libao-ocaml (= ${binary:Version})
+Depends: ocaml-nox-${F:OCamlABI}, libao-dev, libao-ocaml (= ${binary:Version}), ${misc:Depends}
 Description: OCaml bindings for libao
  OCaml bindings for the cross platform audio output library.
  .

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

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

Modified: trunk/packages/ocaml-ao/trunk/debian/libao-ocaml.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/libao-ocaml.install.in?rev=6068&op=diff
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/libao-ocaml.install.in (original)
+++ trunk/packages/ocaml-ao/trunk/debian/libao-ocaml.install.in Sat Dec 13 21:51:32 2008
@@ -1,1 +1,1 @@
-usr/lib/ocaml/@OCamlABI@/ao/dllao_stubs.so	usr/lib/ocaml/@OCamlABI@/stublibs/
+src/dllao_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/ocaml-ao/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/rules?rev=6068&op=diff
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/rules (original)
+++ trunk/packages/ocaml-ao/trunk/debian/rules Sat Dec 13 21:51:32 2008
@@ -1,82 +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)
-CFLAGS = -g -Wall
+DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
+DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  CFLAGS += -O0
-else
-  CFLAGS += -O2
-endif
-
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
-config.status: configure
-	dh_testdir
-	./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)"
-
-build: ocamlinit build-stamp
-build-stamp: config.status
-	dh_testdir
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) -C src dcl
-endif
-	$(MAKE)
-	touch build-stamp
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
+build/libao-ocaml-dev::
 	mkdir -p $(DESTDIR)
-	$(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-
-binary-indep:
-
-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_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install ocamlinit
+	make doc

Added: trunk/packages/ocaml-ao/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/watch?rev=6068&op=file
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/watch (added)
+++ trunk/packages/ocaml-ao/trunk/debian/watch Sat Dec 13 21:51:32 2008
@@ -1,0 +1,3 @@
+version=3
+
+http://sf.net/savonet/ocaml-ao-([0-9\.]*)\.tar\.gz debian uupdate

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