[Pkg-ocaml-maint-commits] r3972 - in /trunk/packages/ledit/trunk/debian: changelog control patches/00list patches/camlp5.dpatch patches/ledit.dpatch

[zack at users.alioth.debian.org]

Author: zack
Date: Wed Jul 11 07:20:59 2007
New Revision: 3972

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3972
Log:
  - add build-dep on camlp5, since we need the classical camlp4
* debian/patches
  - remove ledit.dpatch, no longer needed
  - add camlp5.dpatch, to build properly against (renamed) classical camlp4

Added:
    trunk/packages/ledit/trunk/debian/patches/camlp5.dpatch   (with props)
Removed:
    trunk/packages/ledit/trunk/debian/patches/ledit.dpatch
Modified:
    trunk/packages/ledit/trunk/debian/changelog
    trunk/packages/ledit/trunk/debian/control
    trunk/packages/ledit/trunk/debian/patches/00list

Modified: trunk/packages/ledit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ledit/trunk/debian/changelog?rev=3972&op=diff
==============================================================================
--- trunk/packages/ledit/trunk/debian/changelog (original)
+++ trunk/packages/ledit/trunk/debian/changelog Wed Jul 11 07:20:59 2007
@@ -1,21 +1,18 @@
 ledit (1.14-1) UNRELEASED; urgency=low
-
-  * BIG FAT WARNING: ledit does not build against the new camlp4, we will need
-    one of:
-    - packaging camlp4s (http://cristal.inria.fr/~ddr/)
-    - porting ledit to the new camlp4
-    - dropping ledit from the archive
 
   * new upstream release
   * rebuild against ocaml 3.10.0 and upload to experimental
   * debian/control.in
     - file removed, no longer needed
   * debian/control
-    - add build-dep on camlp4, since now camlp4r is shipped there
+    - add build-dep on camlp5, since we need the classical camlp4
   * debian/watch
     - add watch file
+  * debian/patches
+    - remove ledit.dpatch, no longer needed
+    - add camlp5.dpatch, to build properly against (renamed) classical camlp4
 
- -- Stefano Zacchiroli <zack at debian.org>  Wed, 11 Jul 2007 09:09:17 +0200
+ -- Stefano Zacchiroli <zack at debian.org>  Wed, 11 Jul 2007 09:17:54 +0200
 
 ledit (1.13-2) unstable; urgency=low
 

Modified: trunk/packages/ledit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ledit/trunk/debian/control?rev=3972&op=diff
==============================================================================
--- trunk/packages/ledit/trunk/debian/control (original)
+++ trunk/packages/ledit/trunk/debian/control Wed Jul 11 07:20:59 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sven Luther <luther at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends-Indep: ocaml-nox (>= 3.09.2), camlp4 (>= 3.10.0-4)
+Build-Depends-Indep: ocaml-nox (>= 3.09.2), camlp5
 Build-Depends: debhelper (>> 4.0.0), dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ledit

Modified: trunk/packages/ledit/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ledit/trunk/debian/patches/00list?rev=3972&op=diff
==============================================================================
--- trunk/packages/ledit/trunk/debian/patches/00list (original)
+++ trunk/packages/ledit/trunk/debian/patches/00list Wed Jul 11 07:20:59 2007
@@ -1,1 +1,2 @@
-makefile
+makefile.dpatch
+camlp5.dpatch

Added: trunk/packages/ledit/trunk/debian/patches/camlp5.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ledit/trunk/debian/patches/camlp5.dpatch?rev=3972&op=file
==============================================================================
--- trunk/packages/ledit/trunk/debian/patches/camlp5.dpatch (added)
+++ trunk/packages/ledit/trunk/debian/patches/camlp5.dpatch Wed Jul 11 07:20:59 2007
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## camlp5.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2007-01-03 10:42:45.000000000 +0100
++++ trunk/Makefile	2007-07-11 09:16:40.000000000 +0200
+@@ -5,7 +5,9 @@
+ MANDIR=/usr/local/man/man1
+ OCAMLC=ocamlc
+ OCAMLOPT=ocamlopt
+-CAMLP4=camlp4 -I ext pa_s.cmo pr_dump.cmo
++CAMLPBASE=camlp5
++CAMLP4=$(CAMLPBASE) -I ext pa_s.cmo pr_dump.cmo
++CAMLP4R=$(CAMLPBASE)r
+ ZOFILES=cursor.cmo ledit.cmo go.cmo
+ TARGET=ledit.out
+ MKDIR=mkdir -p
+@@ -42,17 +44,17 @@
+ include .depend
+ 
+ ext/%.cmo: ext/%.ml
+-	camlp4r -I ext -loc loc $< -o ext/$*.ppo
+-	$(OCAMLC) -I +camlp4 -c -impl ext/$*.ppo
++	$(CAMLP4R) -I ext -loc loc $< -o ext/$*.ppo
++	$(OCAMLC) -I +$(CAMLPBASE) -c -impl ext/$*.ppo
+ 	rm -f ext/$*.ppo
+ 
+ %.cmo: %.ml
+ 	$(CAMLP4) $< -o $*.ppo
+-	$(OCAMLC) -I +camlp4 -c -impl $*.ppo
++	$(OCAMLC) -I +$(CAMLPBASE) -c -impl $*.ppo
+ 	/bin/rm -f $*.ppo
+ %.cmx: %.ml
+ 	$(CAMLP4) $< -o $*.ppo
+-	$(OCAMLOPT) -I +camlp4 -c -impl $*.ppo
++	$(OCAMLOPT) -I +$(CAMLPBASE) -c -impl $*.ppo
+ 	/bin/rm -f $*.ppo
+ %.cmi: %.mli
+ 	$(CAMLP4) $< -o $*.ppi

Propchange: trunk/packages/ledit/trunk/debian/patches/camlp5.dpatch
------------------------------------------------------------------------------
    svn:executable = *