[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.2-3-12-g550b2d2
The following commit has been merged in the master branch: commit 550b2d2c0753f67aac6a3610595d56d6e377ed62 Author: Stephane Glondu Date: Wed Jul 24 10:07:38 2013 +0100 Update changelog and prepare upload to experimental diff --git a/debian/changelog b/debian/changelog index e64b00e..634d281 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,14 @@ -ocaml-bitstring (2.0.4-1) UNRELEASED; urgency=low +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 09:02:42 +0100 + -- Stéphane Glondu Wed, 24 Jul 2013 10:07:30 +0100 ocaml-bitstring (2.0.2-3) unstable; urgency=low -- ocaml-bitstring packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.2-3-12-g550b2d2
The following commit has been merged in the master branch: commit 1d724b2c42cef6ca82fe6084619b56601fb0b55d Author: Stephane Glondu Date: Wed Jul 24 10:01:55 2013 +0100 Compile with OCaml >= 4 diff --git a/debian/control b/debian/control index 057d83b..14c6717 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Uploaders: Build-Depends: cdbs (>= 0.4.23), debhelper (>= 7), - ocaml-nox (>= 3.11.1), - ocaml-findlib (>= 1.2.4-2), + ocaml-nox (>= 4), + ocaml-findlib (>= 1.4), camlp4-extra, dh-ocaml (>= 0.9), time -- ocaml-bitstring packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.2-3-12-g550b2d2
The following commit has been merged in the master branch: commit e475830400988b5a8867e6db9002a3086e4d4e77 Author: Stephane Glondu Date: Wed Jul 24 10:06:53 2013 +0100 Update Vcs-* diff --git a/debian/control b/debian/control index 14c6717..41376d7 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,8 @@ Build-Depends: dh-ocaml (>= 0.9), time Standards-Version: 3.9.2 -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 +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 -- ocaml-bitstring packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.2-3-12-g550b2d2
The following commit has been merged in the master branch: commit 3f264e32589eb17598feb0ba5b1912d29c765c67 Author: Stephane Glondu Date: Wed Jul 24 09:01:35 2013 +0100 Update debian/watch diff --git a/debian/watch b/debian/watch index 9c5b7ee..fd4e9fc 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ version=3 -http://code.google.com/p/bitstring/downloads/list \ - http://bitstring.googlecode.com/files/ocaml-bitstring-([0-9\.]*).tar.gz +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).* -- ocaml-bitstring packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.2-3-12-g550b2d2
The following commit has been merged in the master branch: commit 200845757300e583109b001fc2c21cf183d361c2 Merge: 3f264e32589eb17598feb0ba5b1912d29c765c67 86309805de3fbfa36807a14a35d9d5ddf1e71766 Author: Stephane Glondu Date: Wed Jul 24 09:02:40 2013 +0100 Merge tag 'upstream/2.0.4' Upstream version 2.0.4 -- ocaml-bitstring packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.2-3-12-g550b2d2
The following commit has been merged in the master branch:
commit 8e2e24dd45d6827a1f00a0d2e1cf28ef6f3b7f38
Author: Stephane Glondu
Date: Wed Jul 24 09:54:27 2013 +0100
Refresh patches
diff --git a/debian/patches/0001-Fix-camlp4of.opt-detection-in-configure.patch
b/debian/patches/0001-Fix-camlp4of.opt-detection-in-configure.patch
index d4afd4a..f6b0fc1 100644
--- a/debian/patches/0001-Fix-camlp4of.opt-detection-in-configure.patch
+++ b/debian/patches/0001-Fix-camlp4of.opt-detection-in-configure.patch
@@ -4,15 +4,15 @@ Subject: Fix camlp4of.opt detection in configure
Signed-off-by: Sylvain Le Gall
---
- configure| 50 ++
+ configure| 48 +---
configure.ac |6 +-
- 2 files changed, 51 insertions(+), 5 deletions(-)
+ 2 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
-index 7f5fa37..9587336 100755
+index ba77b55..9fc8be6 100755
--- a/configure
+++ b/configure
-@@ -643,6 +643,7 @@ DIFF
+@@ -627,6 +627,7 @@ DIFF
TIME
OCAML_PKG_cil
OCAML_PKG_extlib
@@ -20,35 +20,35 @@ index 7f5fa37..9587336 100755
CAMLP4OF
OCAMLFIND
OCAMLBUILD
-@@ -5295,8 +5296,8 @@ $as_echo "$as_me: error: You must have ocaml and findlib
installed" >&2;}
-{ (exit 1); exit 1; }; }
+@@ -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:$LINENO: checking for $ac_word" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CAMLP4OF+set}" = set; then
-@@ -5312,7 +5313,7 @@ do
+ 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x
"$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found
$as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -5333,8 +5334,49 @@ $as_echo "no" >&6; }
+@@ -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:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CAMLP4OFOPT+set}" = set; then
++if ${ac_cv_prog_CAMLP4OFOPT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CAMLP4OFOPT"; then
@@ -59,14 +59,14 @@ index 7f5fa37..9587336 100755
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x
"$as_dir/$ac_word$ac_exec_ext"; }; then
++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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++$as_echo "$as_me:${as_lineno-$LINENO}: found
$as_dir/$ac_word$ac_exec_ext" >&5
+break 2
+ fi
+done
-+done
++ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_prog_CAMLP4OFOPT" && ac_cv_prog_CAMLP4OFOPT="no"
@@ -74,10 +74,10 @@ index 7f5fa37..9587336 100755
+fi
+CAMLP4OFOPT=$ac_cv_prog_CAMLP4OFOPT
+if test -n "$CAMLP4OFOPT"; then
-+ { $as_echo "$as_me:$LINENO: result: $CAMLP4OFOPT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAMLP4OFOPT" >&5
+$as_echo "$CAMLP4OFOPT" >&6; }
+else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
@@ -86,16 +86,13 @@ index 7f5fa37..9587336 100755
+ CAMLP4OF=$CAMLP4OFOPT
+fi
if test "x$CAMLP4OF" = "xno"; then
--{ { $as_echo "$as_me:$LINENO: error: You must have camlp4 installed" >&5
-+ { { $as_echo "$as_me:$LINENO: error: You must have camlp4 installed" >&5
- $as_echo "$as_me: error: You must have camlp4 installed" >&2;}
-{ (exit 1); exit 1; }; }
+ as_fn_error $? "You must have camlp4 installed" "$LINENO" 5
fi
diff --git a/configure.ac b/configure.ac
-index 174ed8c..c72bdb5 100644
+index d6e8720..b4fd6e2 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -59,7 +59,11 @@ if test "x$OCAMLFIND" = "x"; then
+@@ -61,7 +
[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.2-3-12-g550b2d2
The following commit has been merged in the master branch: commit 33627732bf1daaea7c5c3db48db49169351a4250 Author: Stephane Glondu Date: Wed Jul 24 09:03:24 2013 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index e791b94..e64b00e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -ocaml-bitstring (2.0.2-4) UNRELEASED; urgency=low +ocaml-bitstring (2.0.4-1) UNRELEASED; urgency=low + [ Stéphane Glondu ] + * New upstream release + + [ Sylvain Le Gall ] * Remove Sylvain Le Gall from uploaders - -- Sylvain Le Gall Fri, 21 Sep 2012 01:17:40 + + -- Stéphane Glondu Wed, 24 Jul 2013 09:02:42 +0100 ocaml-bitstring (2.0.2-3) unstable; urgency=low -- ocaml-bitstring packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
