[Pkg-ocaml-maint-commits] r3142 - in /trunk/packages/ocamlgraph:
trunk/debian/changelog
trunk/debian/control.in trunk/debian/patches/00list
trunk/debian/patches/01_makefile.dpatch trunk/debian/rules
upstream/ocamlgraph_0.96.orig.tar.gz upstream/ocamlgraph_0.97.orig.tar.gz
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Thu Sep 14 23:26:44 UTC 2006
Author: gildor
Date: Thu Sep 14 23:26:44 2006
New Revision: 3142
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3142
Log:
New upstream release -- SLG
Added:
trunk/packages/ocamlgraph/upstream/ocamlgraph_0.97.orig.tar.gz (with props)
Removed:
trunk/packages/ocamlgraph/trunk/debian/control.in
trunk/packages/ocamlgraph/upstream/ocamlgraph_0.96.orig.tar.gz
Modified:
trunk/packages/ocamlgraph/trunk/debian/changelog
trunk/packages/ocamlgraph/trunk/debian/patches/00list
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=3142&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/changelog (original)
+++ trunk/packages/ocamlgraph/trunk/debian/changelog Thu Sep 14 23:26:44 2006
@@ -1,3 +1,13 @@
+ocamlgraph (0.97-1) unstable; urgency=low
+
+ * New upstream version,
+ * Remove control.in as per ocaml policy,
+ * Add XS-X-Vcs-Svn in control,
+ * Update 01_makefile.dpatch,
+ * 04_ocamldoc_coloring.dpatch apply upstream.
+
+ -- Sylvain Le Gall <gildor at debian.org> Fri, 15 Sep 2006 00:44:53 +0200
+
ocamlgraph (0.96-1) unstable; urgency=low
* New upstream version
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=3142&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/patches/00list (original)
+++ trunk/packages/ocamlgraph/trunk/debian/patches/00list Thu Sep 14 23:26:44 2006
@@ -1,2 +1,1 @@
01_makefile
-04_ocamldoc_coloring
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=3142&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch (original)
+++ trunk/packages/ocamlgraph/trunk/debian/patches/01_makefile.dpatch Thu Sep 14 23:26:44 2006
@@ -23,10 +23,10 @@
exit 0
@DPATCH@
-diff -urNad ocamlgraph-0.90/Makefile.in /tmp/dpep.xPbub7/ocamlgraph-0.90/Makefile.in
---- ocamlgraph-0.90/Makefile.in 2004-12-03 02:18:47.000000000 +0100
-+++ /tmp/dpep.xPbub7/ocamlgraph-0.90/Makefile.in 2004-12-03 02:21:38.000000000 +0100
-@@ -132,15 +132,23 @@
+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)
install-byte:
@@ -34,7 +34,7 @@
+ cp -f *.mli graph.cmo graph.cmi $(CMA) $(OCAMLLIB)
install-opt: install-byte
- cp -f graph.a graph.cmx $(CMXA) $(OCAMLLIB)
+ cp -f graph$(LIBEXT) graph.cmx $(CMXA) $(OCAMLLIB)
-install-findlib: META
+install-findlib: install-findlib-$(OCAMLBEST)
@@ -42,7 +42,7 @@
+install-findlib-opt: META
ifdef OCAMLFIND
- $(OCAMLFIND) install ocamlgraph META *.mli \
-- graph.a graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
+- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
+ $(OCAMLFIND) install $(if $(DESTDIR),-destdir $(DESTDIR)) \
+ ocamlgraph META *.mli graph.a graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
+endif
@@ -54,3 +54,48 @@
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=3142&op=diff
==============================================================================
--- trunk/packages/ocamlgraph/trunk/debian/rules (original)
+++ trunk/packages/ocamlgraph/trunk/debian/rules Thu Sep 14 23:26:44 2006
@@ -9,11 +9,12 @@
DESTDIR_DEV=$(CURDIR)/debian/libocamlgraph-ocaml-dev
OCAMLIBDIR=`ocamlc -where`
OCAMLABI=$(shell ocamlc -version)
+OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
-debian/control: debian/control.in
- sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+ocamlinit:
+ for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-configure: configure-stamp
+configure: ocamlinit configure-stamp
configure-stamp: patch-stamp
dh_testdir
./configure
@@ -63,4 +64,4 @@
dh_builddeb -s
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure debian/control
+.PHONY: build clean binary-indep binary-arch binary install configure ocamlinit
Added: trunk/packages/ocamlgraph/upstream/ocamlgraph_0.97.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgraph/upstream/ocamlgraph_0.97.orig.tar.gz?rev=3142&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/ocamlgraph/upstream/ocamlgraph_0.97.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list