The following commit has been merged in the master branch:
commit 6be58ebd44909b5ecbcea587d9f7c74a74a70575
Author: Samuel Mimram <[email protected]>
Date: Wed Feb 25 22:38:29 2009 +0100
Update packaging.
diff --git a/debian/changelog b/debian/changelog
index 03f8396..7f57afc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
ocaml-lastfm (0.1.3-2) UNRELEASED; urgency=low
- * Switch packaging to git
+ * Rebuild with OCaml 3.11.
+ * Switch packaging to git.
+ * Update compat to 7.
+ * Update standards version to 3.8.0.
+ * Use dh-ocaml.
- -- Samuel Mimram <[email protected]> Mon, 23 Feb 2009 18:34:13 +0100
+ -- Samuel Mimram <[email protected]> Wed, 25 Feb 2009 22:37:10 +0100
ocaml-lastfm (0.1.3-1) unstable; urgency=low
- * New upstream release
+ * New upstream release.
-- Romain Beauxis <[email protected]> Wed, 17 Sep 2008 18:53:50 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 8db8f16..c2ce15f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: devel
Priority: optional
Maintainer: Debian OCaml Maintainers <[email protected]>
Uploaders: Samuel Mimram <[email protected]>, Romain Beauxis
<[email protected]>
-Build-Depends: debhelper (>= 4.2.0), ocaml-nox (>= 3.10), ocaml-findlib,
libxmlplaylist-ocaml-dev, libocamlnet-ocaml-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7), dh-ocaml, ocaml-nox (>= 3.11), ocaml-findlib
(>= 1.2.4), libxmlplaylist-ocaml-dev, libocamlnet-ocaml-dev
+Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-lastfm.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-lastfm.git
@@ -17,4 +17,3 @@ Description: OCaml interface to audioscrobbler and lastfm
radios
This OCaml module provides an API to audioscrobbler, the lastfm
submission protocol, as well as the radio API, which allows to
listen to lastfm streams/radios.
-
diff --git a/debian/liblastfm-ocaml-dev.install.in
b/debian/liblastfm-ocaml-dev.install.in
index 5139c72..975c02f 100644
--- a/debian/liblastfm-ocaml-dev.install.in
+++ b/debian/liblastfm-ocaml-dev.install.in
@@ -1,4 +1,4 @@
-usr/lib/ocaml/@OCamlABI@/lastfm/META
-usr/lib/ocaml/@OCamlABI@/lastfm/*.cm*
-usr/lib/ocaml/@OCamlABI@/lastfm/*.ml*
-usr/lib/ocaml/@OCamlABI@/lastfm/*.a
+...@ocamlstdlibdir@/lastfm/META
+...@ocamlstdlibdir@/lastfm/*.cm*
+...@ocamlstdlibdir@/lastfm/*.ml*
+...@ocamlstdlibdir@/lastfm/*.a
diff --git a/debian/rules b/debian/rules
index 9ac7715..cb934fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,13 +5,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
-DESTDIR := $(CURDIR)/debian/tmp/$(shell ocamlc -where)
-
-ocamlinit:
- for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in >
$$f; done
+DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
config.status: configure
dh_testdir
@@ -23,7 +20,7 @@ build-stamp: config.status
$(MAKE)
touch build-stamp
-clean:
+clean: ocamlinit-clean
dh_testdir
dh_testroot
rm -f build-stamp
@@ -63,7 +60,7 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+ dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
dh_md5sums
dh_builddeb
--
ocaml-lastfm packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
