[Pkg-ocaml-maint-commits] r5772 - in /trunk/packages/ocamlgraph: trunk/debian/ trunk/debian/patches/ upstream/
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Fri Jun 20 13:13:22 UTC 2008
Author: zack
Date: Fri Jun 20 13:13:22 2008
New Revision: 5772
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5772
Log:
* new upstream release (Closes: #486910)
* fix vcs-svn field to point just above the debian/ dir
* debian/watch: update to point to the new homepage
* debian/control: update Homepage field to point to the new homepage
* debian/patches/
- 00dpatch.conf: add dpatch configuration fail pointing to ../upstream for
upstream tarballs
- 01_makefile.dpatch: refresh wrt latest upstream Makefile.in
* debian/libocamlgraph-ocaml-dev.examples: refresh according to new upstream
example placement
Added:
trunk/packages/ocamlgraph/trunk/debian/patches/00dpatch.conf
trunk/packages/ocamlgraph/upstream/ocamlgraph_0.99c.orig.tar.gz (with props)
Removed:
trunk/packages/ocamlgraph/upstream/ocamlgraph_0.98.orig.tar.gz
Modified:
trunk/packages/ocamlgraph/trunk/debian/changelog
trunk/packages/ocamlgraph/trunk/debian/control
trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.examples
trunk/packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch
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=5772&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/changelog (original)
+++ trunk/packages/ocamlgraph/trunk/debian/changelog Fri Jun 20 13:13:22 2008
@@ -1,16 +1,20 @@
-ocamlgraph (0.98-4) UNRELEASED; urgency=low
-
- [ Sylvain Le Gall ]
- * NOT RELEASED YET
+ocamlgraph (0.99c-1) UNRELEASED; urgency=low
[ Stefano Zacchiroli ]
+ * new upstream release (Closes: #486910)
* promote Homepage to a real debian/control field
+ * fix vcs-svn field to point just above the debian/ dir
+ * debian/watch: update to point to the new homepage
+ * debian/control: update Homepage field to point to the new homepage
+ * debian/patches/
+ - 00dpatch.conf: add dpatch configuration fail pointing to ../upstream for
+ upstream tarballs
+ - 01_makefile.dpatch: refresh wrt latest upstream Makefile.in
+ * debian/libocamlgraph-ocaml-dev.examples: refresh according to new upstream
+ example placement
[ Sylvain Le Gall ]
* Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
-
- [ Stefano Zacchiroli ]
- * fix vcs-svn field to point just above the debian/ dir
-- Sylvain Le Gall <gildor at debian.org> Thu, 18 Oct 2007 01:12:48 +0200
Modified: trunk/packages/ocamlgraph/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/control?rev=5772&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/control (original)
+++ trunk/packages/ocamlgraph/trunk/debian/control Fri Jun 20 13:13:22 2008
@@ -4,7 +4,7 @@
Maintainer: Sylvain Le Gall <gildor at debian.org>
Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-9), ocamlweb, ocaml-findlib (>= 1.1.2pl1-4)
Standards-Version: 3.7.2
-Homepage: http://www.lri.fr/~filliatr/ocamlgraph/
+Homepage: http://ocamlgraph.lri.fr/
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/
Modified: trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.examples
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.examples?rev=5772&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.examples (original)
+++ trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.examples Fri Jun 20 13:13:22 2008
@@ -1,4 +1,1 @@
-color.ml
-demo.ml
-demo_planar.ml
-sudoku.ml
+examples/*
Added: trunk/packages/ocamlgraph/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/patches/00dpatch.conf?rev=5772&op=file
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/patches/00dpatch.conf (added)
+++ trunk/packages/ocamlgraph/trunk/debian/patches/00dpatch.conf Fri Jun 20 13:13:22 2008
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../upstream
Modified: trunk/packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch?rev=5772&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch (original)
+++ trunk/packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch Fri Jun 20 13:13:22 2008
@@ -1,40 +1,23 @@
-#! /bin/sh -e
-## 01_makefile.dpatch by Sylvain Le Gall <gildor at debian.org>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_makefile.dpatch by Stefano Zacchiroli <zack at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
+## DP: ship .mli files and make ocamlfind install target choose the "best"
+## compiled objects (avoid trying to install native code objects on bytecode
+## only architectures)
@DPATCH@
-diff -urNad ocamlgraph-0.97~/Makefile.in ocamlgraph-0.97/Makefile.in
---- ocamlgraph-0.97~/Makefile.in 2006-07-20 09:30:39.000000000 +0200
-+++ ocamlgraph-0.97/Makefile.in 2006-09-15 01:13:22.000000000 +0200
-@@ -153,15 +153,23 @@
- install: install-$(OCAMLBEST)
+diff -urNad trunk~/Makefile.in trunk/Makefile.in
+--- trunk~/Makefile.in 2008-04-03 17:16:32.000000000 +0200
++++ trunk/Makefile.in 2008-06-20 14:07:10.000000000 +0200
+@@ -207,16 +207,28 @@
install-byte:
-- cp -f graph.cmo graph.cmi $(CMA) $(OCAMLLIB)
-+ cp -f *.mli graph.cmo graph.cmi $(CMA) $(OCAMLLIB)
+ cp -f graph.cmo graph.cmi $(CMA) "$(OCAMLLIB)"
++ cp -f $(MLI) "$(OCAMLLIB)"
install-opt: install-byte
- cp -f graph$(LIBEXT) graph.cmx $(CMXA) $(OCAMLLIB)
+ cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(OCAMLLIB)"
-install-findlib: META
+install-findlib: install-findlib-$(OCAMLBEST)
@@ -43,14 +26,27 @@
ifdef OCAMLFIND
- $(OCAMLFIND) install ocamlgraph META *.mli \
- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
++ mkdir -p $(DESTDIR)
+ $(OCAMLFIND) install $(if $(DESTDIR),-destdir $(DESTDIR)) \
-+ ocamlgraph META *.mli graph.a graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
-+endif
-+
++ ocamlgraph META $(MLI) graph.a graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
+ endif
+
+install-findlib-byte: META
+ifdef OCAMLFIND
++ mkdir -p $(DESTDIR)
+ $(OCAMLFIND) install $(if $(DESTDIR),-destdir $(DESTDIR)) \
-+ ocamlgraph META *.mli graph.cmi graph.cmo $(CMA)
- endif
++ ocamlgraph META $(MLI) graph.cmi graph.cmo $(CMA)
++endif
++
++
+ # documentation
+ ###############
- # documentation
+@@ -226,6 +238,7 @@
+ NODOC := $(patsubst %, $(SRCDIR)/%.cmo, $(NODOC))
+ DOC_CMO = $(filter-out $(NODOC) $(LIB), $(CMO))
+ DOC_SRC = $(CMI:.cmi=.mli) $(DOC_CMO:.cmo=.mli) $(DOC_CMO:.cmo=.ml)
++MLI = $(filter %.mli, $(DOC_SRC))
+
+ .PHONY: doc
+ doc: $(DOC_CMO)
Modified: trunk/packages/ocamlgraph/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/watch?rev=5772&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/watch (original)
+++ trunk/packages/ocamlgraph/trunk/debian/watch Fri Jun 20 13:13:22 2008
@@ -1,2 +1,2 @@
version=3
-http://www.lri.fr/~filliatr/ftp/ocamlgraph/ocamlgraph-([0-9].*)\.tar\.gz
+http://ocamlgraph.lri.fr/download/ocamlgraph-([0-9a-z.]+).tar.gz
Added: trunk/packages/ocamlgraph/upstream/ocamlgraph_0.99c.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/upstream/ocamlgraph_0.99c.orig.tar.gz?rev=5772&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/ocamlgraph/upstream/ocamlgraph_0.99c.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list