[Pkg-ocaml-maint-commits] r5054 - in /trunk/packages/ocaml-csv: ./ trunk/ trunk/debian/ trunk/debian/patches/ upstream/
glondu-guest at users.alioth.debian.org
glondu-guest at users.alioth.debian.org
Mon Jan 14 21:58:01 UTC 2008
Author: glondu-guest
Date: Mon Jan 14 21:58:01 2008
New Revision: 5054
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5054
Log:
Initial release, closes: #453953.
Added:
trunk/packages/ocaml-csv/
trunk/packages/ocaml-csv/trunk/
trunk/packages/ocaml-csv/trunk/debian/ (with props)
trunk/packages/ocaml-csv/trunk/debian/changelog
trunk/packages/ocaml-csv/trunk/debian/compat
trunk/packages/ocaml-csv/trunk/debian/control
trunk/packages/ocaml-csv/trunk/debian/copyright
trunk/packages/ocaml-csv/trunk/debian/csvtool.dirs
trunk/packages/ocaml-csv/trunk/debian/csvtool.install
trunk/packages/ocaml-csv/trunk/debian/libcsv-ocaml-dev.dirs.in
trunk/packages/ocaml-csv/trunk/debian/libcsv-ocaml-dev.install.in
trunk/packages/ocaml-csv/trunk/debian/patches/
trunk/packages/ocaml-csv/trunk/debian/patches/00list
trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch (with props)
trunk/packages/ocaml-csv/trunk/debian/patches/02_META.dpatch (with props)
trunk/packages/ocaml-csv/trunk/debian/rules (with props)
trunk/packages/ocaml-csv/trunk/debian/svn-deblayout
trunk/packages/ocaml-csv/upstream/
trunk/packages/ocaml-csv/upstream/ocaml-csv_1.1.6.orig.tar.gz (with props)
Propchange: trunk/packages/ocaml-csv/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Added: trunk/packages/ocaml-csv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/changelog?rev=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/changelog (added)
+++ trunk/packages/ocaml-csv/trunk/debian/changelog Mon Jan 14 21:58:01 2008
@@ -1,0 +1,9 @@
+ocaml-csv (1.1.6-1) UNRELEASED; urgency=low
+
+ * Initial release, closes: #453953.
+ * Added install, byte, opt targets to Makefile.
+ * META file generation.
+ * Use extlib.
+ * dash compatibility.
+
+ -- Stephane Glondu <steph at glondu.net> Mon, 14 Jan 2008 22:47:50 +0100
Added: trunk/packages/ocaml-csv/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/compat?rev=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/compat (added)
+++ trunk/packages/ocaml-csv/trunk/debian/compat Mon Jan 14 21:58:01 2008
@@ -1,0 +1,1 @@
+5
Added: trunk/packages/ocaml-csv/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/control?rev=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/control (added)
+++ trunk/packages/ocaml-csv/trunk/debian/control Mon Jan 14 21:58:01 2008
@@ -1,0 +1,28 @@
+Source: ocaml-csv
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Stephane Glondu <steph at glondu.net>
+Build-Depends: debhelper (>= 5), dpatch, ocaml-nox, ocaml-findlib, libextlib-ocaml-dev
+Standards-Version: 3.7.2
+Section: libs
+Homepage: http://merjis.com/developers/csv
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/
+
+Package: libcsv-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libextlib-ocaml-dev
+Recommends: ocaml-findlib
+Description: This library can read and write CSV files
+ This library can read and write CSV files, including all extensions
+ used by Excel - eg. quotes, newlines, 8 bit characters in fields, "0
+ etc.
+
+Package: csvtool
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}
+Description: A handy command line tool for handling CSV files
+ A handy command line tool for handling CSV files from shell
+ scripts.
Added: trunk/packages/ocaml-csv/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/copyright?rev=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/copyright (added)
+++ trunk/packages/ocaml-csv/trunk/debian/copyright Mon Jan 14 21:58:01 2008
@@ -1,0 +1,14 @@
+This package was debianized by Stephane Glondu <steph at glondu.net> on
+Thu, 08 Nov 2007 17:25:05 +0100.
+
+It was downloaded from <http://merjis.com/developers/csv>
+
+Upstream Author: Richard W.M. Jones <rich at annexia.org>
+
+Copyright (C) 2005-2006 Richard W.M. Jones, Merjis Ltd.
+
+This library is distributed under the GNU Library General Public
+License version 2 or later, with the special OCaml linking exception.
+
+The Debian packaging is (C) 2007, Stephane Glondu <steph at glondu.net> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: trunk/packages/ocaml-csv/trunk/debian/csvtool.dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/csvtool.dirs?rev=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/csvtool.dirs (added)
+++ trunk/packages/ocaml-csv/trunk/debian/csvtool.dirs Mon Jan 14 21:58:01 2008
@@ -1,0 +1,1 @@
+usr/bin
Added: 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=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/csvtool.install (added)
+++ trunk/packages/ocaml-csv/trunk/debian/csvtool.install Mon Jan 14 21:58:01 2008
@@ -1,0 +1,1 @@
+usr/bin/csvtool.*
Added: trunk/packages/ocaml-csv/trunk/debian/libcsv-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/libcsv-ocaml-dev.dirs.in?rev=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/libcsv-ocaml-dev.dirs.in (added)
+++ trunk/packages/ocaml-csv/trunk/debian/libcsv-ocaml-dev.dirs.in Mon Jan 14 21:58:01 2008
@@ -1,0 +1,2 @@
+usr/lib/ocaml/@OCamlABI@/csv
+usr/share/doc/libcsv-ocaml-dev/html
Added: trunk/packages/ocaml-csv/trunk/debian/libcsv-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/libcsv-ocaml-dev.install.in?rev=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/libcsv-ocaml-dev.install.in (added)
+++ trunk/packages/ocaml-csv/trunk/debian/libcsv-ocaml-dev.install.in Mon Jan 14 21:58:01 2008
@@ -1,0 +1,7 @@
+usr/lib/ocaml/@OCamlABI@/csv/csv.a
+usr/lib/ocaml/@OCamlABI@/csv/csv.cma
+usr/lib/ocaml/@OCamlABI@/csv/csv.cmxa
+usr/lib/ocaml/@OCamlABI@/csv/csv.cmi
+usr/lib/ocaml/@OCamlABI@/csv/csv.mli
+usr/lib/ocaml/@OCamlABI@/csv/META
+usr/share/doc/libcsv-ocaml-dev/html/*
Added: trunk/packages/ocaml-csv/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/patches/00list?rev=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/patches/00list (added)
+++ trunk/packages/ocaml-csv/trunk/debian/patches/00list Mon Jan 14 21:58:01 2008
@@ -1,0 +1,2 @@
+01_Makefile_extlib
+02_META
Added: 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=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch (added)
+++ trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch Mon Jan 14 21:58:01 2008
@@ -1,0 +1,100 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_Makefile_extlib.dpatch by Stephane Glondu <steph at glondu.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use Extlib, add opt, byte and install targets to Makefile
+
+ at DPATCH@
+diff -ur 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
+@@ -45,7 +45,7 @@
+ (* Uncomment the next line to enable Extlib's List function. These
+ * avoid stack overflows on really huge CSV files.
+ *)
+-(*open ExtList*)
++open ExtList
+
+ type t = string list list
+
+diff -ur 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 @@
+ # To enable support for Extlib, also uncomment 'open ExtList' at the top
+ # of file csv.ml.
+
++OCAMLLIBDIR := $(shell ocamlc -where)
+ OCAMLCINCS :=
+-#OCAMLCINCS := -package extlib
++OCAMLCINCS := -package extlib
+ OCAMLCFLAGS := -g
+ OCAMLCLIBS :=
+-#OCAMLCLIBS := -linkpkg
++OCAMLCLIBS := -linkpkg
+
+ OCAMLOPTINCS := $(OCAMLCINCS)
+ OCAMLOPTFLAGS :=
+ OCAMLOPTLIBS :=
+-#OCAMLOPTLIBS := -linkpkg
++OCAMLOPTLIBS := -linkpkg
+
+ OBJS := csv.cmo
+ XOBJS := $(OBJS:.cmo=.cmx)
+@@ -23,6 +24,9 @@
+
+ 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 $@ $^
+
+@@ -36,9 +40,13 @@
+ ocamlfind ocamlc $^ -o $@
+ ./test
+
+-csvtool: csv.cmxa csvtool.ml
++csvtool.opt: csv.cmxa csvtool.ml
+ ocamlfind ocamlopt $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) $^ -o $@
+
++csvtool.byte: csv.cma csvtool.ml
++ ocamlfind ocamlc $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) $^ -o $@
++
++
+ # Common rules for building OCaml objects.
+
+ .mli.cmi:
+@@ -53,7 +61,8 @@
+ # Clean.
+
+ clean:
+- rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *~ core csvtool example
++ -rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *~ core csvtool.byte csvtool.opt example META
++ -rm -Rf html
+
+ # Dependencies.
+
+@@ -90,11 +99,20 @@
+ 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
++
+ # Developer documentation (in html/ subdirectory).
+
+ doc:
+ rm -rf html
+ mkdir html
+- -ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html csv.ml{i,}
++ -ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html csv.mli csv.ml
+
+ .PHONY: depend dist check-manifest doc
Propchange: trunk/packages/ocaml-csv/trunk/debian/patches/01_Makefile_extlib.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/packages/ocaml-csv/trunk/debian/patches/02_META.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/patches/02_META.dpatch?rev=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/patches/02_META.dpatch (added)
+++ trunk/packages/ocaml-csv/trunk/debian/patches/02_META.dpatch Mon Jan 14 21:58:01 2008
@@ -1,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_META.dpatch by Stephane Glondu <steph at glondu.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: META file for ocaml-csv
+
+ at DPATCH@
+--- ocaml-csv-1.1.6-orig/META.in 1970-01-01 01:00:00.000000000 +0100
++++ ocaml-csv-1.1.6/META.in 2008-01-14 17:17:07.000000000 +0100
+@@ -0,0 +1,6 @@
++name="csv"
++version="_VERSION_"
++description="This library can read and write CSV files"
++requires="unix,extlib"
++archive(byte)="csv.cma"
++archive(native)="csv.cmxa"
Propchange: trunk/packages/ocaml-csv/trunk/debian/patches/02_META.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/packages/ocaml-csv/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/trunk/debian/rules?rev=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/rules (added)
+++ trunk/packages/ocaml-csv/trunk/debian/rules Mon Jan 14 21:58:01 2008
@@ -1,0 +1,87 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+
+ocamlinit:
+ for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ touch configure-stamp
+
+
+build: patch ocamlinit build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) byte doc
+ [ -x /usr/bin/ocamlopt ] && $(MAKE) opt
+ touch $@
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ $(MAKE) clean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ if [ -x /usr/bin/ocamlopt ]; then \
+ 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
+
+binary-indep: build install
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ 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
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure ocamlinit patch unpatch
Propchange: trunk/packages/ocaml-csv/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: 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=5054&op=file
==============================================================================
--- trunk/packages/ocaml-csv/trunk/debian/svn-deblayout (added)
+++ trunk/packages/ocaml-csv/trunk/debian/svn-deblayout Mon Jan 14 21:58:01 2008
@@ -1,0 +1,3 @@
+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
Added: trunk/packages/ocaml-csv/upstream/ocaml-csv_1.1.6.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-csv/upstream/ocaml-csv_1.1.6.orig.tar.gz?rev=5054&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/ocaml-csv/upstream/ocaml-csv_1.1.6.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list