[Pkg-ocaml-maint-commits] [SCM] ocamlcreal packaging branch, master, updated. debian/0.7-5-6-g086c7d5

Mehdi Dogguy mehdi at debian.org
Tue Oct 6 19:05:53 UTC 2009


The following commit has been merged in the master branch:
commit f1a51acf173a3f12d40f6530efc59fcfd6a16876
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 6 18:55:37 2009 +0200

    Refresh packaging

diff --git a/debian/changelog b/debian/changelog
index 7221309..d6691a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
 ocamlcreal (0.7-6) UNRELEASED; urgency=low
 
+  [ Stephane Glondu ]
   * Switch packaging to git
 
- -- Stephane Glondu <steph at glondu.net>  Thu, 09 Jul 2009 13:40:51 +0200
+  [ Mehdi Dogguy ]
+  * Update my e-mail address
+  * Refresh packaging:
+    - Use debhelper (>= 7.0.50~)
+    - Bump standards to 3.8.3
+    - Use new features of dh-ocaml (>= 0.9~)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 18:52:19 +0200
 
 ocamlcreal (0.7-5) unstable; urgency=low
 
@@ -108,4 +116,3 @@ ocamlcreal (0.4-1) unstable; urgency=low
   * Initial Release. (Closes: 242842)
 
  -- Mike Furr <mfurr at debian.org>  Sat, 10 Apr 2004 12:49:19 -0400
-
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 8303da5..e3dd7d8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,24 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
  Mike Furr <mfurr at debian.org>,
  Mehdi Dogguy <mehdi at debian.org>
-Build-Depends: ocaml-nox (>= 3.11.1),
- debhelper (>= 5.0.0),
+Build-Depends:
+ ocaml-nox (>= 3.11.1-3~),
+ debhelper (>= 7.0.50~),
  dpatch,
  libgmp-ocaml-dev (>= 20021123-15),
+ dh-ocaml (>= 0.9~)
 Standards-Version: 3.8.3
- dh-ocaml (>= 0.4.1)
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlcreal.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlcreal.git
 
 Package: libcreal-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libgmp-ocaml-dev
+Depends:
+ ${ocaml:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+Provides:
+ ${ocaml:Provides}
 Description: O'Caml library that implements exact real arithmetic
  This  module  implements  exact  real  arithmetic,  following  Valerie
  Menissier-Morain Ph.D. thesis (http://www-calfor.lip6.fr/~vmm/).
diff --git a/debian/rules b/debian/rules
index f35aff6..64a06a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,65 +4,23 @@ PACKAGE=libcreal-ocaml-dev
 
 include /usr/share/dpatch/dpatch.make
 include /usr/share/ocaml/ocamlvars.mk
-OCAMLABI = $(shell ocamlc -version)
 
-config.status: patch-stamp configure
-	dh_testdir
-	./configure --prefix=/usr
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
+override_dh_auto_build:
 	$(MAKE) depend
 	$(MAKE)
 	$(MAKE) test
-	touch build-stamp
-
-clean: clean1 unpatch
-clean1:
-	dh_testdir
-	dh_testroot
 
+override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) clean
-	dh_clean 
-	rm -f build-stamp config.status
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+	rm -f config.status
 
+override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/$(PACKAGE)$(OCAML_STDLIB_DIR)/creal
 	$(MAKE) install LIBDIR=$(CURDIR)/debian/$(PACKAGE)$(OCAML_STDLIB_DIR)/creal
 	cp debian/META debian/$(PACKAGE)$(OCAML_STDLIB_DIR)/creal
 
-	mkdir -p debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/html/api
-	find debian/$(PACKAGE)$(OCAML_STDLIB_DIR) -type f -name '*.mli' -or -name '*.ml' | \
-	xargs ocamldoc -I +gmp -html -d debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/html/api
-	/usr/share/ocaml/ocamldoc-api-ref-config --doc-base-generate $(PACKAGE)
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples calc.mll
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums
-	dh_builddeb
+%:
+	dh --with ocaml $@
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 

-- 
ocamlcreal packaging



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