[Pkg-ocaml-maint-commits] r1962 - trunk/packages/ocamlgraph/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-11-09 16:56:51 +0000 (Wed, 09 Nov 2005)
New Revision: 1962

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


Modified: trunk/packages/ocamlgraph/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlgraph/trunk/debian/changelog	2005-11-09 16:15:25 UTC (rev 1961)
+++ trunk/packages/ocamlgraph/trunk/debian/changelog	2005-11-09 16:56:51 UTC (rev 1962)
@@ -1,3 +1,10 @@
+ocamlgraph (0.95-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove direct reference to ocaml library dir
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 17:17:34 +0100
+
 ocamlgraph (0.94a-2) unstable; urgency=low
 
   * Transition to svn-buildpackage

Deleted: trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs
===================================================================
--- trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs	2005-11-09 16:15:25 UTC (rev 1961)
+++ trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs	2005-11-09 16:56:51 UTC (rev 1962)
@@ -1 +0,0 @@
-/usr/lib/ocaml/3.08.3

Modified: trunk/packages/ocamlgraph/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlgraph/trunk/debian/rules	2005-11-09 16:15:25 UTC (rev 1961)
+++ trunk/packages/ocamlgraph/trunk/debian/rules	2005-11-09 16:56:51 UTC (rev 1962)
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
+# Sample debian/rules that uses debhelper for ocamlgraph.
+# 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 = ocamlgraph
+DESTDIR_DEV=$(CURDIR)/debian/libocamlgraph-ocaml-dev
+OCAMLIBDIR=`ocamlc -where`
 
-OCAML_LIBDIR=`ocamlc -where`
-
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -35,7 +36,8 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install-findlib DESTDIR=$(CURDIR)/debian/libocamlgraph-ocaml-dev/$(OCAML_LIBDIR)
+	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
+	$(MAKE) install-findlib DESTDIR=$(DESTDIR_DEV)/$(OCAMLIBDIR)
 
 binary-indep: build install