[Pkg-ocaml-maint-commits] r6084 - in /trunk/packages/ocaml-ogg/trunk/debian: changelog control control.in libogg-ocaml-dev.install.in libogg-ocaml.install.in rules

toots at users.alioth.debian.org toots at users.alioth.debian.org
Sat Dec 13 22:51:10 UTC 2008 

Author: toots
Date: Sat Dec 13 22:51:10 2008
New Revision: 6084

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

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

Modified: trunk/packages/ocaml-ogg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/debian/changelog?rev=6084&op=diff
==============================================================================
--- trunk/packages/ocaml-ogg/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-ogg/trunk/debian/changelog Sat Dec 13 22:51:10 2008
@@ -1,3 +1,13 @@
+ocaml-ogg (0.2.0-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
+  * Added dh-ocaml to build-deps.
+  * Updated standards to 3.8.0.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Sat, 13 Dec 2008 23:45:01 +0100
+
 ocaml-ogg (0.2.0-1) unstable; urgency=low
 
   [ Stefano Zacchiroli ]

Added: trunk/packages/ocaml-ogg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/debian/control?rev=6084&op=file
==============================================================================
--- trunk/packages/ocaml-ogg/trunk/debian/control (added)
+++ trunk/packages/ocaml-ogg/trunk/debian/control Sat Dec 13 22:51:10 2008
@@ -1,0 +1,31 @@
+Source: ocaml-ogg
+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 (>= 5), ocaml-nox (>= 3.11.0-1), libogg-dev, ocaml-findlib (>= 1.2.3), pkg-config, dh-ocaml
+Standards-Version: 3.8.0
+Homepage: http://savonet.sourceforge.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/
+
+Package: libogg-ocaml
+Architecture: any
+Section: libs
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml bindings for the Ogg bitstream library
+ Libogg is a library for manipulating ogg bitstreams. It handles
+ both making ogg bitstreams and getting packets from ogg bitstreams.
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libogg-ocaml-dev
+Architecture: any
+Section: libdevel
+Depends: ocaml-nox-${F:OCamlABI}, libogg-dev, libogg-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends}
+Description: OCaml bindings for the Ogg bitstream library
+ Libogg is a library for manipulating ogg bitstreams. It handles
+ both making ogg bitstreams and getting packets from ogg bitstreams.
+ .
+ This package contains all the development stuff you need to develop
+ OCaml programs which use ogg.

Copied: trunk/packages/ocaml-ogg/trunk/debian/control.in (from r6083, trunk/packages/ocaml-ogg/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/debian/control.in?rev=6084&op=diff
==============================================================================
--- trunk/packages/ocaml-ogg/trunk/debian/control (original)
+++ trunk/packages/ocaml-ogg/trunk/debian/control.in Sat Dec 13 22:51:10 2008
@@ -3,8 +3,8 @@
 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 (>= 5.0.0), libogg-dev, ocaml-nox (>= 3.10), ocaml-findlib, pkg-config
-Standards-Version: 3.7.3
+Build-Depends: @cdbs@, libogg-dev, ocaml-findlib, pkg-config, dh-ocaml
+Standards-Version: 3.8.0
 Homepage: http://savonet.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/
@@ -12,7 +12,7 @@
 Package: libogg-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml bindings for the Ogg bitstream library
  Libogg is a library for manipulating ogg bitstreams. It handles
  both making ogg bitstreams and getting packets from ogg bitstreams.
@@ -22,7 +22,7 @@
 Package: libogg-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libogg-dev, libogg-ocaml (= ${binary:Version}), ocaml-findlib
+Depends: ocaml-nox-${F:OCamlABI}, libogg-dev, libogg-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends}
 Description: OCaml bindings for the Ogg bitstream library
  Libogg is a library for manipulating ogg bitstreams. It handles
  both making ogg bitstreams and getting packets from ogg bitstreams.

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

Modified: trunk/packages/ocaml-ogg/trunk/debian/libogg-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/debian/libogg-ocaml-dev.install.in?rev=6084&op=diff
==============================================================================
--- trunk/packages/ocaml-ogg/trunk/debian/libogg-ocaml-dev.install.in (original)
+++ trunk/packages/ocaml-ogg/trunk/debian/libogg-ocaml-dev.install.in Sat Dec 13 22:51:10 2008
@@ -1,5 +1,5 @@
-usr/lib/ocaml/@OCamlABI@/ogg/META
-usr/lib/ocaml/@OCamlABI@/ogg/*.a
-usr/lib/ocaml/@OCamlABI@/ogg/*.cm*
-usr/lib/ocaml/@OCamlABI@/ogg/*.ml*
-usr/lib/ocaml/@OCamlABI@/ogg/*.h
+debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/META
+debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/*.a
+debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/*.cm*
+debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/*.ml*
+debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/*.h

Modified: trunk/packages/ocaml-ogg/trunk/debian/libogg-ocaml.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/debian/libogg-ocaml.install.in?rev=6084&op=diff
==============================================================================
--- trunk/packages/ocaml-ogg/trunk/debian/libogg-ocaml.install.in (original)
+++ trunk/packages/ocaml-ogg/trunk/debian/libogg-ocaml.install.in Sat Dec 13 22:51:10 2008
@@ -1,1 +1,1 @@
-usr/lib/ocaml/@OCamlABI@/ogg/dllogg_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/
+debian/tmp/usr/lib/ocaml/@OCamlABI@/ogg/dllogg_stubs.so    usr/lib/ocaml/@OCamlABI@/stublibs/

Modified: trunk/packages/ocaml-ogg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ogg/trunk/debian/rules?rev=6084&op=diff
==============================================================================
--- trunk/packages/ocaml-ogg/trunk/debian/rules (original)
+++ trunk/packages/ocaml-ogg/trunk/debian/rules Sat Dec 13 22:51:10 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
-
-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)
-
-	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/libogg-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