[Pkg-ocaml-maint-commits] r5775 - in /trunk/packages/ocamlgraph/trunk/debian: ./ patches/
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Fri Jun 20 15:17:38 UTC 2008
Author: zack
Date: Fri Jun 20 15:17:37 2008
New Revision: 5775
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5775
Log:
- split a new binary package ocamlgraph-editor to ship the GNOME-based
graph editor based on hyperbolic geometry
- revamp long description mentioning new functionality
- in long description, formats list items properly as pre-formatted lines
(Closes: #480338)
- add Build-Depends on liblablgtk2{-gnome,}-ocaml-dev to build the editor
- 02_editor_naming.dpatch: (new patch) rename the best built editor to
"ocamlgraph-editor"
- remove no longer applied patches: 02_literals_overflow.dpatch,
03_META.dpatch, 04_ocamldoc_coloring.dpatch
Added:
trunk/packages/ocamlgraph/trunk/debian/ocamlgraph-editor.dirs
trunk/packages/ocamlgraph/trunk/debian/ocamlgraph-editor.install
trunk/packages/ocamlgraph/trunk/debian/patches/02_editor_naming.dpatch (with props)
Removed:
trunk/packages/ocamlgraph/trunk/debian/patches/02_literals_overflow.dpatch
trunk/packages/ocamlgraph/trunk/debian/patches/03_META.dpatch
trunk/packages/ocamlgraph/trunk/debian/patches/04_ocamldoc_coloring.dpatch
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/patches/00list
trunk/packages/ocamlgraph/trunk/debian/rules
Modified: trunk/packages/ocamlgraph/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/changelog?rev=5775&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/changelog (original)
+++ trunk/packages/ocamlgraph/trunk/debian/changelog Fri Jun 20 15:17:37 2008
@@ -2,16 +2,26 @@
[ Stefano Zacchiroli ]
* new upstream release (Closes: #486910)
+ - split a new binary package ocamlgraph-editor to ship the GNOME-based
+ graph editor based on hyperbolic geometry
* 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
- drop versioning in cdbs dependency, the required version is in stable
+ - revamp long description mentioning new functionality
+ - in long description, formats list items properly as pre-formatted lines
+ (Closes: #480338)
+ - add Build-Depends on liblablgtk2{-gnome,}-ocaml-dev to build the editor
* debian/patches/
- 00dpatch.conf: add dpatch configuration fail pointing to ../upstream for
upstream tarballs
- 01_makefile.dpatch: refresh wrt latest upstream Makefile.in
+ - 02_editor_naming.dpatch: (new patch) rename the best built editor to
+ "ocamlgraph-editor"
+ - remove no longer applied patches: 02_literals_overflow.dpatch,
+ 03_META.dpatch, 04_ocamldoc_coloring.dpatch
* debian/libocamlgraph-ocaml-dev.examples: refresh according to new upstream
example placement
* bump Standards-Version to 3.8.0, no changes needed
Modified: trunk/packages/ocamlgraph/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/control?rev=5775&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/control (original)
+++ trunk/packages/ocamlgraph/trunk/debian/control Fri Jun 20 15:17:37 2008
@@ -2,12 +2,11 @@
Section: libdevel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs,
- debhelper (>= 5),
- dpatch,
- ocaml-nox (>= 3.10.0-9),
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-9),
ocamlweb,
- ocaml-findlib (>= 1.1.2pl1-4)
+ ocaml-findlib (>= 1.1.2pl1-4),
+ liblablgtk2-ocaml-dev,
+ liblablgtk2-gnome-ocaml-dev
Standards-Version: 3.8.0
Homepage: http://ocamlgraph.lri.fr/
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk
@@ -19,18 +18,47 @@
Depends: ocaml-nox-${F:OCamlABI}
Suggests: graphviz | springgraph
Description: graph library for OCaml
- Ocamlgraph is a graph library which provides the following
- contribution :
- - An easy-to-use graph data structure together with
- several operations and algorithms over graphs. It also
- provides more complex graph structures ( persistent, imperative,
- with label for vertices, with label for edges... )
+ Ocamlgraph is a graph library for OCaml. Its contribution is
+ three-fold:
.
- - Several classic operations and algorithms over
- graphs. ( Graph traversal, Strongly connected components,
- Ford-Fulkerson maximal flow algorithm, Delaunay triangulation,
- Kruskal's algorithm, Goldberg maximal flow algorithm, mirror,
- complement, transitive_closure ).
+ * It provides an easy-to-use graph data structure together with
+ several operations and algorithms over graphs. It is a
+ reasonably efficient imperative data structure for directed
+ graphs with vertices and edges labeled with integers.
.
- Each algorithm is made over functor, those allowing to create your
- own graph, by only providing a small set of functionality.
+ * Then ocamlgraph provides several other graph implementations
+ for those not satisfied with the one above. Some are
+ persistent (imutable) and other imperative (mutable). Some
+ are directed and other are not. Some have labels for
+ vertices, or labels for edges, or both. Some have abstract
+ types for vertices. etc.
+ These implementations are written as functors: you give the
+ types of vertices labels, edge labels, etc. and you get the
+ data structure as a result.
+ .
+ * Finally, ocamlgraph provides several classic operations and
+ algorithms over graphs.
+ They are also written as functors i.e. independently of the
+ data structure for graphs. One consequence is that you can
+ define your own data structure for graphs and yet re-use all
+ the algorithms from this library -- you only need to provide
+ a few operations such as iterating over all vertices, over
+ the successors of a vertex, etc.
+
+Package: ocamlgraph-editor
+Architecture: any
+Section: graphics
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${F:OCamlInterp}
+Description: graphical graph editor based on hyperbolic geometry
+ Ocamlgraph editor is an interactive graph editor for GNOME; it is based
+ on hyperbolic geometry (it "zooms" more on graph nodes which are in the
+ center of the editing area and zooms less on periferic nodes).
+ .
+ Ocamlgraph editor works with the following file formats to load and
+ save graphs: GML (Graph Modelling Language), DOT (the file format used
+ by Graphviz).
+ .
+ Ocamlgraph is still to be considered experimental.
+
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=5775&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/control.in (original)
+++ trunk/packages/ocamlgraph/trunk/debian/control.in Fri Jun 20 15:17:37 2008
@@ -2,9 +2,13 @@
Section: libdevel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, ocamlweb, ocaml-findlib (>= 1.1.2pl1-4)
-Standards-Version: 3.7.2
-Homepage: http://www.lri.fr/~filliatr/ocamlgraph/
+Build-Depends: @cdbs@,
+ ocamlweb,
+ ocaml-findlib (>= 1.1.2pl1-4),
+ liblablgtk2-ocaml-dev,
+ liblablgtk2-gnome-ocaml-dev
+Standards-Version: 3.8.0
+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/
@@ -14,18 +18,47 @@
Depends: ocaml-nox-${F:OCamlABI}
Suggests: graphviz | springgraph
Description: graph library for OCaml
- Ocamlgraph is a graph library which provides the following
- contribution :
- - An easy-to-use graph data structure together with
- several operations and algorithms over graphs. It also
- provides more complex graph structures ( persistent, imperative,
- with label for vertices, with label for edges... )
+ Ocamlgraph is a graph library for OCaml. Its contribution is
+ three-fold:
.
- - Several classic operations and algorithms over
- graphs. ( Graph traversal, Strongly connected components,
- Ford-Fulkerson maximal flow algorithm, Delaunay triangulation,
- Kruskal's algorithm, Goldberg maximal flow algorithm, mirror,
- complement, transitive_closure ).
+ * It provides an easy-to-use graph data structure together with
+ several operations and algorithms over graphs. It is a
+ reasonably efficient imperative data structure for directed
+ graphs with vertices and edges labeled with integers.
.
- Each algorithm is made over functor, those allowing to create your
- own graph, by only providing a small set of functionality.
+ * Then ocamlgraph provides several other graph implementations
+ for those not satisfied with the one above. Some are
+ persistent (imutable) and other imperative (mutable). Some
+ are directed and other are not. Some have labels for
+ vertices, or labels for edges, or both. Some have abstract
+ types for vertices. etc.
+ These implementations are written as functors: you give the
+ types of vertices labels, edge labels, etc. and you get the
+ data structure as a result.
+ .
+ * Finally, ocamlgraph provides several classic operations and
+ algorithms over graphs.
+ They are also written as functors i.e. independently of the
+ data structure for graphs. One consequence is that you can
+ define your own data structure for graphs and yet re-use all
+ the algorithms from this library -- you only need to provide
+ a few operations such as iterating over all vertices, over
+ the successors of a vertex, etc.
+
+Package: ocamlgraph-editor
+Architecture: any
+Section: graphics
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${F:OCamlInterp}
+Description: graphical graph editor based on hyperbolic geometry
+ Ocamlgraph editor is an interactive graph editor for GNOME; it is based
+ on hyperbolic geometry (it "zooms" more on graph nodes which are in the
+ center of the editing area and zooms less on periferic nodes).
+ .
+ Ocamlgraph editor works with the following file formats to load and
+ save graphs: GML (Graph Modelling Language), DOT (the file format used
+ by Graphviz).
+ .
+ Ocamlgraph is still to be considered experimental.
+
Added: trunk/packages/ocamlgraph/trunk/debian/ocamlgraph-editor.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/ocamlgraph-editor.dirs?rev=5775&op=file
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/ocamlgraph-editor.dirs (added)
+++ trunk/packages/ocamlgraph/trunk/debian/ocamlgraph-editor.dirs Fri Jun 20 15:17:37 2008
@@ -1,0 +1,1 @@
+usr/bin
Added: trunk/packages/ocamlgraph/trunk/debian/ocamlgraph-editor.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/ocamlgraph-editor.install?rev=5775&op=file
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/ocamlgraph-editor.install (added)
+++ trunk/packages/ocamlgraph/trunk/debian/ocamlgraph-editor.install Fri Jun 20 15:17:37 2008
@@ -1,0 +1,1 @@
+editor/ocamlgraph-editor usr/bin/
Modified: trunk/packages/ocamlgraph/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/patches/00list?rev=5775&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/patches/00list (original)
+++ trunk/packages/ocamlgraph/trunk/debian/patches/00list Fri Jun 20 15:17:37 2008
@@ -1,1 +1,2 @@
-01_makefile
+01_makefile.dpatch
+02_editor_naming.dpatch
Added: trunk/packages/ocamlgraph/trunk/debian/patches/02_editor_naming.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/patches/02_editor_naming.dpatch?rev=5775&op=file
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/patches/02_editor_naming.dpatch (added)
+++ trunk/packages/ocamlgraph/trunk/debian/patches/02_editor_naming.dpatch Fri Jun 20 15:17:37 2008
@@ -1,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_editor_naming.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: rename the best built editor to "ocamlgraph-editor"
+
+ at DPATCH@
+diff -urNad trunk~/Makefile.in trunk/Makefile.in
+--- trunk~/Makefile.in 2008-06-20 17:15:32.000000000 +0200
++++ trunk/Makefile.in 2008-06-20 17:15:38.000000000 +0200
+@@ -203,7 +203,15 @@
+ # installation
+ ##############
+
+-install: install-$(OCAMLBEST) install-byte
++install: install-$(OCAMLBEST) install-byte best-editor-name
++best-editor-name:
++ if [ -f editor/editor.opt ] ; then \
++ cp editor/editor.opt editor/ocamlgraph-editor ; \
++ elif [ -f editor/editor.byte ] ; then \
++ cp editor/editor.byte editor/ocamlgraph-editor ; \
++ else \
++ false ; \
++ fi
+
+ install-byte:
+ cp -f graph.cmo graph.cmi $(CMA) "$(OCAMLLIB)"
+@@ -212,7 +220,7 @@
+ install-opt: install-byte
+ cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(OCAMLLIB)"
+
+-install-findlib: install-findlib-$(OCAMLBEST)
++install-findlib: install-findlib-$(OCAMLBEST) best-editor-name
+
+ install-findlib-opt: META
+ ifdef OCAMLFIND
+@@ -381,6 +389,7 @@
+ rm -f graph.*a graph$(LIBEXT) bin/$(NAME).byte bin/$(NAME).opt
+ rm -f *.haux *.aux *.log $(NAME).tex $(NAME).dvi $(DOCFILES)
+ rm -f $(EXAMPLESBIN)
++ $(MAKE) -C editor/ clean
+
+ dist-clean distclean:: clean
+ rm -f Makefile config.cache config.log config.status *.byte *.opt
+diff -urNad trunk~/editor/Makefile trunk/editor/Makefile
+--- trunk~/editor/Makefile 2008-04-03 17:16:32.000000000 +0200
++++ trunk/editor/Makefile 2008-06-20 17:15:33.000000000 +0200
+@@ -29,3 +29,5 @@
+ clean:
+ rm -f *.opt
+ rm -f *.cm[iox]
++ rm -f *.byte
++ rm -f ocamlgraph-editor
Propchange: trunk/packages/ocamlgraph/trunk/debian/patches/02_editor_naming.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/packages/ocamlgraph/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/rules?rev=5775&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/rules (original)
+++ trunk/packages/ocamlgraph/trunk/debian/rules Fri Jun 20 15:17:37 2008
@@ -26,12 +26,17 @@
include /usr/share/cdbs/1/class/ocaml.mk
DEB_MAKE_CLEAN_TARGET := distclean
-DEB_MAKE_BUILD_TARGET := all doc
+DEB_MAKE_BUILD_TARGET := all doc editor
DEB_MAKE_INSTALL_TARGET := install-findlib DESTDIR="$(DEB_DESTDIR)/$(OCAML_STDLIB_DIR)"
CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-9),$(CDBS_BUILD_DEPENDS))
OCAML_OCAMLDOC_PACKAGES_DOCBASE := libocamlgraph-ocaml-dev
+
+ifeq ($(OCAML_HAVE_OCAMLOPT),no)
+DEB_STRIP_EXCLUDE += usr/bin
+DEB_DH_GENCONTROL_ARGS += -VF:OCamlInterp="ocaml-base-nox-$(OCAML_ABI), liblablgtk2-ocaml, liblablgtk2-gnome-ocaml"
+endif
clean::
-$(RM) -r "$(CURDIR)/doc"
More information about the Pkg-ocaml-maint-commits
mailing list