Author: toots
Date: Sat Dec 13 23:05:27 2008
New Revision: 6088
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6088
Log:
Prepared next upload..
Added:
trunk/packages/ocaml-taglib/trunk/debian/control
trunk/packages/ocaml-taglib/trunk/debian/control.in (contents, props
changed)
- copied, changed from r6087,
trunk/packages/ocaml-taglib/trunk/debian/control
Modified:
trunk/packages/ocaml-taglib/trunk/debian/changelog
trunk/packages/ocaml-taglib/trunk/debian/libtaglib-ocaml-dev.install.in
trunk/packages/ocaml-taglib/trunk/debian/libtaglib-ocaml.install.in
trunk/packages/ocaml-taglib/trunk/debian/rules
Modified: trunk/packages/ocaml-taglib/trunk/debian/changelog
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/trunk/debian/changelog?rev=6088&op=diff
==============================================================================
--- trunk/packages/ocaml-taglib/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-taglib/trunk/debian/changelog Sat Dec 13 23:05:27 2008
@@ -1,3 +1,13 @@
+ocaml-taglib (0.1.2-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 <to...@rastageeks.org> Sun, 14 Dec 2008 00:01:49 +0100
+
ocaml-taglib (0.1.2-1) unstable; urgency=low
[ Stefano Zacchiroli ]
Added: trunk/packages/ocaml-taglib/trunk/debian/control
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/trunk/debian/control?rev=6088&op=file
==============================================================================
--- trunk/packages/ocaml-taglib/trunk/debian/control (added)
+++ trunk/packages/ocaml-taglib/trunk/debian/control Sat Dec 13 23:05:27 2008
@@ -1,0 +1,33 @@
+Source: ocaml-taglib
+Section: devel
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
+Uploaders: Samuel Mimram <smim...@debian.org>, Romain Beauxis
<to...@rastageeks.org>
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), ocaml-nox (>=
3.11.0-1), libtagc0-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-taglib/trunk
+Vcs-Browser:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/trunk/
+
+Package: libtaglib-ocaml
+Architecture: any
+Section: libs
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml bindings for the TagLib Audio Meta-Data Library
+ TagLib is a library for reading and editing the meta-data of several popular
+ audio formats. This package provides ocaml interface to
+ the C library.
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libtaglib-ocaml-dev
+Architecture: any
+Section: libdevel
+Depends: ocaml-nox-${F:OCamlABI}, libtagc0-dev, libtaglib-ocaml (=
${binary:Version}), ocaml-findlib, ${misc:Depends}
+Description: OCaml bindings for the TagLib Audio Meta-Data Library
+ TagLib is a library for reading and editing the meta-data of several popular
+ audio formats. This package provides ocaml interface to
+ the C library.
+ .
+ This package contains all the development stuff you need to develop
+ OCaml programs which use taglib.
Copied: trunk/packages/ocaml-taglib/trunk/debian/control.in (from r6087,
trunk/packages/ocaml-taglib/trunk/debian/control)
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/trunk/debian/control.in?rev=6088&op=diff
==============================================================================
--- trunk/packages/ocaml-taglib/trunk/debian/control (original)
+++ trunk/packages/ocaml-taglib/trunk/debian/control.in Sat Dec 13 23:05:27 2008
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
Uploaders: Samuel Mimram <smim...@debian.org>, Romain Beauxis
<to...@rastageeks.org>
-Build-Depends: debhelper (>= 5.0.0), libtagc0-dev, ocaml-nox (>= 3.10),
ocaml-findlib, pkg-config
-Standards-Version: 3.7.3
+Build-Depends: @cdbs@, libtagc0-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-taglib/trunk
Vcs-Browser:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/trunk/
@@ -12,7 +12,7 @@
Package: libtaglib-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 TagLib Audio Meta-Data Library
TagLib is a library for reading and editing the meta-data of several popular
audio formats. This package provides ocaml interface to
@@ -23,7 +23,7 @@
Package: libtaglib-ocaml-dev
Architecture: any
Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libtagc0-dev, libtaglib-ocaml (=
${binary:Version}), ocaml-findlib
+Depends: ocaml-nox-${F:OCamlABI}, libtagc0-dev, libtaglib-ocaml (=
${binary:Version}), ocaml-findlib, ${misc:Depends}
Description: OCaml bindings for the TagLib Audio Meta-Data Library
TagLib is a library for reading and editing the meta-data of several popular
audio formats. This package provides ocaml interface to
Propchange: trunk/packages/ocaml-taglib/trunk/debian/control.in
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
trunk/packages/ocaml-taglib/trunk/debian/libtaglib-ocaml-dev.install.in
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/trunk/debian/libtaglib-ocaml-dev.install.in?rev=6088&op=diff
==============================================================================
--- trunk/packages/ocaml-taglib/trunk/debian/libtaglib-ocaml-dev.install.in
(original)
+++ trunk/packages/ocaml-taglib/trunk/debian/libtaglib-ocaml-dev.install.in Sat
Dec 13 23:05:27 2008
@@ -1,3 +1,3 @@
-usr/lib/ocaml/@OCamlABI@/taglib/META
-usr/lib/ocaml/@OCamlABI@/taglib/*.a
-usr/lib/ocaml/@OCamlABI@/taglib/*.cm*
+debian/tmp/usr/lib/ocaml/@OCamlABI@/taglib/META
+debian/tmp/usr/lib/ocaml/@OCamlABI@/taglib/*.a
+debian/tmp/usr/lib/ocaml/@OCamlABI@/taglib/*.cm*
Modified: trunk/packages/ocaml-taglib/trunk/debian/libtaglib-ocaml.install.in
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/trunk/debian/libtaglib-ocaml.install.in?rev=6088&op=diff
==============================================================================
--- trunk/packages/ocaml-taglib/trunk/debian/libtaglib-ocaml.install.in
(original)
+++ trunk/packages/ocaml-taglib/trunk/debian/libtaglib-ocaml.install.in Sat Dec
13 23:05:27 2008
@@ -1,1 +1,1 @@
-usr/lib/ocaml/@OCamlABI@/taglib/dlltaglib_stubs.so
usr/lib/ocaml/@OCamlABI@/stublibs/
+debian/tmp/usr/lib/ocaml/@OCamlABI@/taglib/dlltaglib_stubs.so
usr/lib/ocaml/@OCamlABI@/stublibs/
Modified: trunk/packages/ocaml-taglib/trunk/debian/rules
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-taglib/trunk/debian/rules?rev=6088&op=diff
==============================================================================
--- trunk/packages/ocaml-taglib/trunk/debian/rules (original)
+++ trunk/packages/ocaml-taglib/trunk/debian/rules Sat Dec 13 23:05:27 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/libtaglib-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
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
