[Pkg-ocaml-maint-commits] r2019 - in trunk/packages: . xstr xstr/trunk xstr/trunk/debian xstr/trunk/debian/patches xstr/upstream

Stefano Zacchiroli zack at costa.debian.org
Sun Nov 13 00:16:33 UTC 2005


Author: zack
Date: 2005-11-13 00:16:32 +0000 (Sun, 13 Nov 2005)
New Revision: 2019

Added:
   trunk/packages/xstr/
   trunk/packages/xstr/branches/
   trunk/packages/xstr/build-area/
   trunk/packages/xstr/trunk/
   trunk/packages/xstr/trunk/debian/
   trunk/packages/xstr/trunk/debian/changelog
   trunk/packages/xstr/trunk/debian/control
   trunk/packages/xstr/trunk/debian/control.in
   trunk/packages/xstr/trunk/debian/copyright
   trunk/packages/xstr/trunk/debian/dirs
   trunk/packages/xstr/trunk/debian/dirs.in
   trunk/packages/xstr/trunk/debian/docs
   trunk/packages/xstr/trunk/debian/patches/
   trunk/packages/xstr/trunk/debian/patches/00list
   trunk/packages/xstr/trunk/debian/patches/01_build.dpatch
   trunk/packages/xstr/trunk/debian/rules
   trunk/packages/xstr/trunk/debian/svn-deblayout
   trunk/packages/xstr/upstream/
   trunk/packages/xstr/upstream/xstr_0.2.1.orig.tar.gz
Log:
xstr check in, transition to ocaml 3.09



Property changes on: trunk/packages/xstr/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Added: trunk/packages/xstr/trunk/debian/changelog
===================================================================
--- trunk/packages/xstr/trunk/debian/changelog	2005-11-13 00:12:46 UTC (rev 2018)
+++ trunk/packages/xstr/trunk/debian/changelog	2005-11-13 00:16:32 UTC (rev 2019)
@@ -0,0 +1,136 @@
+xstr (0.2.1-11) unstable; urgency=low
+
+  * Rebuilt with ocaml 3.09
+  * debian/control
+    - bumped standards version
+  * debian/*
+    - use cdbs and dpatch
+    - no longer hard coding of ocaml abi anywhere
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sat, 12 Nov 2005 10:06:09 +0100
+
+xstr (0.2.1-10) unstable; urgency=low
+
+  * Rebuilt against ocaml 3.08.3
+
+ -- Stefano Zacchiroli <zack at debian.org>  Thu, 24 Mar 2005 22:48:27 +0100
+
+xstr (0.2.1-9) unstable; urgency=low
+
+  * rebuilt against ocaml 3.08.2
+
+ -- Stefano Zacchiroli <zack at debian.org>  Thu,  9 Dec 2004 16:34:30 +0100
+
+xstr (0.2.1-8) unstable; urgency=low
+
+  * rebuilt with ocaml 3.08
+  * debian/control
+    - bumped ocaml deps to 3.08
+    - bumped standards-version to 3.6.1.1
+    - changed ocaml deps to ocaml-nox
+
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 26 Jul 2004 16:29:57 +0200
+
+xstr (0.2.1-7) unstable; urgency=low
+
+  * Changed section to libdevel
+
+ -- Stefano Zacchiroli <zack at debian.org>  Thu,  2 Oct 2003 19:26:55 +0200
+
+xstr (0.2.1-6) unstable; urgency=low
+
+  * Rebuilt with ocaml 3.07
+
+ -- Stefano Zacchiroli <zack at debian.org>  Wed,  1 Oct 2003 14:12:04 +0200
+
+xstr (0.2.1-5) unstable; urgency=low
+
+  * Rebuilt with ocaml 3.07beta2
+
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 22 Sep 2003 17:33:20 +0200
+
+xstr (0.2.1-4) unstable; urgency=low
+
+  * Removed Provides:.*-<version>
+
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 10 Mar 2003 13:52:37 +0100
+
+xstr (0.2.1-3) unstable; urgency=low
+
+  * Libdir transition to /usr/lib/ocaml/3.06
+  * Changed depends and build depends to ocaml{,-base}-3.06-1
+  * Reformatted upstream author in debian/copyright just to make lintian
+    happy
+
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 16 Dec 2002 13:02:24 +0100
+
+xstr (0.2.1-2) unstable; urgency=low
+
+  * Added 'Provides: libxstr-ocaml-dev-<version>'
+  * Bumped Standards-Versions to 3.5.8
+  * Better test on ocamlopt presence in debian/rules
+  * Removed useless binary-indep target from debian/rules
+  * Commented out some useless dh_* from debian/rules
+
+ -- Stefano Zacchiroli <zack at debian.org>  Thu, 28 Nov 2002 23:41:10 +0100
+
+xstr (0.2.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Rebuilt against ocaml 3.06 (Closes: Bug#158265)
+  * Switched to debhelper 4
+  * Removed mention of ocaml-xstr (ancient) from debian/control
+  * Changed deps and build-deps to ocaml-3.06
+  * Changed deps on ocaml-findlib from recommends to depends
+  * Fixed some typos in CVS variables
+
+ -- Stefano Zacchiroli <zack at debian.org>  Tue, 27 Aug 2002 00:03:44 +0200
+
+xstr (0.2-7) unstable; urgency=low
+
+  * Renamed package to libxstr-ocaml-dev.
+  * Some aesthetic changes in debian/rules.
+
+ -- Stefano Zacchiroli <zack at debian.org>  Tue, 26 Feb 2002 09:24:16 +0100
+
+xstr (0.2-6) unstable; urgency=low
+
+  * Now build depends on ocaml >= 3.04-3, hopefully will compile also on
+    ia64 and powerpc
+
+ -- Stefano Zacchiroli <zack at debian.org>  Fri, 11 Jan 2002 14:31:43 +0100
+
+xstr (0.2-5) unstable; urgency=low
+
+  * Rebuilt with ocaml 3.04
+
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 24 Dec 2001 09:20:32 +0100
+
+xstr (0.2-4) unstable; urgency=low
+
+  * Fixed spelling error in description (closes: Bug#125200).
+
+ -- Stefano Zacchiroli <zack at debian.org>  Tue, 18 Dec 2001 13:11:28 +0100
+
+xstr (0.2-3) unstable; urgency=low
+
+  * Rebuilt with ocaml 3.02
+
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 20 Aug 2001 21:33:58 +0200
+
+xstr (0.2-2) unstable; urgency=low
+
+  * Conditional build of "opt" target now check for /usr/bin/ocamlopt
+    executableness (closes: Bug#96254).
+
+ -- Stefano Zacchiroli <zack at debian.org>  Mon,  7 May 2001 13:13:38 +0200
+
+xstr (0.2-1) unstable; urgency=low
+
+  * Initial Release (closes: Bug#93417).
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sat,  7 Apr 2001 01:01:51 +0200
+
+Local variables:
+mode: debian-changelog
+End:

Added: trunk/packages/xstr/trunk/debian/control
===================================================================
--- trunk/packages/xstr/trunk/debian/control	2005-11-13 00:12:46 UTC (rev 2018)
+++ trunk/packages/xstr/trunk/debian/control	2005-11-13 00:16:32 UTC (rev 2019)
@@ -0,0 +1,20 @@
+Source: xstr
+Section: libdevel
+Priority: optional
+Maintainer: Stefano Zacchiroli <zack at debian.org>
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.1), cdbs, dpatch
+Standards-Version: 3.6.2
+
+Package: libxstr-ocaml-dev
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1), ${shlibs:Depends}
+Description: OCaml library for frequent string operations
+ xstr is an OCaml library for string operations.
+ .
+ This package implements frequent string operations: searching,
+ replacing, splitting, matching. It is independent from the Str library,
+ and can replace Str in many cases. Unlike Str, xstr is thread-safe.
+ xstr does not implement regular expressions in general, but an
+ important subset.  Some operations of xstr are performed as quickly as
+ by Str; if the string to be processed is small, xstr is often faster
+ than Str; if the string is big, xstr is up to half as fast than Str.

Added: trunk/packages/xstr/trunk/debian/control.in
===================================================================
--- trunk/packages/xstr/trunk/debian/control.in	2005-11-13 00:12:46 UTC (rev 2018)
+++ trunk/packages/xstr/trunk/debian/control.in	2005-11-13 00:16:32 UTC (rev 2019)
@@ -0,0 +1,20 @@
+Source: xstr
+Section: libdevel
+Priority: optional
+Maintainer: Stefano Zacchiroli <zack at debian.org>
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.1), cdbs, dpatch
+Standards-Version: 3.6.2
+
+Package: libxstr-ocaml-dev
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1), ${shlibs:Depends}
+Description: OCaml library for frequent string operations
+ xstr is an OCaml library for string operations.
+ .
+ This package implements frequent string operations: searching,
+ replacing, splitting, matching. It is independent from the Str library,
+ and can replace Str in many cases. Unlike Str, xstr is thread-safe.
+ xstr does not implement regular expressions in general, but an
+ important subset.  Some operations of xstr are performed as quickly as
+ by Str; if the string to be processed is small, xstr is often faster
+ than Str; if the string is big, xstr is up to half as fast than Str.

Added: trunk/packages/xstr/trunk/debian/copyright
===================================================================
--- trunk/packages/xstr/trunk/debian/copyright	2005-11-13 00:12:46 UTC (rev 2018)
+++ trunk/packages/xstr/trunk/debian/copyright	2005-11-13 00:16:32 UTC (rev 2019)
@@ -0,0 +1,30 @@
+This package was debianized by Stefano Zacchiroli <zack at debian.org> on
+Sat,  7 Apr 2001 01:01:51 +0200.
+
+It was downloaded from http://www.ocaml-programming.de
+
+Upstream Author: Gerd Stolpmann <gerd at gerd-stolpmann.de>
+
+Copyright:
+
+ Copyright 1999 by Gerd Stolpmann
+ 
+ The package "xstr" is copyright by Gerd Stolpmann. 
+ 
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the "xstr" software (the "Software"), to deal in the
+ Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ 
+ The Software is provided ``as is'', without warranty of any kind, express
+ or implied, including but not limited to the warranties of
+ merchantability, fitness for a particular purpose and noninfringement.
+ In no event shall Gerd Stolpmann be liable for any claim, damages or
+ other liability, whether in an action of contract, tort or otherwise,
+ arising from, out of or in connection with the Software or the use or
+ other dealings in the software.

Added: trunk/packages/xstr/trunk/debian/dirs
===================================================================
--- trunk/packages/xstr/trunk/debian/dirs	2005-11-13 00:12:46 UTC (rev 2018)
+++ trunk/packages/xstr/trunk/debian/dirs	2005-11-13 00:16:32 UTC (rev 2019)
@@ -0,0 +1 @@
+usr/lib/ocaml/3.09.0

Added: trunk/packages/xstr/trunk/debian/dirs.in
===================================================================
--- trunk/packages/xstr/trunk/debian/dirs.in	2005-11-13 00:12:46 UTC (rev 2018)
+++ trunk/packages/xstr/trunk/debian/dirs.in	2005-11-13 00:16:32 UTC (rev 2019)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@

Added: trunk/packages/xstr/trunk/debian/docs
===================================================================
--- trunk/packages/xstr/trunk/debian/docs	2005-11-13 00:12:46 UTC (rev 2018)
+++ trunk/packages/xstr/trunk/debian/docs	2005-11-13 00:16:32 UTC (rev 2019)
@@ -0,0 +1,2 @@
+README
+RELEASE

Added: trunk/packages/xstr/trunk/debian/patches/00list
===================================================================
--- trunk/packages/xstr/trunk/debian/patches/00list	2005-11-13 00:12:46 UTC (rev 2018)
+++ trunk/packages/xstr/trunk/debian/patches/00list	2005-11-13 00:16:32 UTC (rev 2019)
@@ -0,0 +1 @@
+01_build.dpatch

Added: trunk/packages/xstr/trunk/debian/patches/01_build.dpatch
===================================================================
--- trunk/packages/xstr/trunk/debian/patches/01_build.dpatch	2005-11-13 00:12:46 UTC (rev 2018)
+++ trunk/packages/xstr/trunk/debian/patches/01_build.dpatch	2005-11-13 00:16:32 UTC (rev 2019)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_build.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2000-09-23 15:06:54.000000000 +0200
++++ trunk/Makefile	2005-11-12 10:10:49.000000000 +0100
+@@ -17,6 +17,7 @@
+ NAME     = xstr
+ #REQUIRES =
+ UNSAFE   =
++DESTDIR =
+ 
+ # you may try this: (0% to 10% faster)
+ #UNSAFE   = -unsafe
+@@ -49,7 +50,7 @@
+ .PHONY: install
+ install: all
+ 	{ test ! -f $(XARCHIVE) || extra="*.cmxa *.a"; }; \
+-	$(OCAMLFIND) install $(NAME) *.mli *.cmi *.cma META $$extra
++	$(OCAMLFIND) install -destdir $(DESTDIR) $(NAME) *.mli *.cmi *.cma META $$extra
+ 
+ .PHONY: uninstall
+ uninstall:


Property changes on: trunk/packages/xstr/trunk/debian/patches/01_build.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/xstr/trunk/debian/rules
===================================================================
--- trunk/packages/xstr/trunk/debian/rules	2005-11-13 00:12:46 UTC (rev 2018)
+++ trunk/packages/xstr/trunk/debian/rules	2005-11-13 00:16:32 UTC (rev 2019)
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+
+PKGNAME = libxstr-ocaml-dev
+
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
+OCAMLLIBDIR := $(shell ocamlc -where)
+DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/$(PKGNAME)/$(OCAMLLIBDIR)
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/' $$f.in > $$f; done
+ifeq ($(HAVE_OCAMLOPT),yes)
+build/$(PKGNAME)::
+	$(MAKE) opt
+endif
+
+# work around cdbs' bug
+unpatch: deapply-dpatches


Property changes on: trunk/packages/xstr/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/xstr/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/xstr/trunk/debian/svn-deblayout	2005-11-13 00:12:46 UTC (rev 2018)
+++ trunk/packages/xstr/trunk/debian/svn-deblayout	2005-11-13 00:16:32 UTC (rev 2019)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/xstr/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/xstr

Added: trunk/packages/xstr/upstream/xstr_0.2.1.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/xstr/upstream/xstr_0.2.1.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




More information about the Pkg-ocaml-maint-commits mailing list