[Pkg-ocaml-maint-commits] [SCM] ocaml-portaudio packaging branch, master, updated. debian/0.1.2-2-5-gd011f0b

Romain Beauxis toots at rastageeks.org
Mon Oct 12 22:16:37 UTC 2009


The following commit has been merged in the master branch:
commit d011f0b681ff39f59374bea805a477baca6fd2a1
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Oct 12 17:19:27 2009 -0500

    Prepared new upstream release

diff --git a/debian/changelog b/debian/changelog
index fa89064..8f0702c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ocaml-portaudio (0.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards version to 3.8.3
+  * Changed section to ocaml.
+  * Switched to new automatice dependency system. 
+  * Fixed Vcs-* fields.
+  * Switched rules file to use ocaml.mk
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 12 Oct 2009 17:04:54 -0500
+
 ocaml-portaudio (0.1.2-2) unstable; urgency=low
 
   * Rebuid with OCaml 3.11.
diff --git a/debian/control b/debian/control
index a22dde0..8c33b2f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,19 @@
 Source: ocaml-portaudio
-Section: devel
+Section: ocaml
 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: debhelper (>= 7), dh-ocaml, portaudio19-dev, ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), pkg-config
-Standards-Version: 3.8.0
+Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.1), ocaml-nox, dh-ocaml (>= 0.9), 
+               portaudio19-dev, ocaml-findlib (>= 1.2.4), pkg-config
+Standards-Version: 3.8.3
 Homepage: http://savonet.sourceforge.net/
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-portaudio.git
+Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-portaudio.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-portaudio.git
 
 Package: libportaudio-ocaml
 Architecture: any
-Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for the portaudio library
  Portaudio is a portable audio I/O library designed for cross-platform
  support of audio. This package provides OCaml interface to this library.
@@ -21,8 +22,10 @@ Description: OCaml bindings for the portaudio library
 
 Package: libportaudio-ocaml-dev
 Architecture: any
-Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, portaudio19-dev, libportaudio-ocaml (= ${binary:Version}), ocaml-findlib
+Depends: ${ocaml:Depends}, 
+         portaudio19-dev, libportaudio-ocaml (= ${binary:Version}), 
+         ocaml-findlib, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for the portaudio library
  Portaudio is a portable audio I/O library designed for cross-platform
  support of audio. This package provides OCaml interface to this library.
diff --git a/debian/control b/debian/control.in
similarity index 68%
copy from debian/control
copy to debian/control.in
index a22dde0..95e355b 100644
--- a/debian/control
+++ b/debian/control.in
@@ -1,18 +1,19 @@
 Source: ocaml-portaudio
-Section: devel
+Section: ocaml
 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: debhelper (>= 7), dh-ocaml, portaudio19-dev, ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), pkg-config
-Standards-Version: 3.8.0
+Build-Depends: @cdbs@, 
+               portaudio19-dev, ocaml-findlib (>= 1.2.4), pkg-config
+Standards-Version: 3.8.3
 Homepage: http://savonet.sourceforge.net/
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-portaudio.git
+Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-portaudio.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-portaudio.git
 
 Package: libportaudio-ocaml
 Architecture: any
-Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for the portaudio library
  Portaudio is a portable audio I/O library designed for cross-platform
  support of audio. This package provides OCaml interface to this library.
@@ -21,8 +22,10 @@ Description: OCaml bindings for the portaudio library
 
 Package: libportaudio-ocaml-dev
 Architecture: any
-Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, portaudio19-dev, libportaudio-ocaml (= ${binary:Version}), ocaml-findlib
+Depends: ${ocaml:Depends}, 
+         portaudio19-dev, libportaudio-ocaml (= ${binary:Version}), 
+         ocaml-findlib, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for the portaudio library
  Portaudio is a portable audio I/O library designed for cross-platform
  support of audio. This package provides OCaml interface to this library.
diff --git a/debian/copyright b/debian/copyright
index ec71ffb..71ee7f6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ It was downloaded from <http://savonet.sourceforge.net/>
 
 Upstream Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
 
-Copyright: Copyright (C) 2007 Samuel Mimram
+Copyright: Copyright © 2007 Samuel Mimram
 
 License:
 
@@ -31,7 +31,7 @@ the executable file might be covered by the GNU Library General Public License.
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-The Debian packaging is (C) 2007, Samuel Mimram <smimram at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is © 2007, Samuel Mimram <smimram at debian.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/libportaudio-ocaml-dev.doc-base b/debian/libportaudio-ocaml-dev.doc-base
new file mode 100644
index 0000000..335ded8
--- /dev/null
+++ b/debian/libportaudio-ocaml-dev.doc-base
@@ -0,0 +1,9 @@
+Document: libportaudio-ocaml-dev
+Title: OCaml Portaudio module documentation
+Author: Samuel Mimram
+Abstract: Documentation of the OCaml Portaudio module
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libportaudio-ocaml-dev/html/index.html
+Files: /usr/share/doc/libportaudio-ocaml-dev/html/*
diff --git a/debian/rules b/debian/rules
index d8cd87b..0a144cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,68 +1,21 @@
 #!/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/rules/ocaml.mk
 
-include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
+# 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/$(OCAML_STDLIB_DIR)
-
-CFLAGS = -O2 -g -fPIC
-
-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: ocamlinit-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_prep
-	dh_installdirs
+DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
+DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+DEB_DH_INSTALL_ARGS :=  --list-missing
 
+build/libportaudio-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 --list-missing
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
-	dh_md5sums
-	dh_builddeb
-
-binary-indep:
+	make doc
 
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install ocamlinit
+clean::
+	rm -rf Makefile src/Makefile src/META doc config.log config.status

-- 
ocaml-portaudio packaging



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