debian/0000755000000000000000000000000012247303166007172 5ustar debian/control0000644000000000000000000000411312173716527010603 0ustar Source: ocaml-bitstring Section: ocaml Priority: optional Maintainer: Debian OCaml Maintainers Uploaders: Stéphane Glondu , Mehdi Dogguy Build-Depends: cdbs (>= 0.4.23), debhelper (>= 7), ocaml-nox (>= 4), ocaml-findlib (>= 1.4), camlp4-extra, dh-ocaml (>= 0.9), time Standards-Version: 3.9.2 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/ocaml-bitmatch.git Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocaml-bitmatch.git Homepage: http://code.google.com/p/bitstring/ Package: libbitstring-ocaml-dev Architecture: any Depends: ${ocaml:Depends}, ${misc:Depends}, libbitstring-ocaml (= ${binary:Version}) Provides: ${ocaml:Provides} Suggests: ocaml-findlib Description: Erlang-style bitstrings for OCaml (development files) Bitstring adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml. . You can use this module to both parse and generate binary formats, files and protocols. . Bitstring handling is added as primitives to the language, making it simple to use. . Bitstring handles integers, strings, sub-bitstrings, big-, little- and native-endianness, signed and unsigned types, variable-width fields, fields with arbitrary bit alignment. . This package contains header and OCaml library. Package: libbitstring-ocaml Architecture: any Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends} Provides: ${ocaml:Provides} Description: Erlang-style bitstrings for OCaml (runtime) Bitstring adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml. . You can use this module to both parse and generate binary formats, files and protocols. . Bitstring handling is added as primitives to the language, making it simple to use. . Bitstring handles integers, strings, sub-bitstrings, big-, little- and native-endianness, signed and unsigned types, variable-width fields, fields with arbitrary bit alignment. . This package contains only the shared runtime stub libraries. debian/TODO0000644000000000000000000000004211615451251007653 0ustar * package cil to create cil-tools debian/README.source0000644000000000000000000000027111615451251011346 0ustar This package use dpatch for patching the source. Please consider reading dpatch manpage to patch the source. -- Sylvain Le Gall Thu, 10 Jul 2008 21:15:09 +0200 debian/source/0000755000000000000000000000000011615451251010467 5ustar debian/source/format0000644000000000000000000000001411615451251011675 0ustar 3.0 (quilt) debian/copyright0000644000000000000000000000343411615451251011126 0ustar Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat Packaged-By: Sylvain Le Gall Packaged-Date: Thu, 10 Jul 2008 21:54:01 +0200 Upstream-author: Richard W.M. Jones Original-Source-Location: http://code.google.com/p/bitstring/ Files: * Copyright: © 2007 Richard W.M. Jones, Red Hat Inc. License: LGPL-2.1+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. Files: *.ml Files: *.mli Copyright: © 2007 Richard W.M. Jones, Red Hat Inc. License: LGPL-2.1+ | other As a special exception to the GNU Library General Public License, you may link, statically or dynamically, a "work that uses the Library" with a publicly distributed version of the Library to produce an executable file containing portions of the Library, and distribute that executable file under terms of your choice, without any of the additional requirements listed in clause 6 of the GNU Library General Public License. By "a publicly distributed version of the Library", we mean either the unmodified Library as distributed by Red Hat, or a modified version of the Library that is distributed under the conditions defined in clause 2 of the GNU Library General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU Library General Public License. On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. Files: debian/* Copyright: © 2008 Sylvain Le Gall License: GPL-2+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/GPL-2'. debian/watch0000644000000000000000000000055412173716527010236 0ustar version=3 opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,\ downloadurlmangle=s%.*/([^/]*)/downloads/detail\?name=([^=&]*).*%http://$1.googlecode.com/files/$2%,filenamemangle=s/.*name=([^&]+).*/$1/ \ http://code.google.com/p/bitstring/downloads/list?can=1 .*=ocaml-bitstring-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)|zip).* debian/libbitstring-ocaml-dev.examples0000644000000000000000000000002111615451251015261 0ustar examples/* tests debian/compat0000644000000000000000000000000211615451251010365 0ustar 7 debian/libbitstring-ocaml-dev.dirs.in0000644000000000000000000000002111615451251015011 0ustar @OCamlStdlibDir@ debian/rules0000755000000000000000000000253711615451251010256 0ustar #!/usr/bin/make -f # debian/rules for ocaml-bitstring package # Copyright (C) 2008 Sylvain Le Gall # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2, or (at # your option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, # MA 02110-1301, USA. include /usr/share/cdbs/1/rules/ocaml.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk DESTDIR_DEV=$(CURDIR)/debian/libbitstring-ocaml-dev DESTDIR=$(CURDIR)/debian/libbitstring-ocaml DEB_MAKE_CLEAN_TARGET := distclean DEB_MAKE_BUILD_TARGET := all DEB_MAKE_INSTALL_TARGET := install DEB_MAKE_INSTALL_TARGET += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)" OCAMLFIND_LDCONF=ignore install/libbitstring-ocaml-dev:: mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/bitstring/*.so \ '$(DESTDIR)/$(OCAML_DLL_DIR)' debian/gbp.conf0000644000000000000000000000003611615451251010605 0ustar [DEFAULT] pristine-tar = True debian/libbitstring-ocaml.dirs.in0000644000000000000000000000001611615451251014241 0ustar @OCamlDllDir@ debian/clean0000644000000000000000000000002311615451251010167 0ustar cil-tools/Makefile debian/changelog0000644000000000000000000000655612247303166011060 0ustar ocaml-bitstring (2.0.4-2) unstable; urgency=low * Upload to unstable -- Stéphane Glondu Tue, 03 Dec 2013 08:21:26 +0100 ocaml-bitstring (2.0.4-1) experimental; urgency=low [ Stéphane Glondu ] * New upstream release * Compile with OCaml >= 4 * Update Vcs-* [ Sylvain Le Gall ] * Remove Sylvain Le Gall from uploaders -- Stéphane Glondu Wed, 24 Jul 2013 10:07:30 +0100 ocaml-bitstring (2.0.2-3) unstable; urgency=low * Fix preprocessor options in META (Closes: #623230) * Switch source package format to 3.0 (quilt) * Switch patches to dom-*-patches scheme * Bump Standards-Version to 3.9.2 (no changes) -- Stéphane Glondu Mon, 18 Apr 2011 17:46:40 +0200 ocaml-bitstring (2.0.2-2) unstable; urgency=low * Fix META file for bitstring.syntax (Closes: #599552). -- Mehdi Dogguy Fri, 08 Oct 2010 23:24:11 +0200 ocaml-bitstring (2.0.2-1) unstable; urgency=low * New upstream release (Closes: #564222) + Remove fix_ARCH_ALIGN_INT64.dpatch: integrated upstream. + Remove add_dynlink.patch: fixed upstream. * Update 01-byte-compilation.dpatch * Update update-configure.patch * Add myself to uploaders. * Update Stéphane's mail address * Remove DMUA flag, not needed anymore. -- Mehdi Dogguy Sat, 09 Jan 2010 11:47:21 +0100 ocaml-bitstring (2.0.0-5) unstable; urgency=low [ Stephane Glondu ] * Use ocaml.mk as a CDBS "rules" file (Closes: #549747) [ Sylvain Le Gall ] * Update for dh_ocaml 0.9: * Use dh_ocamldoc * Use depends/provides in debian/control * Use a debian/clean files * Add license version in debian/copyright -- Sylvain Le Gall Thu, 08 Oct 2009 22:02:20 +0000 ocaml-bitstring (2.0.0-4) unstable; urgency=low [ Stephane Glondu ] * Add patch to fix FTBFS on ARCH_ALIGN_INT64 architectures (hppa, sparc) [ Sylvain Le Gall ] * Set DM-Upload-Allowed and add Stephane Glondu to uploader -- Stephane Glondu Fri, 10 Jul 2009 14:00:32 +0200 ocaml-bitstring (2.0.0-3) unstable; urgency=low * Fix only-bytecode former upload -- Sylvain Le Gall Sat, 04 Jul 2009 21:17:08 +0000 ocaml-bitstring (2.0.0-2) unstable; urgency=low * Fix camlp4of.opt detection in configure -- Sylvain Le Gall Sat, 04 Jul 2009 21:03:45 +0000 ocaml-bitstring (2.0.0-1) unstable; urgency=low * Add debian/gbp.conf to force using pristine-tar * Tighten Build Depends to ease OCaml 3.11.1 migration (findlib and ocaml) * Upgrade standards-version to 3.8.2 (section ocaml) * New Upstream Version * Updated debian/patches/* * Add time Build Depends -- Sylvain Le Gall Fri, 26 Jun 2009 22:18:38 +0200 ocaml-bitstring (1.9.7-2) unstable; urgency=low * Switched to quilt for patch management. * Versioned ocaml related build-dep. * Added build-dep on dh-ocaml. * Fixed git url. * Added patch to add missing dynlink dependencies. * Fixed missing install directory for ocaml-findlib in debian/rules. * Update compat to 7. * Added dependency on ${misc:Depends} (thanks lintian). -- Romain Beauxis Sat, 28 Feb 2009 04:38:39 +0100 ocaml-bitstring (1.9.7-1) unstable; urgency=low * Initial release. (Closes: #490221) -- Sylvain Le Gall Sat, 09 Aug 2008 20:43:06 +0000 debian/libbitstring-ocaml-dev.ocamldoc0000644000000000000000000000001311615451251015225 0ustar -I +camlp4 debian/patches/0000755000000000000000000000000012173717056010626 5ustar debian/patches/0002-Allow-byte-only-compilation.patch0000644000000000000000000000247112173716527017546 0ustar From: Sylvain Le Gall Date: Sat, 9 Aug 2008 21:35:35 +0000 Subject: Allow byte only compilation Signed-off-by: Sylvain Le Gall --- Makefile.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3ce8783..30c8bfa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,6 +34,8 @@ BYTESWAP_H = @BYTESWAP_H@ OCAMLLIB = @OCAMLLIB@ top_srcdir = @top_srcdir@ +OCAMLBEST = @OCAMLBEST@ + pkg_cil = @OCAML_PKG_cil@ pkg_extlib = @OCAML_PKG_extlib@ @@ -78,11 +80,15 @@ BENCHMARKS = $(patsubst %.ml,%,$(wildcard benchmarks/*.ml)) all: $(BYTESWAP_H) \ bitstring.cma bitstring_persistent.cma \ - bitstring.cmxa bitstring_persistent.cmxa \ pa_bitstring.cmo \ bitstring-objinfo @for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done +ifeq ($(OCAMLBEST),opt) +all: bitstring.cmxa bitstring_persistent.cmxa +endif + + bitstring.cma: bitstring_types.cmo bitstring_config.cmo \ bitstring_c.o bitstring.cmo bitmatch.cmo $(OCAMLMKLIB) -o bitstring $^ @@ -271,7 +277,7 @@ endif # Install. install: - ocamlfind install bitstring META *.mli *.cmx *.cma *.cmxa *.a *.so \ + ocamlfind install bitstring META $(wildcard *.mli *.cmx *.cma *.cmxa *.a *.so) \ bitstring.cmi \ bitstring_persistent.cmi \ pa_bitstring.cmo -- debian/patches/0003-Fix-META-file-for-bitstring.syntax.patch0000644000000000000000000000173612173716527020543 0ustar From: Mehdi Dogguy Date: Fri, 8 Oct 2010 22:03:07 +0200 Subject: Fix META file for bitstring.syntax Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=599552 Signed-off-by: Mehdi Dogguy --- META.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/META.in b/META.in index 6b14f17..02560d5 100644 --- a/META.in +++ b/META.in @@ -15,8 +15,8 @@ package "persistent" ( package "syntax" ( version = "@PACKAGE_VERSION@" - requires = "camlp4" + requires = "camlp4 bitstring.persistent" description = "Syntax extension: bitstring operators" - archive(syntax,preprocessor) = "-parser o -parser op -printer p unix.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo" - archive(syntax,toploop) = "unix.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo" + archive(syntax,preprocessor) = "-parser o -parser op -printer p pa_bitstring.cmo" + archive(syntax,toploop) = "pa_bitstring.cmo" ) -- debian/patches/0001-Fix-camlp4of.opt-detection-in-configure.patch0000644000000000000000000000644012173716527021624 0ustar From: Sylvain Le Gall Date: Sat, 4 Jul 2009 21:05:17 +0000 Subject: Fix camlp4of.opt detection in configure Signed-off-by: Sylvain Le Gall --- configure | 48 +++++++++++++++++++++++++++++++++++++++++++++--- configure.ac | 6 +++++- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/configure b/configure index ba77b55..9fc8be6 100755 --- a/configure +++ b/configure @@ -627,6 +627,7 @@ DIFF TIME OCAML_PKG_cil OCAML_PKG_extlib +CAMLP4OFOPT CAMLP4OF OCAMLFIND OCAMLBUILD @@ -4858,8 +4859,8 @@ if test "x$OCAMLFIND" = "x"; then as_fn_error $? "You must have ocaml and findlib installed" "$LINENO" 5 fi -# Extract the first word of "camlp4of.opt", so it can be a program name with args. -set dummy camlp4of.opt; ac_word=$2 +# Extract the first word of "camlp4of", so it can be a program name with args. +set dummy camlp4of; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_CAMLP4OF+:} false; then : @@ -4875,7 +4876,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CAMLP4OF="camlp4of.opt" + ac_cv_prog_CAMLP4OF="camlp4of" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4896,6 +4897,47 @@ $as_echo "no" >&6; } fi +# Extract the first word of "camlp4of.opt", so it can be a program name with args. +set dummy camlp4of.opt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CAMLP4OFOPT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CAMLP4OFOPT"; then + ac_cv_prog_CAMLP4OFOPT="$CAMLP4OFOPT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CAMLP4OFOPT="camlp4of.opt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_CAMLP4OFOPT" && ac_cv_prog_CAMLP4OFOPT="no" +fi +fi +CAMLP4OFOPT=$ac_cv_prog_CAMLP4OFOPT +if test -n "$CAMLP4OFOPT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAMLP4OFOPT" >&5 +$as_echo "$CAMLP4OFOPT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if ! test "x$CAMLP4OFOPT" = "xno"; then + CAMLP4OF=$CAMLP4OFOPT +fi if test "x$CAMLP4OF" = "xno"; then as_fn_error $? "You must have camlp4 installed" "$LINENO" 5 fi diff --git a/configure.ac b/configure.ac index d6e8720..b4fd6e2 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,11 @@ if test "x$OCAMLFIND" = "x"; then fi dnl Check for camlp4 -AC_CHECK_PROG(CAMLP4OF,camlp4of.opt,camlp4of.opt,no) +AC_CHECK_PROG(CAMLP4OF,camlp4of,camlp4of,no) +AC_CHECK_PROG(CAMLP4OFOPT,camlp4of.opt,camlp4of.opt,no) +if ! test "x$CAMLP4OFOPT" = "xno"; then + CAMLP4OF=$CAMLP4OFOPT +fi if test "x$CAMLP4OF" = "xno"; then AC_MSG_ERROR([You must have camlp4 installed]) fi -- debian/patches/series0000644000000000000000000000021012173716527012036 0ustar 0001-Fix-camlp4of.opt-detection-in-configure.patch 0002-Allow-byte-only-compilation.patch 0003-Fix-META-file-for-bitstring.syntax.patch