[Pkg-ocaml-maint-commits] r3042 - in /trunk/packages/ocaml-sha1:
trunk/debian/ upstream/
ecc-guest at users.alioth.debian.org
ecc-guest at users.alioth.debian.org
Fri Sep 1 19:14:09 UTC 2006
Author: ecc-guest
Date: Fri Sep 1 19:14:09 2006
New Revision: 3042
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3042
Log:
new upstream version
rename ocaml-sha1 to ocaml-sha
Added:
trunk/packages/ocaml-sha1/upstream/ocaml-sha_1.2.orig.tar.gz (with props)
Removed:
trunk/packages/ocaml-sha1/upstream/ocaml-sha1_0.9.orig.tar.gz
Modified:
trunk/packages/ocaml-sha1/trunk/debian/META
trunk/packages/ocaml-sha1/trunk/debian/Makefile
trunk/packages/ocaml-sha1/trunk/debian/changelog
trunk/packages/ocaml-sha1/trunk/debian/control
trunk/packages/ocaml-sha1/trunk/debian/copyright
trunk/packages/ocaml-sha1/trunk/debian/rules
trunk/packages/ocaml-sha1/trunk/debian/svn-deblayout
Modified: trunk/packages/ocaml-sha1/trunk/debian/META
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/META?rev=3042&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/META (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/META Fri Sep 1 19:14:09 2006
@@ -1,3 +1,3 @@
-version="0.9"
-archive(byte)="sha1.cma"
-archive(native)="sha1.cmxa"
+version="1.2"
+archive(byte)="sha.cma"
+archive(native)="sha.cmxa"
Modified: trunk/packages/ocaml-sha1/trunk/debian/Makefile
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/Makefile?rev=3042&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/Makefile (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/Makefile Fri Sep 1 19:14:09 2006
@@ -1,11 +1,8 @@
OCAMLMAKEFILE = /usr/share/ocaml-tools/OCamlMakefile
-DESTDIR = $(shell ocamlc -where | sed s:/usr/lib/:/usr/local/lib/:)
-OCAMLFIND_INSTFLAGS = -destdir $(DESTDIR) -ldconf ignore
-NO_CUSTOM = yes
-CFLAGS = -O3
-SOURCES = sha1.mli sha1.ml sha1_stubs.c
-RESULT = sha1
+SOURCES = sha1.mli sha1.ml sha1_stubs.c sha256.mli sha256.ml sha256_stubs.c
+CFLAGS = -Wall -O3 -funroll-loops
+RESULT = sha
all: byte-code-library
Modified: trunk/packages/ocaml-sha1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/changelog?rev=3042&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/changelog Fri Sep 1 19:14:09 2006
@@ -1,7 +1,13 @@
+ocaml-sha (1.2-1) unstable; urgency=low
+
+ * New upstream version (renamed)
+
+ -- Eric Cooper <ecc at cmu.edu> Thu, 31 Aug 2006 11:00:53 -0400
+
ocaml-sha1 (0.9-2) unstable; urgency=low
* Work around incorrect OCamlMakefile libinstall on architectures without
- ocamlopt (ocaml-tools bug #381638), closes: #381620.
+ ocamlopt (ocaml-tools bug #381638), closes: #381620
-- Eric Cooper <ecc at cmu.edu> Sun, 6 Aug 2006 14:26:19 -0400
Modified: trunk/packages/ocaml-sha1/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/control?rev=3042&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/control (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/control Fri Sep 1 19:14:09 2006
@@ -1,27 +1,35 @@
-Source: ocaml-sha1
+Source: ocaml-sha
Section: devel
Priority: optional
Maintainer: Eric Cooper <ecc at cmu.edu>
Build-Depends: debhelper (>= 5.0), cdbs, ocaml-nox (>= 3.09.2), ocaml-tools, ocaml-findlib
Standards-Version: 3.7.2
-Package: libsha1-ocaml
+Package: libsha-ocaml
Architecture: any
Section: libs
+Replaces: libsha1-ocaml
+Conflicts: libsha1-ocaml
Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
-Description: SHA1 library for OCaml
- SHA1 is a 160-bit cryptographic hash function.
- This library provides SHA1 functions for use by OCaml programs.
+Description: SHA cryptographic hash functions for OCaml
+ SHA-1 produces a 160-bit digest from its input.
+ SHA-256 produces a 256-bit digest from its input.
.
This package contains the shared runtime stub libraries.
+ .
+ Homepage: http://tab.snarc.org/projects/ocaml_sha/
-Package: libsha1-ocaml-dev
+Package: libsha-ocaml-dev
Architecture: any
Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libsha1-ocaml (= ${Source-Version})
-Description: SHA1 library for OCaml
- SHA1 is a 160-bit cryptographic hash function.
- This library provides SHA1 functions for use by OCaml programs.
+Depends: ocaml-nox-${F:OCamlABI}, libsha-ocaml (= ${Source-Version})
+Replaces: libsha1-ocaml-dev
+Conflicts: libsha1-ocaml-dev
+Description: SHA cryptographic hash functions for OCaml
+ SHA-1 produces a 160-bit digest from its input.
+ SHA-256 produces a 256-bit digest from its input.
.
This package contains the files needed to compile OCaml programs
- that use the SHA1 library.
+ that use the SHA library.
+ .
+ Homepage: http://tab.snarc.org/projects/ocaml_sha/
Modified: trunk/packages/ocaml-sha1/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/copyright?rev=3042&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/copyright (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/copyright Fri Sep 1 19:14:09 2006
@@ -1,10 +1,8 @@
-OCaml SHA1 Library
+SHA Cryptographic Hash Functions for OCaml
-Packaged for Debian by
- Eric Cooper <ecc at cmu.edu>
- Wed, 19 Jul 2006
+Packaged for Debian by Eric Cooper <ecc at cmu.edu> on Wed, 19 Jul 2006
-Downloaded from http://tab.snarc.org/projects/ocaml_sha1/
+Downloaded from http://tab.snarc.org/download/ocaml/
Copyright (C) 2006 Vincent Hanquez <tab at snarc.org>
Modified: trunk/packages/ocaml-sha1/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/rules?rev=3042&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/rules (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/rules Fri Sep 1 19:14:09 2006
@@ -2,30 +2,30 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
-PKG = sha1
-
-OCAMLABI = $(shell ocamlc -version)
+NATIVECODE = $(shell [ -x /usr/bin/ocamlopt ] && echo yes)
DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -f debian/Makefile
-
-NATIVECODE = $(shell [ -x /usr/bin/ocamlopt ] && echo yes)
-
-DEB_MAKE_BUILD_TARGET = byte-code-library \
- $(if $(NATIVECODE),native-code-library)
+DEB_MAKE_BUILD_TARGET = byte-code-library
+ifeq ($(NATIVECODE),yes)
+ DEB_MAKE_BUILD_TARGET += native-code-library
+endif
+DEB_MAKE_INSTALL_TARGET = install
OCAMLLIBDIR = $(shell ocamlc -where)
-DESTDIR=$(CURDIR)/debian/lib$(PKG)-ocaml-dev/$(OCAMLLIBDIR)
-STUBDIR=$(CURDIR)/debian/lib$(PKG)-ocaml/$(OCAMLLIBDIR)/stublibs
+DESTDIR=$(CURDIR)/debian/libsha-ocaml-dev/$(OCAMLLIBDIR)
+STUBDIR=$(CURDIR)/debian/libsha-ocaml/$(OCAMLLIBDIR)/stublibs
-ifneq ($(NATIVECODE),yes)
- # override incorrect value set by OCamlMakefile
- export LIBINSTALL_FILES = $(PKG).mli $(PKG).cmi $(PKG).cma \
- lib$(PKG)_stubs.a dll$(PKG)_stubs.so
+export OCAMLFIND_INSTFLAGS = -destdir $(DESTDIR) -ldconf ignore
+export NO_CUSTOM = yes
+
+LIBINSTALL_FILES = sha1.mli sha1.cmi sha256.mli sha256.cmi \
+ sha.cma libsha_stubs.a dllsha_stubs.so
+ifeq ($(NATIVECODE),yes)
+ LIBINSTALL_FILES += sha.cmxa sha.a
endif
+export LIBINSTALL_FILES
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
-
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(shell ocamlc -version)"
common-install-prehook-impl::
mkdir -p $(DESTDIR)
@@ -38,4 +38,4 @@
common-install-impl::
mkdir -p $(STUBDIR)
- mv $(DESTDIR)/$(PKG)/dll$(PKG)_stubs.so $(STUBDIR)
+ mv $(DESTDIR)/sha/dll*_stubs.so $(STUBDIR)
Modified: trunk/packages/ocaml-sha1/trunk/debian/svn-deblayout
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/trunk/debian/svn-deblayout?rev=3042&op=diff
==============================================================================
--- trunk/packages/ocaml-sha1/trunk/debian/svn-deblayout (original)
+++ trunk/packages/ocaml-sha1/trunk/debian/svn-deblayout Fri Sep 1 19:14:09 2006
@@ -1,3 +1,3 @@
origDir=../upstream
-origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/upstream
-tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocaml-sha1
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-sha/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocaml-sha
Added: trunk/packages/ocaml-sha1/upstream/ocaml-sha_1.2.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha1/upstream/ocaml-sha_1.2.orig.tar.gz?rev=3042&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/ocaml-sha1/upstream/ocaml-sha_1.2.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list