Author: glondu-guest
Date: Wed Jan 16 13:17:35 2008
New Revision: 5059
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5059
Log:
* svn-deblayout: upstream -> tarballs
* Tuning rules and patches/01_Makefile_extlib.dpatch
Added:
trunk/packages/ocaml-csv/tarballs/
- copied from r5056, trunk/packages/ocaml-csv/upstream/
Removed:
trunk/packages/ocaml-csv/upstream/
Modified:
trunk/packages/ocaml-csv/trunk/debian/csvtool.install
trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch
trunk/packages/ocaml-csv/trunk/debian/rules
trunk/packages/ocaml-csv/trunk/debian/svn-deblayout
Modified: trunk/packages/ocaml-csv/trunk/debian/csvtool.install
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/csvtool.install?rev=5059&op=diff
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/csvtool.install (original)
+++ trunk/packages/ocaml-csv/trunk/debian/csvtool.install Wed Jan 16 13:17:35
2008
@@ -1,1 +1,1 @@
-usr/bin/csvtool.*
+usr/bin/csvtool
Modified:
trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch?rev=5059&op=diff
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch
(original)
+++ trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch Wed
Jan 16 13:17:35 2008
@@ -5,9 +5,9 @@
## DP: Use Extlib, add opt, byte and install targets to Makefile
@DPATCH@
-diff -ur ocaml-csv-1.1.6-orig/csv.ml ocaml-csv-1.1.6/csv.ml
+diff -x '*~' -x '*#*' -urN ocaml-csv-1.1.6-orig/csv.ml ocaml-csv-1.1.6/csv.ml
--- ocaml-csv-1.1.6-orig/csv.ml 2006-12-05 23:23:03.000000000 +0100
-+++ ocaml-csv-1.1.6/csv.ml 2008-01-14 17:14:22.000000000 +0100
++++ ocaml-csv-1.1.6/csv.ml 2008-01-16 13:10:28.000000000 +0100
@@ -45,7 +45,7 @@
(* Uncomment the next line to enable Extlib's List function. These
* avoid stack overflows on really huge CSV files.
@@ -17,41 +17,41 @@
type t = string list list
-diff -ur ocaml-csv-1.1.6-orig/Makefile ocaml-csv-1.1.6/Makefile
+diff -x '*~' -x '*#*' -urN ocaml-csv-1.1.6-orig/Makefile
ocaml-csv-1.1.6/Makefile
--- ocaml-csv-1.1.6-orig/Makefile 2006-12-05 23:23:03.000000000 +0100
-+++ ocaml-csv-1.1.6/Makefile 2008-01-14 22:43:38.000000000 +0100
-@@ -5,16 +5,17 @@
++++ ocaml-csv-1.1.6/Makefile 2008-01-16 13:46:47.000000000 +0100
+@@ -5,6 +5,8 @@
# To enable support for Extlib, also uncomment 'open ExtList' at the top
# of file csv.ml.
++PREFIX := /usr/local
+OCAMLLIBDIR := $(shell ocamlc -where)
OCAMLCINCS :=
--#OCAMLCINCS := -package extlib
-+OCAMLCINCS := -package extlib
+ #OCAMLCINCS := -package extlib
OCAMLCFLAGS := -g
- OCAMLCLIBS :=
--#OCAMLCLIBS := -linkpkg
-+OCAMLCLIBS := -linkpkg
+@@ -21,7 +23,10 @@
- OCAMLOPTINCS := $(OCAMLCINCS)
- OCAMLOPTFLAGS :=
- OCAMLOPTLIBS :=
--#OCAMLOPTLIBS := -linkpkg
-+OCAMLOPTLIBS := -linkpkg
+ OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS)
- OBJS := csv.cmo
- XOBJS := $(OBJS:.cmo=.cmx)
-@@ -23,6 +24,9 @@
+-all: csv.cma csv.cmxa example csvtool
++all: byte opt example
++
++opt: csv.cmxa META csvtool.opt
++byte: csv.cma META csvtool.byte
- all: csv.cma csv.cmxa example csvtool
-
-+opt: csv.cmxa csvtool.opt
-+byte: csv.cma csvtool.byte
-+
csv.cma: $(OBJS)
ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) -a -o $@ $^
+@@ -29,6 +34,9 @@
+ csv.cmxa: $(XOBJS)
+ ocamlfind ocamlopt $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) -a -o $@ $^
-@@ -36,9 +40,13 @@
++META: Makefile.config META.in
++ sed 's/_VERSION_/$(VERSION)/' META.in > META
++
+ example: csv.cma example.ml
+ ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) $^ -o $@
+
+@@ -36,9 +44,12 @@
ocamlfind ocamlc $^ -o $@
./test
@@ -60,13 +60,12 @@
ocamlfind ocamlopt $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) $^
-o $@
+csvtool.byte: csv.cma csvtool.ml
-+ ocamlfind ocamlc $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) $^ -o
$@
-+
++ ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) $^ -o $@
+
# Common rules for building OCaml objects.
.mli.cmi:
-@@ -53,7 +61,8 @@
+@@ -53,7 +64,8 @@
# Clean.
clean:
@@ -76,18 +75,19 @@
# Dependencies.
-@@ -90,11 +99,20 @@
+@@ -90,11 +102,21 @@
rm -f .orig-manifest .check-manifest; \
exit $$rv
+install:
-+ sed 's/_VERSION_/$(VERSION)/' META.in > META
+ install -m 0755 -o root -g root -d $(DESTDIR)$(OCAMLLIBDIR)
+ -ocamlfind install csv -destdir $(DESTDIR)$(OCAMLLIBDIR) META csv.mli
csv.cma csv.cmi csv.cmxa csv.a
-+ install -m 0755 -o root -g root -d $(DESTDIR)/usr/bin
-+ -install -m 0755 -o root -g root csvtool.opt csvtool.byte
$(DESTDIR)/usr/bin
-+ install -m 0755 -o root -g root -d
$(DESTDIR)/usr/share/doc/libcsv-ocaml-dev/html
-+ install -m 0644 -o root -g root html/*
$(DESTDIR)/usr/share/doc/libcsv-ocaml-dev/html
++ install -m 0755 -o root -g root -d $(DESTDIR)$(PREFIX)/bin
++ if [ -f csvtool.opt ]; then \
++ install -m 0755 -o root -g root csvtool.opt
$(DESTDIR)$(PREFIX)/bin/csvtool; \
++ else \
++ install -m 0755 -o root -g root csvtool.byte
$(DESTDIR)$(PREFIX)/bin/csvtool; \
++ fi
+
# Developer documentation (in html/ subdirectory).
@@ -97,4 +97,5 @@
- -ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html csv.ml{i,}
+ -ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html csv.mli csv.ml
- .PHONY: depend dist check-manifest doc
+-.PHONY: depend dist check-manifest doc
++.PHONY: depend dist check-manifest doc all opt byte install
Modified: trunk/packages/ocaml-csv/trunk/debian/rules
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/rules?rev=5059&op=diff
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/rules (original)
+++ trunk/packages/ocaml-csv/trunk/debian/rules Wed Jan 16 13:17:35 2008
@@ -12,6 +12,10 @@
include /usr/share/dpatch/dpatch.make
OCAMLABI := $(shell ocamlc -version)
+BYTECODE := $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
+OCAMLRUN := $(if $(BYTECODE),ocaml-base-nox-$(OCAMLABI))
+OPTTARGET := $(if $(BYTECODE),,opt)
+
OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
ocamlinit:
@@ -23,15 +27,6 @@
debian/csvtool.1: debian/csvtool.dbk
$(XP) -o $@ $(DB2MAN) $<
-links:
- echo "usr/share/man/man1/csvtool.1 usr/share/man/man1/csvtool.byte.1" >
$(CURDIR)/debian/csvtool.links
- if [ -x /usr/bin/ocamlopt ]; then \
- echo "usr/share/man/man1/csvtool.1 usr/share/man/man1/csvtool.opt.1"
>> $(CURDIR)/debian/csvtool.links; \
- echo "usr/bin/csvtool.opt usr/bin/csvtool" >>
$(CURDIR)/debian/csvtool.links; \
- else \
- echo "usr/bin/csvtool.byte usr/bin/csvtool" >>
$(CURDIR)/debian/csvtool.links; \
- fi
-
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -41,8 +36,7 @@
build: patch ocamlinit debian/csvtool.1 build-stamp
build-stamp: configure-stamp
dh_testdir
- $(MAKE) byte doc
- [ -x /usr/bin/ocamlopt ] && $(MAKE) opt
+ $(MAKE) OCAMLCINCS="-package extlib" OCAMLCLIBS="-linkpkg"
OCAMLOPTLIBS="-linkpkg" byte $(OPTTARGET) doc
touch $@
clean: unpatch
@@ -58,8 +52,10 @@
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr install
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/libcsv-ocaml-dev/html
mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/libcsv-ocaml-dev/examples
+ cp $(CURDIR)/html/*
$(CURDIR)/debian/tmp/usr/share/doc/libcsv-ocaml-dev/html
cp $(CURDIR)/example*
$(CURDIR)/debian/tmp/usr/share/doc/libcsv-ocaml-dev/examples
binary-indep: build install
@@ -71,26 +67,15 @@
dh_installdocs
dh_installexamples
dh_install --sourcedir=debian/tmp
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
dh_installman -pcsvtool debian/csvtool.1
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_perl
-# dh_python
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+ dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)" -VF:OCamlRun="$(OCAMLRUN)"
dh_md5sums
dh_builddeb
Modified: trunk/packages/ocaml-csv/trunk/debian/svn-deblayout
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/svn-deblayout?rev=5059&op=diff
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/svn-deblayout (original)
+++ trunk/packages/ocaml-csv/trunk/debian/svn-deblayout Wed Jan 16 13:17:35 2008
@@ -1,3 +1,1 @@
-origDir=../upstream
-origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-csv/upstream
tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocaml-csv
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
