[Pkg-ocaml-maint-commits] r1958 - trunk/packages/ocaml-benchmark/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-11-09 15:51:13 +0000 (Wed, 09 Nov 2005)
New Revision: 1958

Removed:
   trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.dirs
Modified:
   trunk/packages/ocaml-benchmark/trunk/debian/changelog
   trunk/packages/ocaml-benchmark/trunk/debian/control
   trunk/packages/ocaml-benchmark/trunk/debian/rules
Log:
Prepare transition to 3.09: remove libdir reference -- SLG


Modified: trunk/packages/ocaml-benchmark/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/changelog	2005-11-09 15:44:07 UTC (rev 1957)
+++ trunk/packages/ocaml-benchmark/trunk/debian/changelog	2005-11-09 15:51:13 UTC (rev 1958)
@@ -1,3 +1,10 @@
+ocaml-benchmark (0.6-3) unstable; urgency=low
+
+  * Remove direct reference to ocaml library dir
+  * Upgrade standards version to 3.6.2.0 (no change)
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 16:45:08 +0100
+
 ocaml-benchmark (0.6-2) unstable; urgency=low
 
   * Transition to svn-buildpackage

Modified: trunk/packages/ocaml-benchmark/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/control	2005-11-09 15:44:07 UTC (rev 1957)
+++ trunk/packages/ocaml-benchmark/trunk/debian/control	2005-11-09 15:51:13 UTC (rev 1958)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
 Build-Depends: debhelper (>> 4.0.0), ocaml-nox-3.08.3, dpatch
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2.0
 
 Package: libbenchmark-ocaml-dev
 Architecture: any

Deleted: trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.dirs
===================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.dirs	2005-11-09 15:44:07 UTC (rev 1957)
+++ trunk/packages/ocaml-benchmark/trunk/debian/libbenchmark-ocaml-dev.dirs	2005-11-09 15:51:13 UTC (rev 1958)
@@ -1 +0,0 @@
-/usr/lib/ocaml/3.08.3/

Modified: trunk/packages/ocaml-benchmark/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-benchmark/trunk/debian/rules	2005-11-09 15:44:07 UTC (rev 1957)
+++ trunk/packages/ocaml-benchmark/trunk/debian/rules	2005-11-09 15:51:13 UTC (rev 1958)
@@ -1,19 +1,15 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
+# Sample debian/rules that uses debhelper for benchmark.
+# GNU copyright 2005 by Sylvain Le Gall.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-# We want to use dpatch.
 include /usr/share/dpatch/dpatch.make
 PACKAGE = benchmark
+DESTDIR_DEV=$(CURDIR)/debian/libbenchmark-ocaml-dev/
 
-OCAML_LIBDIR=`ocamlc -where`
+OCAMLIBDIR=`ocamlc -where`
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-build: configure-stamp build-stamp
+build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
 	if [ -x /usr/bin/ocamlopt ]; then \
@@ -36,24 +32,21 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
-	if [ -x /usr/bin/ocamlopt ]; then \
-		$(MAKE) install DESTDIR=$(CURDIR)/debian/libbenchmark-ocaml-dev/$(OCAML_LIBDIR); \
+	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
+	if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then \
+		$(MAKE) install DESTDIR=$(DESTDIR_DEV)/$(OCAMLIBDIR); \
 	else \
-		$(MAKE) installbyte DESTDIR=$(CURDIR)/debian/libbenchmark-ocaml-dev/$(OCAML_LIBDIR); \
+		$(MAKE) installbyte DESTDIR=$(DESTDIR_DEV)/$(OCAMLIBDIR); \
 	fi
 
-
-# Build architecture-independent files here.
 binary-indep: build install
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir -s
 	dh_testroot -s
 	dh_installdocs -s
-	mv $(CURDIR)/debian/libbenchmark-ocaml-dev/usr/share/doc/libbenchmark-ocaml-dev/doc \
-	   $(CURDIR)/debian/libbenchmark-ocaml-dev/usr/share/doc/libbenchmark-ocaml-dev/html
+	mv $(DESTDIR_DEV)/usr/share/doc/libbenchmark-ocaml-dev/doc \
+	   $(DESTDIR_DEV)/usr/share/doc/libbenchmark-ocaml-dev/html
 	dh_installexamples -s 
 	dh_installchangelogs -s 
 	dh_link -s