[Pkg-ocaml-maint-commits] [SCM] ocaml-vorbis packaging branch, master, updated. debian/0.5.0-1-3-gea311d5

Romain Beauxis toots at rastageeks.org
Wed Oct 14 22:17:32 UTC 2009 

The following commit has been merged in the master branch:
commit ea311d5c8b2ec00e5a78db57c59c9377543507ae
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed Oct 14 17:20:19 2009 -0500

    Prepared new upstream release

diff --git a/debian/changelog b/debian/changelog
index 29ff992..5c2d0e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ocaml-vorbis (0.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards version to 3.8.3
+  * Changed section to ocaml
+  * Use new automatic dependency system.
+  * Enabled debugging.
+  * Fixed Vcs-* fields. 
+  * Switch to ocaml.mk
+  * Versioned license in debian/copyright
+
+ -- Romain Beauxis <toots at rastageeks.org>  Wed, 14 Oct 2009 17:07:30 -0500
+
 ocaml-vorbis (0.5.0-1) unstable; urgency=low
 
   * New Upstream Version.
diff --git a/debian/control b/debian/control
index 0b281e7..bf7358a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,19 @@
 Source: ocaml-vorbis
-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), dpkg-dev (>= 1.13.19), pkg-config, libvorbis-dev, dh-ocaml, ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), libogg-ocaml-dev (>= 0.3.0)
-Standards-Version: 3.8.0
+Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.1), ocaml-nox, dh-ocaml (>= 0.9), 
+               pkg-config, libvorbis-dev, ocaml-findlib (>= 1.2.4), libogg-ocaml-dev (>= 0.3.1)
+Standards-Version: 3.8.3
 Homepage: http://savonet.sourceforge.net/
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-vorbis.git
+Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-vorbis.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-vorbis.git
 
 Package: libvorbis-ocaml
-Section: libs
 Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
 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
@@ -25,9 +26,10 @@ Description: OCaml bindings for vorbis library
  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 (= ${binary:Version}), libogg-ocaml-dev
+Depends: ${ocaml:Depends}, ${misc:Depends},
+         libvorbis-dev, libvorbis-ocaml (= ${binary:Version}), libogg-ocaml-dev
+Provides: ${ocaml:Provides}
 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
diff --git a/debian/control b/debian/control.in
similarity index 75%
copy from debian/control
copy to debian/control.in
index 0b281e7..5d0482d 100644
--- a/debian/control
+++ b/debian/control.in
@@ -1,18 +1,19 @@
 Source: ocaml-vorbis
-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), dpkg-dev (>= 1.13.19), pkg-config, libvorbis-dev, dh-ocaml, ocaml-nox (>= 3.11), ocaml-findlib (>= 1.2.4), libogg-ocaml-dev (>= 0.3.0)
-Standards-Version: 3.8.0
+Build-Depends: @cdbs@, 
+               pkg-config, libvorbis-dev, ocaml-findlib (>= 1.2.4), libogg-ocaml-dev (>= 0.3.1)
+Standards-Version: 3.8.3
 Homepage: http://savonet.sourceforge.net/
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-vorbis.git
+Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-vorbis.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-vorbis.git
 
 Package: libvorbis-ocaml
-Section: libs
 Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
 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
@@ -25,9 +26,10 @@ Description: OCaml bindings for vorbis library
  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 (= ${binary:Version}), libogg-ocaml-dev
+Depends: ${ocaml:Depends}, ${misc:Depends},
+         libvorbis-dev, libvorbis-ocaml (= ${binary:Version}), libogg-ocaml-dev
+Provides: ${ocaml:Provides}
 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
diff --git a/debian/copyright b/debian/copyright
index 4266461..5cd718b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,11 +5,11 @@ It was downloaded from http://savonet.sourceforge.net/
 
 Upstream Authors: the Savonet Team <savonet-devl at lists.sourceforge.net>
 
-Copyright (c) 2003-2007 the Savonet Team.
+Copyright © 2003-2007 the Savonet Team.
 
 The ocaml-vorbis library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 (GPL) as published by the Free Software Foundation; either version
 2 of the License, or (at your option) any later version.
 
-The license text is contained in /usr/share/common-licenses/GPL.
+The license text is contained in /usr/share/common-licenses/GPL-2.
diff --git a/debian/rules b/debian/rules
index 03424fa..ee85532 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,76 +1,20 @@
 #!/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
 
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-debugging
 DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
-CFLAGS = -Wall -g -fPIC
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-        INSTALL_PROGRAM += -s
-endif
-
-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)
-
-	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
+DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 
+build/libvorbis-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 src/Makefile src/META doc config.log config.status

-- 
ocaml-vorbis packaging

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