Author: smimram Date: Sun Feb 18 14:14:08 2007 New Revision: 3574 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3574 Log: New upstream release + updated packaging.
Added: trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.examples trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.install.in trunk/packages/camlzip/trunk/debian/libzip-ocaml.install.in trunk/packages/camlzip/trunk/debian/patches/test-makefile.dpatch (with props) trunk/packages/camlzip/upstream/camlzip_1.03.orig.tar.gz (with props) Removed: trunk/packages/camlzip/trunk/debian/control.in trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.dirs.in trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs trunk/packages/camlzip/trunk/debian/libzip-ocaml.dirs.in trunk/packages/camlzip/trunk/debian/libzip-ocaml.files trunk/packages/camlzip/trunk/debian/libzip-ocaml.files.in trunk/packages/camlzip/upstream/camlzip_1.02.orig.tar.gz Modified: trunk/packages/camlzip/trunk/debian/META trunk/packages/camlzip/trunk/debian/changelog trunk/packages/camlzip/trunk/debian/control trunk/packages/camlzip/trunk/debian/copyright trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.docs trunk/packages/camlzip/trunk/debian/patches/00list trunk/packages/camlzip/trunk/debian/patches/uncompress.dpatch trunk/packages/camlzip/trunk/debian/rules Modified: trunk/packages/camlzip/trunk/debian/META URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/META?rev=3574&op=diff ============================================================================== --- trunk/packages/camlzip/trunk/debian/META (original) +++ trunk/packages/camlzip/trunk/debian/META Sun Feb 18 14:14:08 2007 @@ -1,5 +1,4 @@ -version="1.01" +version="1.03" requires="unix" archive(byte)="zip.cma" archive(native)="zip.cmxa" - Modified: trunk/packages/camlzip/trunk/debian/changelog URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/changelog?rev=3574&op=diff ============================================================================== --- trunk/packages/camlzip/trunk/debian/changelog (original) +++ trunk/packages/camlzip/trunk/debian/changelog Sun Feb 18 14:14:08 2007 @@ -1,12 +1,12 @@ -camlzip (1.02-1) UNRELEASED; urgency=low +camlzip (1.03-1) UNRELEASED; urgency=low - [ Samuel Mimram ] + * New upstream release. + * Improved packaging. + * Updated uncompress.dpatch. * We don't need to remove rpaths anymore. + * Added myself to uploaders. - [ Julien Cristau ] - * New upstream release. - - -- Julien Cristau <[EMAIL PROTECTED]> Tue, 12 Sep 2006 13:21:47 +0200 + -- Samuel Mimram <[EMAIL PROTECTED]> Tue, 13 Feb 2007 18:18:43 +0100 camlzip (1.01-17) unstable; urgency=low Modified: trunk/packages/camlzip/trunk/debian/control URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/control?rev=3574&op=diff ============================================================================== --- trunk/packages/camlzip/trunk/debian/control (original) +++ trunk/packages/camlzip/trunk/debian/control Sun Feb 18 14:14:08 2007 @@ -2,10 +2,10 @@ Section: libdevel Priority: optional Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> -Uploaders: Sven Luther <[EMAIL PROTECTED]>, Stefano Zacchiroli <[EMAIL PROTECTED]> +Uploaders: Sven Luther <[EMAIL PROTECTED]>, Stefano Zacchiroli <[EMAIL PROTECTED]>, Samuel Mimram <[EMAIL PROTECTED]> Build-Depends: debhelper (>> 3.0.0), zlib1g-dev (>> 1.1.4), ocaml-nox (>= 3.09.2), dpatch Standards-Version: 3.7.2 -XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlzip +XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlzip Package: libzip-ocaml Architecture: any Modified: trunk/packages/camlzip/trunk/debian/copyright URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/copyright?rev=3574&op=diff ============================================================================== --- trunk/packages/camlzip/trunk/debian/copyright (original) +++ trunk/packages/camlzip/trunk/debian/copyright Sun Feb 18 14:14:08 2007 @@ -5,8 +5,7 @@ Upstream Author: Xavier Leroy <[EMAIL PROTECTED]> -Copyright: +Copyright (c) 2001-2007 Xavier Leroy. Camlzip is distributed under the terms the LGPL licence, which can be found in the /usr/share/common-licenses/LGPL file on debian systems. - Modified: trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.docs URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.docs?rev=3574&op=diff ============================================================================== --- trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.docs (original) +++ trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.docs Sun Feb 18 14:14:08 2007 @@ -1,2 +1,1 @@ README -test Added: trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.examples URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.examples?rev=3574&op=file ============================================================================== --- trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.examples (added) +++ trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.examples Sun Feb 18 14:14:08 2007 @@ -1,0 +1,1 @@ +test/* Added: trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.install.in URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.install.in?rev=3574&op=file ============================================================================== --- trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.install.in (added) +++ trunk/packages/camlzip/trunk/debian/libzip-ocaml-dev.install.in Sun Feb 18 14:14:08 2007 @@ -1,0 +1,4 @@ +usr/lib/ocaml/@OCamlABI@/zip/META +usr/lib/ocaml/@OCamlABI@/zip/*.a +usr/lib/ocaml/@OCamlABI@/zip/*.cm* +usr/lib/ocaml/@OCamlABI@/zip/*.ml* Added: trunk/packages/camlzip/trunk/debian/libzip-ocaml.install.in URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/libzip-ocaml.install.in?rev=3574&op=file ============================================================================== --- trunk/packages/camlzip/trunk/debian/libzip-ocaml.install.in (added) +++ trunk/packages/camlzip/trunk/debian/libzip-ocaml.install.in Sun Feb 18 14:14:08 2007 @@ -1,0 +1,1 @@ +usr/lib/ocaml/@OCamlABI@/stublibs/dllcamlzip.so Modified: trunk/packages/camlzip/trunk/debian/patches/00list URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/patches/00list?rev=3574&op=diff ============================================================================== --- trunk/packages/camlzip/trunk/debian/patches/00list (original) +++ trunk/packages/camlzip/trunk/debian/patches/00list Sun Feb 18 14:14:08 2007 @@ -1,2 +1,3 @@ build +test-makefile uncompress Added: trunk/packages/camlzip/trunk/debian/patches/test-makefile.dpatch URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/patches/test-makefile.dpatch?rev=3574&op=file ============================================================================== --- trunk/packages/camlzip/trunk/debian/patches/test-makefile.dpatch (added) +++ trunk/packages/camlzip/trunk/debian/patches/test-makefile.dpatch Sun Feb 18 14:14:08 2007 @@ -1,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## test-makefile.dpatch by Samuel Mimram <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use an installed camlzip. + [EMAIL PROTECTED]@ +diff -urNad camlzip-1.03~/test/Makefile camlzip-1.03/test/Makefile +--- camlzip-1.03~/test/Makefile 2001-08-07 17:32:08.000000000 +0200 ++++ camlzip-1.03/test/Makefile 2007-02-18 13:55:19.000000000 +0100 +@@ -1,13 +1,13 @@ + all: minizip minigzip + +-minigzip: ../zip.cma minigzip.ml +- ocamlc -ccopt -g -g -I .. -o minigzip ../zip.cma minigzip.ml ++minigzip: minigzip.ml ++ ocamlc -ccopt -g -g -I +zip -o minigzip zip.cma minigzip.ml + +-minizip: ../zip.cma minizip.ml +- ocamlc -ccopt -g -g -I .. -o minizip unix.cma ../zip.cma minizip.ml ++minizip: minizip.ml ++ ocamlc -ccopt -g -g -I +zip -o minizip unix.cma zip.cma minizip.ml + + testzlib: ../zip.cma testzlib.ml +- ocamlc -g -I .. -o testzlib ../zip.cma testzlib.ml ++ ocamlc -g -I +zip -o testzlib zip.cma testzlib.ml + + clean: + rm -f *.cm* Propchange: trunk/packages/camlzip/trunk/debian/patches/test-makefile.dpatch ------------------------------------------------------------------------------ svn:executable = * Modified: trunk/packages/camlzip/trunk/debian/patches/uncompress.dpatch URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/patches/uncompress.dpatch?rev=3574&op=diff ============================================================================== --- trunk/packages/camlzip/trunk/debian/patches/uncompress.dpatch (original) +++ trunk/packages/camlzip/trunk/debian/patches/uncompress.dpatch Sun Feb 18 14:14:08 2007 @@ -1,9 +1,9 @@ -#! /bin/sh -e -## uncompress.dpatch by <[EMAIL PROTECTED]> +#! /bin/sh -e +## uncompress.dpatch by Sven Luther <[EMAIL PROTECTED]> ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: Makefiles, configure scripts and other build stuff adapted for -## DP: debian package creation +## DP: Add a plain_uncompress function which is a direct binding to zlib's +## DP: uncompress function. if [ $# -ne 1 ]; then echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 @@ -19,20 +19,20 @@ exit 0 @DPATCH@ ---- camlzip-1.01.orig/zlib.ml -+++ camlzip-1.01/zlib.ml -@@ -107,6 +107,9 @@ - uncompr 0 0; - inflate_end zs +diff -urNad camlzip-1.03~/zlib.ml camlzip-1.03/zlib.ml +--- camlzip-1.03~/zlib.ml 2007-02-13 18:21:37.000000000 +0100 ++++ camlzip-1.03/zlib.ml 2007-02-13 18:22:34.000000000 +0100 +@@ -53,6 +53,7 @@ + compr 0 0; + deflate_end zs -+external plain_uncompress: string -> int -> string -> int -> bool -+ = "camlzip_uncompress" -+ - (***** - let uncompress_string inbuf = - let zs = inflate_init true in ---- camlzip-1.01.orig/zlib.mli -+++ camlzip-1.01/zlib.mli ++external plain_uncompress: string -> int -> string -> int -> bool = "camlzip_uncompress" + + let uncompress ?(header = true) refill flush = + let inbuf = String.create buffer_size +diff -urNad camlzip-1.03~/zlib.mli camlzip-1.03/zlib.mli +--- camlzip-1.03~/zlib.mli 2007-02-13 18:21:38.000000000 +0100 ++++ camlzip-1.03/zlib.mli 2007-02-13 18:21:51.000000000 +0100 @@ -7,6 +7,8 @@ val uncompress: ?header: bool -> (string -> int) -> (string -> int -> unit) -> unit @@ -42,9 +42,10 @@ type stream type flush_command = ---- camlzip-1.01.orig/zlibstubs.c -+++ camlzip-1.01/zlibstubs.c -@@ -172,3 +172,13 @@ +diff -urNad camlzip-1.03~/zlibstubs.c camlzip-1.03/zlibstubs.c +--- camlzip-1.03~/zlibstubs.c 2007-02-13 18:21:38.000000000 +0100 ++++ camlzip-1.03/zlibstubs.c 2007-02-13 18:21:51.000000000 +0100 +@@ -173,3 +173,13 @@ Long_val(len))); } Modified: trunk/packages/camlzip/trunk/debian/rules URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/trunk/debian/rules?rev=3574&op=diff ============================================================================== --- trunk/packages/camlzip/trunk/debian/rules (original) +++ trunk/packages/camlzip/trunk/debian/rules Sun Feb 18 14:14:08 2007 @@ -4,31 +4,26 @@ # We want to use dpatch. include /usr/share/dpatch/dpatch.make -PACKAGE = camlzip +PACKAGE := camlzip OCAMLABI := $(shell ocamlc -version) OFILES := $(patsubst %.in,%,$(shell ls debian/*.in)) +INSTALLDIR := $(CURDIR)/debian/tmp/$(shell ocamlc -where)/zip # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - -export OCAML_LIBDIR=`ocamlc -where` ocamlinit: for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done configure: configure-stamp -configure-stamp: - +configure-stamp: ocamlinit dh_testdir - # Add here commands to configure the package. - touch configure-stamp build: configure-stamp build-stamp build-stamp: patch-stamp dh_testdir - # Add here commands to compile the package. $(MAKE) if [ -x /usr/bin/ocamlopt ]; then \ $(MAKE) allopt; \ @@ -41,7 +36,6 @@ dh_testroot rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. -$(MAKE) clean dh_clean @@ -52,53 +46,36 @@ dh_clean -k dh_installdirs - # Add here commands to install the package into - # debian/libzip-ocaml-dev - $(MAKE) install DESTDIR=$(CURDIR)/debian/libzip-ocaml-dev + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp if [ -x /usr/bin/ocamlopt ]; then \ - $(MAKE) installopt DESTDIR=$(CURDIR)/debian/libzip-ocaml-dev; \ + $(MAKE) installopt DESTDIR=$(CURDIR)/debian/tmp ; \ fi - cp debian/META $(CURDIR)/debian/libzip-ocaml-dev$(OCAML_LIBDIR)/zip - - # And now move the libzip-ocaml files into their own package. - dh_movefiles -plibzip-ocaml --sourcedir=debian/libzip-ocaml-dev - + cp debian/META $(INSTALLDIR) # Build architecture-independent files here. binary-indep: build install -# We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir -s dh_testroot -s -# dh_installdebconf -s + dh_install -s --sourcedir=debian/tmp --list-missing dh_installdocs -s - cp $(CURDIR)/debian/Makefile.test.Debian \ - $(CURDIR)/debian/libzip-ocaml-dev/usr/share/doc/libzip-ocaml-dev/test/Makefile - dh_installexamples -s + dh_installexamples -s dh_installmenu -s -# dh_installlogrotate -s -# dh_installemacsen -s -# dh_installpam -s -# dh_installmime -s -# dh_installinit -s dh_installcron -s - dh_installman -s - dh_installinfo -s -# dh_undocumented -s - dh_installchangelogs -s + dh_installman -s + dh_installinfo -s + dh_installchangelogs -s dh_link -s dh_strip -s dh_compress -s # dh_ocamlld -plibzip-ocaml /usr/lib/ocaml/zip dh_fixperms -s -# dh_makeshlibs -s dh_installdeb -s -# dh_perl -s - dh_shlibdeps -s + dh_shlibdeps -s dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)" - dh_md5sums -s + dh_md5sums -s dh_builddeb -s binary: binary-indep binary-arch Added: trunk/packages/camlzip/upstream/camlzip_1.03.orig.tar.gz URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlzip/upstream/camlzip_1.03.orig.tar.gz?rev=3574&op=file ============================================================================== Binary file - no diff available. Propchange: trunk/packages/camlzip/upstream/camlzip_1.03.orig.tar.gz ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits