[Pkg-ocaml-maint-commits] r3414 - in
/trunk/packages/ocsigen/trunk/debian: changelog control patches/
patches/00list patches/depend.dpatch rules
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Tue Dec 19 22:40:03 CET 2006
Author: smimram
Date: Tue Dec 19 22:40:03 2006
New Revision: 3414
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3414
Log:
Added depends.dpatch in order to really solve the compilation problem with -rsudo.
Added:
trunk/packages/ocsigen/trunk/debian/patches/
trunk/packages/ocsigen/trunk/debian/patches/00list
trunk/packages/ocsigen/trunk/debian/patches/depend.dpatch (with props)
Modified:
trunk/packages/ocsigen/trunk/debian/changelog
trunk/packages/ocsigen/trunk/debian/control
trunk/packages/ocsigen/trunk/debian/rules
Modified: trunk/packages/ocsigen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/changelog?rev=3414&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/changelog (original)
+++ trunk/packages/ocsigen/trunk/debian/changelog Tue Dec 19 22:40:03 2006
@@ -1,3 +1,11 @@
+ocsigen (0.5.1-2) unstable; urgency=low
+
+ * Using dpatch to handle patches.
+ * Added depends.dpatch in order to really solve the compilation problem with
+ -rsudo, closes: #403132.
+
+ -- Samuel Mimram <smimram at debian.org> Mon, 18 Dec 2006 09:41:22 +0000
+
ocsigen (0.5.1-1) unstable; urgency=low
* New upstream release.
Modified: trunk/packages/ocsigen/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/control?rev=3414&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/control (original)
+++ trunk/packages/ocsigen/trunk/debian/control Tue Dec 19 22:40:03 2006
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 5), ocaml-nox (>= 3.08.4), ocaml-findlib, libocamlnet-ocaml-dev (>= 1.1), libdbi-ocaml-dev, libssl-ocaml-dev (>= 0.4.0-1)
+Build-Depends: debhelper (>= 5), dpatch, ocaml-nox (>= 3.08.4), ocaml-findlib, libocamlnet-ocaml-dev (>= 1.1), libdbi-ocaml-dev, libssl-ocaml-dev (>= 0.4.0-1)
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocsigen
Added: trunk/packages/ocsigen/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/patches/00list?rev=3414&op=file
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/patches/00list (added)
+++ trunk/packages/ocsigen/trunk/debian/patches/00list Tue Dec 19 22:40:03 2006
@@ -1,0 +1,1 @@
+depend
Added: trunk/packages/ocsigen/trunk/debian/patches/depend.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/patches/depend.dpatch?rev=3414&op=file
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/patches/depend.dpatch (added)
+++ trunk/packages/ocsigen/trunk/debian/patches/depend.dpatch Tue Dec 19 22:40:03 2006
@@ -1,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## depend.dpatch by Vincent Balat <vincent.balat at pps.jussieu.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't remove depend when cleaning.
+
+ at DPATCH@
+diff -urNad ocsigen-0.5.1~/Makefile ocsigen-0.5.1/Makefile
+--- ocsigen-0.5.1~/Makefile 2006-12-17 17:02:31.000000000 +0000
++++ ocsigen-0.5.1/Makefile 2006-12-18 09:43:49.000000000 +0000
+@@ -48,9 +48,10 @@
+ doc:
+ $(CAMLDOC) $(PP) -package ssl -I lib -d doc/lwt -html lwt/lwt.mli lwt/lwt_unix.mli
+ $(CAMLDOC) $(PP) -I lib -d doc/oc -html server/ocsigen.mli xmlp4/ohl-xhtml/xHTML.mli server/ocsigenboxes.mli baselib/messages.ml
++
+ clean:
+- @for i in $(REPS) ; do touch "$$i"/.depend ; done
+- @for i in $(REPS) ; do $(MAKE) -C $$i clean ; rm -f "$$i"/.depend ; done
++ - at for i in $(REPS) ; do touch "$$i"/.depend ; done
++ - at for i in $(REPS) ; do $(MAKE) -C $$i clean ; rm -f "$$i"/.depend ; done
+ -rm -f lib/* *~
+ -rm -f bin/* *~
+
+diff -urNad ocsigen-0.5.1~/lwt/Makefile ocsigen-0.5.1/lwt/Makefile
+--- ocsigen-0.5.1~/lwt/Makefile 2006-11-19 15:04:31.000000000 +0000
++++ ocsigen-0.5.1/lwt/Makefile 2006-12-18 09:43:49.000000000 +0000
+@@ -63,7 +63,7 @@
+ $(OCAMLFIND) remove $(NAME)
+
+ clean::
+- rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.a *.o *~ *.bak *.annot
++ rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.a *.o *~ *.bak *.annot depend
+
+ clean::
+ cd example && make clean
+diff -urNad ocsigen-0.5.1~/xmlp4/Makefile ocsigen-0.5.1/xmlp4/Makefile
+--- ocsigen-0.5.1~/xmlp4/Makefile 2006-12-14 16:26:54.000000000 +0000
++++ ocsigen-0.5.1/xmlp4/Makefile 2006-12-18 09:43:49.000000000 +0000
+@@ -19,8 +19,8 @@
+ rm .depend
+ touch oldocaml/.depend
+ touch newocaml/.depend
+- $(MAKE) -C oldocaml clean
+- $(MAKE) -C newocaml clean
++ -$(MAKE) -C oldocaml clean
++ -$(MAKE) -C newocaml clean
+ rm oldocaml/.depend
+ rm newocaml/.depend
+
+diff -urNad ocsigen-0.5.1~/xmlp4/ohl-xhtml/Makefile ocsigen-0.5.1/xmlp4/ohl-xhtml/Makefile
+--- ocsigen-0.5.1~/xmlp4/ohl-xhtml/Makefile 2006-11-08 16:25:43.000000000 +0000
++++ ocsigen-0.5.1/xmlp4/ohl-xhtml/Makefile 2006-12-18 09:43:49.000000000 +0000
+@@ -61,8 +61,8 @@
+ $(OCAMLC) -c -o $@ $<
+
+ clean:
+- rm -f *.o *.cm[iox] *.cma *.cmxa *.a *~
+- @for d in $(SUBDIRS); do test -d $$d && $(MAKE) -C $$d clean; done
++ -rm -f *.o *.cm[iox] *.cma *.cmxa *.a *~
++ - at for d in $(SUBDIRS); do test -d $$d && $(MAKE) -C $$d clean; done
+
+ ########################################################################
+
+diff -urNad ocsigen-0.5.1~/xmlp4/oldocaml/Makefile ocsigen-0.5.1/xmlp4/oldocaml/Makefile
+--- ocsigen-0.5.1~/xmlp4/oldocaml/Makefile 2006-11-19 15:04:32.000000000 +0000
++++ ocsigen-0.5.1/xmlp4/oldocaml/Makefile 2006-12-18 09:43:49.000000000 +0000
+@@ -68,7 +68,6 @@
+ -rm -f *.cm[ioax] *~ *.annot
+ $(MAKE) -C exemple clean
+ $(MAKE) -C ../ohl-xhtml clean
+- touch .depend
+
+
+ # Dependencies
Propchange: trunk/packages/ocsigen/trunk/debian/patches/depend.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/packages/ocsigen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/debian/rules?rev=3414&op=diff
==============================================================================
--- trunk/packages/ocsigen/trunk/debian/rules (original)
+++ trunk/packages/ocsigen/trunk/debian/rules Tue Dec 19 22:40:03 2006
@@ -9,6 +9,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
OCAMLABI := $(shell ocamlc -version)
OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
@@ -18,7 +20,7 @@
ocamlinit:
for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-build: ocamlinit build-stamp
+build: patch ocamlinit build-stamp
build-stamp:
dh_testdir
@@ -28,7 +30,7 @@
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -79,4 +81,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
More information about the Pkg-ocaml-maint-commits
mailing list