[Pkg-ocaml-maint-commits] r3506 - in /trunk/packages/ocamlgraph/trunk/debian: changelog control control.in rules watch

[gildor at users.alioth.debian.org]

Author: gildor
Date: Sun Jan  7 23:05:03 2007
New Revision: 3506

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3506
Log:
* Upgrade debian/watch version to 3,
* Use ocaml.mk,
-- SLG

Modified:
    trunk/packages/ocamlgraph/trunk/debian/changelog
    trunk/packages/ocamlgraph/trunk/debian/control
    trunk/packages/ocamlgraph/trunk/debian/control.in
    trunk/packages/ocamlgraph/trunk/debian/rules
    trunk/packages/ocamlgraph/trunk/debian/watch

Modified: trunk/packages/ocamlgraph/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/changelog?rev=3506&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/changelog (original)
+++ trunk/packages/ocamlgraph/trunk/debian/changelog Sun Jan  7 23:05:03 2007
@@ -1,3 +1,10 @@
+ocamlgraph (0.98-2) UNRELEASED; urgency=low
+
+  * Upgrade debian/watch version to 3,
+  * Use ocaml.mk,
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sun,  5 Nov 2006 16:23:31 +0100
+
 ocamlgraph (0.98-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/ocamlgraph/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/control?rev=3506&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/control (original)
+++ trunk/packages/ocamlgraph/trunk/debian/control Sun Jan  7 23:05:03 2007
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2), ocamlweb, ocaml-findlib
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), ocamlweb, ocaml-findlib
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgraph
 

Modified: trunk/packages/ocamlgraph/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/control.in?rev=3506&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/control.in (original)
+++ trunk/packages/ocamlgraph/trunk/debian/control.in Sun Jan  7 23:05:03 2007
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocaml-nox (>= 3.09.2), ocamlweb, ocaml-findlib
+Build-Depends: @cdbs@, ocamlweb, ocaml-findlib
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgraph
 

Modified: trunk/packages/ocamlgraph/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/rules?rev=3506&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/rules (original)
+++ trunk/packages/ocamlgraph/trunk/debian/rules Sun Jan  7 23:05:03 2007
@@ -23,37 +23,16 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/autotools.mk
-
-OCAMLABI               := $(shell ocamlc -version)
-DEB_DH_GENCONTROL_ARGS += -- -VF:OCamlABI="$(OCAMLABI)"
-OCAML_STDLIB_DIR       := $(shell ocamlc -where)
-
-OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-
-ocamlinit:
-	echo -n > $(CURDIR)/ocamlinit-stamp; \
-	for f in $(OFILES); do \
-	  sed -e 's/@OCamlStdlibDir@/$(subst /,\/,$(OCAML_STDLIB_DIR))/g' \
-	  $$f.in > $$f; \
-	  echo $$f >> $(CURDIR)/ocamlinit-stamp; \
-	done
-
-clean::
-	if [ -e $(CURDIR)/ocamlinit-stamp ]; then \
-	  for f in `cat $(CURDIR)/ocamlinit-stamp`; do \
-	    if [ -e $$f.in ] && [ -e $$f ]; then \
-	      $(RM) $$f; \
-	    fi; \
-	  done; \
-	  $(RM) $(CURDIR)/ocamlinit-stamp; \
-	fi
+include /usr/share/cdbs/1/class/ocaml.mk
 
 DEB_MAKE_CLEAN_TARGET    := distclean
 DEB_MAKE_BUILD_TARGET    := all doc
 DEB_MAKE_INSTALL_TARGET  := install-findlib DESTDIR="$(DEB_DESTDIR)/$(OCAML_STDLIB_DIR)"
 
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
+
 clean::
-	-$(RM) -r doc 
-	-$(RM) *.byte *.opt
-
-common-configure-indep common-configure-arch:: ocamlinit
+	-$(RM) -r $(CURDIR)/doc 
+	-$(RM) $(CURDIR)/*.byte 
+	-$(RM) $(CURDIR)/*.opt
+	-$(RM) $(CURDIR)/debian/libocamlgraph-ocaml-dev.dirs

Modified: trunk/packages/ocamlgraph/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/watch?rev=3506&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/watch (original)
+++ trunk/packages/ocamlgraph/trunk/debian/watch Sun Jan  7 23:05:03 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
 http://www.lri.fr/~filliatr/ftp/ocamlgraph/ocamlgraph-([0-9].*)\.tar\.gz