[Pkg-ocaml-maint-commits] [SCM] ocaml-lastfm packaging branch, master, updated. debian/0.1.3-1-8-g2f6d448

[Romain Beauxis]

The following commit has been merged in the master branch:
commit fbd2f284b49e77131f04647c43e2f04b2ea478d2
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Mar 9 03:05:18 2009 +0100

    Prepared next upload.

diff --git a/debian/changelog b/debian/changelog
index 7f57afc..a6cfdf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
-ocaml-lastfm (0.1.3-2) UNRELEASED; urgency=low
+ocaml-lastfm (0.1.3-2) unstable; urgency=low
 
+  [ Samuel Mimram ]
   * 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 <smimram at debian.org>  Wed, 25 Feb 2009 22:37:10 +0100
+  [ Romain Beauxis ]
+  * Switched rules to cdbs. 
+  * Used OPT: for files installed only when
+    ocamlopt is available.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 09 Mar 2009 03:04:04 +0100
 
 ocaml-lastfm (0.1.3-1) unstable; urgency=low
 
diff --git a/debian/liblastfm-ocaml-dev.install.in b/debian/liblastfm-ocaml-dev.install.in
index 975c02f..235540c 100644
--- a/debian/liblastfm-ocaml-dev.install.in
+++ b/debian/liblastfm-ocaml-dev.install.in
@@ -1,4 +1,4 @@
 @OCamlStdlibDir@/lastfm/META
 @OCamlStdlibDir@/lastfm/*.cm*
 @OCamlStdlibDir@/lastfm/*.ml*
- at OCamlStdlibDir@/lastfm/*.a
+OPT: @OCamlStdlibDir@/lastfm/*.a
diff --git a/debian/rules b/debian/rules
index cb934fb..390def5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,68 +1,19 @@
 #!/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)
-
-config.status: configure
-	dh_testdir
-	./configure --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) clean
-	rm -f config.log config.status
-	rm -rf debian/doc/
-	rm -rf doc
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 
+build/liblastfm-ocaml-dev::
 	mkdir -p $(DESTDIR)
-	$(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-	$(MAKE) doc
-
-binary-indep:
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=debian/tmp --list-missing
-	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
-	dh_md5sums
-	dh_builddeb
+	make doc
 
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+clean::
+	rm -rf Makefile src/Makefile src/META doc config.log config.status

-- 
ocaml-lastfm packaging