[Pkg-ocaml-maint-commits] r3246 - in
/trunk/packages/ocamlgraph/trunk/debian: changelog compat control
control.in libocamlgraph-ocaml-dev.dirs.in libocamlgraph-ocaml-dev.docs
libocamlgraph-ocaml-dev.examples libocamlgraph-ocaml-dev.install
patches/01_makefile.dpatch rules
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Sun Oct 15 16:08:45 UTC 2006
Author: gildor
Date: Sun Oct 15 16:08:44 2006
New Revision: 3246
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3246
Log:
* Prepare 0.98 release,
* Move to CDBS and upgrade debhelper,
-- SLG
Added:
trunk/packages/ocamlgraph/trunk/debian/control.in
- copied, changed from r3227, trunk/packages/ocamlgraph/trunk/debian/control
trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs.in
trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.install
Modified:
trunk/packages/ocamlgraph/trunk/debian/changelog
trunk/packages/ocamlgraph/trunk/debian/compat
trunk/packages/ocamlgraph/trunk/debian/control
trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.docs
trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.examples
trunk/packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch
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=3246&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/changelog (original)
+++ trunk/packages/ocamlgraph/trunk/debian/changelog Sun Oct 15 16:08:44 2006
@@ -1,3 +1,12 @@
+ocamlgraph (0.98-1) unstable; urgency=low
+
+ * New upstream release
+ * Upgrade debhelper debian/compat to 5,
+ * Use CDBS for debian/rules,
+ * Add example sudoku.ml.
+
+ -- Sylvain Le Gall <gildor at debian.org> Fri, 13 Oct 2006 23:41:06 +0200
+
ocamlgraph (0.97-1) unstable; urgency=low
* New upstream version,
Modified: trunk/packages/ocamlgraph/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/compat?rev=3246&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/compat (original)
+++ trunk/packages/ocamlgraph/trunk/debian/compat Sun Oct 15 16:08:44 2006
@@ -1,1 +1,1 @@
-4
+5
Modified: trunk/packages/ocamlgraph/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/control?rev=3246&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/control (original)
+++ trunk/packages/ocamlgraph/trunk/debian/control Sun Oct 15 16:08:44 2006
@@ -2,7 +2,7 @@
Section: libdevel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.2), dpatch (>= 1.11), ocamlweb, ocaml-findlib
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2), ocamlweb, ocaml-findlib
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgraph
@@ -12,7 +12,7 @@
Depends: ocaml-nox-${F:OCamlABI}
Suggests: graphviz | springgraph
Description: graph library for OCaml
- Ocamlgraph is a graph library for OCaml. Provides the following
+ 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
@@ -27,4 +27,5 @@
.
Each algorithm is made over functor, those allowing to create your
own graph, by only providing a small set of functionality.
-
+ .
+ Homepage: http://www.lri.fr/~filliatr/ocamlgraph/
Copied: trunk/packages/ocamlgraph/trunk/debian/control.in (from r3227, trunk/packages/ocamlgraph/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/control.in?rev=3246&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/control (original)
+++ trunk/packages/ocamlgraph/trunk/debian/control.in Sun Oct 15 16:08:44 2006
@@ -2,7 +2,7 @@
Section: libdevel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.2), dpatch (>= 1.11), ocamlweb, ocaml-findlib
+Build-Depends: @cdbs@, ocaml-nox (>= 3.09.2), ocamlweb, ocaml-findlib
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgraph
@@ -12,7 +12,7 @@
Depends: ocaml-nox-${F:OCamlABI}
Suggests: graphviz | springgraph
Description: graph library for OCaml
- Ocamlgraph is a graph library for OCaml. Provides the following
+ 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
@@ -27,4 +27,5 @@
.
Each algorithm is made over functor, those allowing to create your
own graph, by only providing a small set of functionality.
-
+ .
+ Homepage: http://www.lri.fr/~filliatr/ocamlgraph/
Added: trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs.in?rev=3246&op=file
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs.in (added)
+++ trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.dirs.in Sun Oct 15 16:08:44 2006
@@ -1,0 +1,1 @@
+ at OCamlStdlibDir@
Modified: trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.docs?rev=3246&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.docs (original)
+++ trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.docs Sun Oct 15 16:08:44 2006
@@ -1,4 +1,3 @@
README
FAQ
CREDITS
-html
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=3246&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.examples (original)
+++ trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.examples Sun Oct 15 16:08:44 2006
@@ -1,3 +1,4 @@
color.ml
demo.ml
demo_planar.ml
+sudoku.ml
Added: trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.install?rev=3246&op=file
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.install (added)
+++ trunk/packages/ocamlgraph/trunk/debian/libocamlgraph-ocaml-dev.install Sun Oct 15 16:08:44 2006
@@ -1,0 +1,1 @@
+doc/* /usr/share/doc/libocamlgraph-ocaml-dev/html/
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=3246&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch (original)
+++ trunk/packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch Sun Oct 15 16:08:44 2006
@@ -54,48 +54,3 @@
endif
# documentation
-diff -urNad ocamlgraph-0.97~/Makefile.in.rej ocamlgraph-0.97/Makefile.in.rej
---- ocamlgraph-0.97~/Makefile.in.rej 1970-01-01 01:00:00.000000000 +0100
-+++ ocamlgraph-0.97/Makefile.in.rej 2006-09-15 01:11:45.000000000 +0200
-@@ -0,0 +1,41 @@
-+***************
-+*** 132,146 ****
-+ install: install-$(OCAMLBEST)
-+
-+ install-byte:
-+- cp -f graph.cmo graph.cmi $(CMA) $(OCAMLLIB)
-+
-+ install-opt: install-byte
-+ cp -f graph.a graph.cmx $(CMXA) $(OCAMLLIB)
-+
-+- install-findlib: META
-+ ifdef OCAMLFIND
-+- $(OCAMLFIND) install ocamlgraph META *.mli \
-+- graph.a graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
-+ endif
-+
-+ # documentation
-+--- 132,154 ----
-+ install: install-$(OCAMLBEST)
-+
-+ install-byte:
-++ cp -f *.mli graph.cmo graph.cmi $(CMA) $(OCAMLLIB)
-+
-+ install-opt: install-byte
-+ cp -f graph.a graph.cmx $(CMXA) $(OCAMLLIB)
-+
-++ install-findlib: install-findlib-$(OCAMLBEST)
-++
-++ install-findlib-opt: META
-+ ifdef OCAMLFIND
-++ $(OCAMLFIND) install $(if $(DESTDIR),-destdir $(DESTDIR)) \
-++ ocamlgraph META *.mli graph.a graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
-++ endif
-++
-++ install-findlib-byte: META
-++ ifdef OCAMLFIND
-++ $(OCAMLFIND) install $(if $(DESTDIR),-destdir $(DESTDIR)) \
-++ ocamlgraph META *.mli graph.cmi graph.cmo $(CMA)
-+ endif
-+
-+ # documentation
Modified: trunk/packages/ocamlgraph/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/trunk/debian/rules?rev=3246&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/rules (original)
+++ trunk/packages/ocamlgraph/trunk/debian/rules Sun Oct 15 16:08:44 2006
@@ -1,67 +1,48 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper for ocamlgraph.
-# GNU copyright 2005 by Sylvain Le Gall.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# debian/rules for headache package
+# Copyright (C) 2006 Sylvain Le Gall <gildor at debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
-include /usr/share/dpatch/dpatch.make
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-PACKAGE = ocamlgraph
-DESTDIR_DEV=$(CURDIR)/debian/libocamlgraph-ocaml-dev
-OCAMLIBDIR=`ocamlc -where`
-OCAMLABI=$(shell ocamlc -version)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+OCAMLABI := $(shell ocamlc -version)
+DEB_DH_GENCONTROL_ARGS += -- -VF:OCamlABI="$(OCAMLABI)"
+OCAML_STDLIB_DIR := $(shell ocamlc -where)
+
OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
ocamlinit:
- for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+ for f in $(OFILES); do \
+ sed -e 's/@OCamlStdlibDir@/$(subst /,\/,$(OCAML_STDLIB_DIR))/g' \
+ $$f.in > $$f; \
+ done
-configure: ocamlinit configure-stamp
-configure-stamp: patch-stamp
- dh_testdir
- ./configure
- touch configure-stamp
-build: configure-stamp build-stamp
-build-stamp:
- dh_testdir
- $(MAKE)
- $(MAKE) doc && mv doc html
- touch build-stamp
+DEB_MAKE_CLEAN_TARGET := distclean
+DEB_MAKE_BUILD_TARGET := all doc
+DEB_MAKE_INSTALL_TARGET := install-findlib DESTDIR="$(DEB_DESTDIR)/$(OCAML_STDLIB_DIR)"
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- -$(MAKE) distclean
+clean::
+ -$(RM) -r doc
-$(RM) *.byte *.opt
- -$(RM) -r html
- -$(RM) -r doc
- dh_clean
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
- $(MAKE) install-findlib DESTDIR=$(DESTDIR_DEV)/$(OCAMLIBDIR)
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir -s
- dh_testroot -s
- dh_installdocs -s
- dh_installexamples -s
- dh_installchangelogs CHANGES -s
- dh_link -s
- dh_strip -s
- dh_compress -s
- dh_fixperms -s
- dh_installdeb -s
- dh_shlibdeps -s
- dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)"
- dh_md5sums -s
- dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure ocamlinit
+common-configure-indep common-configure-arch:: ocamlinit
More information about the Pkg-ocaml-maint-commits
mailing list