[Pkg-ocaml-maint-commits] r3936 - in /trunk/packages/cmigrep/trunk/debian: changelog control patches/ patches/00list patches/01make-without-godi.dpatch rules

[treinen at users.alioth.debian.org]

Author: treinen
Date: Sat Jul  7 08:25:35 2007
New Revision: 3936

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3936
Log:
cmigrep 1.3-3 for ocaml 3.10

Added:
    trunk/packages/cmigrep/trunk/debian/patches/
    trunk/packages/cmigrep/trunk/debian/patches/00list
    trunk/packages/cmigrep/trunk/debian/patches/01make-without-godi.dpatch   (with props)
Modified:
    trunk/packages/cmigrep/trunk/debian/changelog
    trunk/packages/cmigrep/trunk/debian/control
    trunk/packages/cmigrep/trunk/debian/rules

Modified: trunk/packages/cmigrep/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/changelog?rev=3936&op=diff
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/changelog (original)
+++ trunk/packages/cmigrep/trunk/debian/changelog Sat Jul  7 08:25:35 2007
@@ -1,3 +1,12 @@
+cmigrep (1.3-3) experimental; urgency=low
+
+  * Rebuild against ocaml 3.10
+  * Use dpatch
+  * Patch 01make-without-godi: provide in the Makefile directly the include
+    paths for the compiler libs.
+
+ -- Ralf Treinen <treinen at debian.org>  Sat, 07 Jul 2007 10:22:03 +0200
+
 cmigrep (1.3-2) unstable; urgency=high
 
   * Removed trailing common in the uploaders field (closes: Bug#426486).

Modified: trunk/packages/cmigrep/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/control?rev=3936&op=diff
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/control (original)
+++ trunk/packages/cmigrep/trunk/debian/control Sat Jul  7 08:25:35 2007
@@ -5,7 +5,7 @@
 Uploaders: Ralf Treinen <treinen at debian.org>, 
  Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram at debian.org>,
  Stefano Zacchiroli <zack at debian.org>, Sven Luther <luther at debian.org>
-Build-Depends: debhelper (>= 5.0)
+Build-Depends: debhelper (>= 5.0), dpatch
 Build-Depends-Indep: ocaml-nox (>= 3.09.1), libpcre-ocaml-dev, ocaml-findlib,
  ocaml-compiler-libs
 Standards-Version: 3.7.2

Added: trunk/packages/cmigrep/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/patches/00list?rev=3936&op=file
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/patches/00list (added)
+++ trunk/packages/cmigrep/trunk/debian/patches/00list Sat Jul  7 08:25:35 2007
@@ -1,0 +1,1 @@
+01make-without-godi

Added: trunk/packages/cmigrep/trunk/debian/patches/01make-without-godi.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/patches/01make-without-godi.dpatch?rev=3936&op=file
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/patches/01make-without-godi.dpatch (added)
+++ trunk/packages/cmigrep/trunk/debian/patches/01make-without-godi.dpatch Sat Jul  7 08:25:35 2007
@@ -1,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01make-without-godi.dpatch by Ralf Treinen <treinen at debian.org>
+##
+## DP: Compile without godi. Provide directly the include directories for
+## DP: the compiler-libs.
+
+ at DPATCH@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2007-04-01 16:43:39.000000000 +0200
++++ trunk/Makefile	2007-07-07 10:18:23.000000000 +0200
+@@ -16,17 +16,15 @@
+ includecore.cmo includemod.cmo parmatch.cmo typetexp.cmo stypes.cmo	\
+ typecore.cmo typedecl.cmo typeclass.cmo typemod.cmo cmigrep.ml
+ 
+-
+-GODI_CONF=$(shell godi_confdir)
+-GODI_BASE=$(shell cat $(GODI_CONF)/godi.conf | grep ^LOCALBASE | sed -e 's/LOCALBASE *= *//')
+-GODI_LIB=$(GODI_BASE)/lib/ocaml/compiler-lib
++COMPILERLIBFLAGS=-I +compiler-libs/parsing -I +compiler-libs/typing     \
++-I +compiler-libs/utils
+ 
+ all:
+-	ocamlfind ocamlopt -o cmigrep -I $(GODI_LIB) \
++	ocamlfind ocamlopt -o cmigrep $(COMPILERLIBFLAGS) \
+ 	-package pcre,findlib,unix -linkpkg $(SOURCES)
+ 
+ byte:
+-	ocamlfind ocamlc -o cmigrep -I $(GODI_LIB) \
++	ocamlfind ocamlc -o cmigrep $(COMPILERLIBFLAGS) \
+ 	-package pcre,findlib,unix -linkpkg $(BYTESOURCES)
+ 
+ install:

Propchange: trunk/packages/cmigrep/trunk/debian/patches/01make-without-godi.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/cmigrep/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/rules?rev=3936&op=diff
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/rules (original)
+++ trunk/packages/cmigrep/trunk/debian/rules Sat Jul  7 08:25:35 2007
@@ -3,15 +3,17 @@
 
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
+
 OCAMLABI := $(shell ocamlc -version)
 
 build: cmigrep
 
-cmigrep:
+cmigrep: patch
 	dh_testdir
 	make byte GODI_LIB=/usr/lib/ocaml/$(OCAMLABI)/compiler-libs
 
-clean: 
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean
@@ -44,4 +46,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch