[Pkg-ocaml-maint-commits] [SCM] ocaml-bitmatch packaging branch, master, updated. debian/1.9.7-1-1-gf3c193e

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 5d067a94160e27b132fe4aed5da0d30d4838fd8f
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sat Aug 9 21:07:09 2008 +0000

    Change bitmatch to bitstring inside files.

diff --git a/debian/changelog b/debian/changelog
index 2e46df8..a163de2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ocaml-bitstring (1.3-1) UNRELEASED; urgency=low
+ocaml-bitstring (1.9.7-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #490221)
 
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 10 Jul 2008 21:15:40 +0200
+ -- Sylvain Le Gall <gildor at debian.org>  Sat, 09 Aug 2008 20:43:06 +0000
diff --git a/debian/control b/debian/control
index e6fdff6..393e7df 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,21 @@
-Source: ocaml-bitmatch
+Source: ocaml-bitstring
 Section: libdevel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sylvain Le Gall <gildor at debian.org>
 Build-Depends: cdbs (>= 0.4.23), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), ocaml-findlib, camlp4-extra
 Standards-Version: 3.8.0
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-bitmatch.git
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-bitmatch.git
-Homepage: http://code.google.com/p/bitmatch/
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-bitstring.git
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-bitstring.git
+Homepage: http://code.google.com/p/bitstring/
 
-Package: libbitmatch-ocaml-dev
+Package: libbitstring-ocaml-dev
 Architecture: any
 Section: libdevel
 Depends: ocaml-base-${F:OCamlABI}
 Recommends: camlp4
 Description: Erlang-style bitstrings for OCaml
- Bitmatch adds Erlang-style bitstrings and matching over bitstrings as a syntax
+ 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
@@ -24,7 +24,7 @@ Description: Erlang-style bitstrings for OCaml
  Bitstring handling is added as primitives to the language, making it simple to
  use. 
  .
- Bitmatch handles integers, strings, sub-bitstrings, big-, little- and
+ Bitstring handles integers, strings, sub-bitstrings, big-, little- and
  native-endianness, signed and unsigned types, variable-width fields, fields
  with arbitrary bit alignment.
  .
diff --git a/debian/copyright b/debian/copyright
index 1bf3c0b..2452344 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
 Packaged-By: Sylvain Le Gall <gildor at debian.org> 
 Packaged-Date: Thu, 10 Jul 2008 21:54:01 +0200
 Upstream-author: Richard W.M. Jones <rjones at redhat.com>
-Original-Source-Location: http://code.google.com/p/bitmatch/
+Original-Source-Location: http://code.google.com/p/bitstring/
 
 Files: *
 Copyright: © 2007 Richard W.M. Jones, Red Hat Inc.
diff --git a/debian/rules b/debian/rules
index 13b6887..87f16c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules for ocaml-bitmatch package
+# debian/rules for ocaml-bitstring package
 # Copyright (C) 2008 Sylvain Le Gall <gildor at debian.org>
 #
 # This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@ include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/ocaml.mk
 
-DESTDIR_DEV=$(CURDIR)/debian/libbitmatch-ocaml-dev
+DESTDIR_DEV=$(CURDIR)/debian/libbitstring-ocaml-dev
 
 DEB_MAKE_CLEAN_TARGET    := distclean
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
@@ -35,7 +35,8 @@ DEB_MAKE_INSTALL_TARGET  := install-byte
 endif
 DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
-OCAML_OCAMLDOC_PACKAGES = libbitmatch-ocaml-dev
+OCAML_OCAMLDOC_PACKAGES = libbitstring-ocaml-dev
 
 clean::
-	-$(RM) '$(CURDIR)/debian/libbitmatch-ocaml-dev.dirs'
+	-$(RM) '$(CURDIR)/debian/libbitstring-ocaml-dev.dirs'
+	-$(RM) '$(CURDIR)/cil-tools/Makefile'
diff --git a/debian/watch b/debian/watch
index af9ba5b..9c5b7ee 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-http://code.google.com/p/bitmatch/downloads/list \
- http://bitmatch.googlecode.com/files/ocaml-bitmatch-([0-9\.]*).tar.gz
+http://code.google.com/p/bitstring/downloads/list \
+ http://bitstring.googlecode.com/files/ocaml-bitstring-([0-9\.]*).tar.gz

-- 
ocaml-bitmatch packaging