[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, experimental/master, updated. debian/2.2.9-8-43-gf80edf8
The following commit has been merged in the experimental/master branch: commit bc980bc993f908f5cd5e4abf85c80e50530f8e57 Author: Stephane Glondu st...@glondu.net Date: Thu Jul 21 09:45:26 2011 +0200 Fix debian/watch diff --git a/debian/watch b/debian/watch index 0de7ea0..0e8bf4c 100644 --- a/debian/watch +++ b/debian/watch @@ -3,4 +3,5 @@ # Compulsory line, this is a version 3 file version=3 +opts=uversionmangle=s/#48\x3b/0/ \ http://download.camlcity.org/download/ocamlnet-(.*)\.tar\.gz -- ocamlnet 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] ocamlnet packaging branch, experimental/master, updated. debian/2.2.9-8-43-gf80edf8
The following commit has been merged in the experimental/master branch:
commit d55643c022f4da40800a5038db3029d86dde2249
Author: Stephane Glondu st...@glondu.net
Date: Thu Jul 21 10:02:02 2011 +0200
Remove patch applied upstream
diff --git a/debian/patches/Add-netglob_lex.mll-from-upstream-svn.patch
b/debian/patches/Add-netglob_lex.mll-from-upstream-svn.patch
deleted file mode 100644
index ff0a82d..000
--- a/debian/patches/Add-netglob_lex.mll-from-upstream-svn.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From: Gerd Stolpmann g...@gerd-stolpmann.de
-Date: Fri, 17 Dec 2010 18:24:59 +
-Subject: Add netglob_lex.mll from upstream svn
-
-git-svn-id: https://godirepo.camlcity.org/svn/lib-ocamlnet2@1514
96e5b9e0-aa12-0410-9e2e-b23d24e56262
- src/netstring/netglob_lex.mll | 225 +
- 1 files changed, 225 insertions(+), 0 deletions(-)
- create mode 100644 src/netstring/netglob_lex.mll
-
-diff --git a/src/netstring/netglob_lex.mll b/src/netstring/netglob_lex.mll
-new file mode 100644
-index 000..8aa93cc
/dev/null
-+++ b/src/netstring/netglob_lex.mll
-@@ -0,0 +1,225 @@
-+(* $Id$ *)
-+
-+{
-+ exception Bracket_Unsupported
-+ exception Lexing_Error
-+
-+ type bracket_token =
-+ Bracket_char of char
-+| Bracket_range of (char * char)
-+| Bracket_code of int (* see Netglob.reparse_bracket_expr *)
-+| Bracket_end
-+
-+ type brace_token =
-+ Brace_literal of string
-+| Brace_comma
-+| Brace_braces of brace_token list (* inner braces *)
-+| Brace_end
-+
-+ type glob_features =
-+ { enable_star : bool;
-+ enable_qmark : bool;
-+ enable_brackets : bool;
-+ enable_braces : bool;
-+ enable_tilde : bool;
-+ enable_escape : bool;
-+ mutable escaped : bool; (* after a backslash *)
-+ }
-+
-+ type glob_token =
-+ Glob_literal of string
-+| Glob_star
-+| Glob_qmark
-+| Glob_brackets of (bool * bracket_token list)
-+| Glob_braces of brace_token list
-+| Glob_tilde of string * bool (* whether there is a slash *)
-+| Glob_end
-+
-+ type exploded_char =
-+ C of char (* An unescaped character *)
-+| E of char (* An escaped character *)
-+| Delim of char (* delimiter *)
-+
-+
-+
-+ let rec collect_until end_token parse_fun lexbuf =
-+let tok = parse_fun lexbuf in
-+if tok = end_token then
-+ []
-+else
-+ tok :: (collect_until end_token parse_fun lexbuf)
-+
-+
-+ let string_of_exploded l =
-+String.concat
-+ (List.map
-+ (function
-+ | C c - String.make 1 c
-+ | E c - String.make 1 c
-+ | Delim _ -
-+ )
-+ l
-+ )
-+
-+ let have_delim l =
-+List.exists (function Delim _ - true | _ - false) l
-+
-+}
-+
-+(* bracket_rest: Scans a bracket expression beginning at the second
-+ * character (where ']' is always the terminating character)
-+ *)
-+
-+rule bracket_rest = parse
-+[: [^ ':' ] :] { raise Bracket_Unsupported }
-+ | [. [^ '.' ] .] { raise Bracket_Unsupported }
-+ | [= [^ '=' ] =] { raise Bracket_Unsupported }
-+ | ]{ Bracket_end }
-+ | [ ^ ']' ] - [^ ']' ]
-+ { let c0 = Lexing.lexeme_char lexbuf 0 in
-+ let c1 = Lexing.lexeme_char lexbuf 2 in
-+ if c0 '\127' || c1 '\127' then raise Lexing_Error;
-+ if c0 c1 then raise Lexing_Error;
-+ Bracket_range(c0,c1)
-+ }
-+ | eof{ raise Lexing_Error }
-+ | [ ^ ']' ] { Bracket_char (Lexing.lexeme_char lexbuf 0) }
-+
-+(* bracket_first: Scans the first token of a bracket expression
-+ * (after [, [^, or [!).
-+ * Here, ']' is not recognized as terminating character.
-+ *)
-+
-+and bracket_first = parse
-+[: [^ ':' ] :] { raise Bracket_Unsupported }
-+ | [. [^ '.' ] .] { raise Bracket_Unsupported }
-+ | [= [^ '=' ] =] { raise Bracket_Unsupported }
-+ | _ - [^ ']' ] { let c0 = Lexing.lexeme_char lexbuf 0 in
-+ let c1 = Lexing.lexeme_char lexbuf 2 in
-+ if c0 '\127' || c1 '\127' then raise Lexing_Error;
-+ if c0 c1 then raise Lexing_Error;
-+ Bracket_range(c0,c1)
-+ }
-+ | eof{ raise Lexing_Error }
-+ | _ { Bracket_char (Lexing.lexeme_char lexbuf 0) }
-+
-+
-+(* brace: Collects material within brace expressions (case: backslash
-+ * is escape character
-+ *)
-+
-+and brace = parse
-+}{ Brace_end }
-+ | ,{ Brace_comma }
-+ | {{ let l = collect_until Brace_end brace lexbuf in
-+ Brace_braces l }
-+ | '\\' _ { Brace_literal (Lexing.lexeme lexbuf) }
-+ | [^ '}' ',' '\\' '{' ] { Brace_literal (Lexing.lexeme lexbuf) }
-+ | eof{ raise Lexing_Error }
-+ | _ { raise
[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, experimental/master, updated. debian/2.2.9-8-43-gf80edf8
The following commit has been merged in the experimental/master branch: commit 7c5c7828df2d2e44c22b57fe39e0df03be837e90 Author: Stephane Glondu st...@glondu.net Date: Thu Jul 21 10:23:23 2011 +0200 Install forgotten components diff --git a/debian/libocamlnet-ocaml-dev.install.in b/debian/libocamlnet-ocaml-dev.install.in index d52c048..f394cc9 100644 --- a/debian/libocamlnet-ocaml-dev.install.in +++ b/debian/libocamlnet-ocaml-dev.install.in @@ -1,8 +1,11 @@ @OCamlStdlibDir@/equeue@OCamlStdlibDir@ +@OCamlStdlibDir@/netcamlbox@OCamlStdlibDir@ @OCamlStdlibDir@/netcgi2 @OCamlStdlibDir@ @OCamlStdlibDir@/netcgi_apache @OCamlStdlibDir@ @OCamlStdlibDir@/netcgi2-plex @OCamlStdlibDir@ @OCamlStdlibDir@/netclient @OCamlStdlibDir@ +@OCamlStdlibDir@/netgssapi @OCamlStdlibDir@ +@OCamlStdlibDir@/netmulticore @OCamlStdlibDir@ @OCamlStdlibDir@/netplex @OCamlStdlibDir@ @OCamlStdlibDir@/netshm@OCamlStdlibDir@ @OCamlStdlibDir@/netstring @OCamlStdlibDir@ -- ocamlnet 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] ocamlnet packaging branch, experimental/master, updated. debian/2.2.9-8-43-gf80edf8
The following commit has been merged in the experimental/master branch: commit c36da4a130c3bd8a14cd0459fd56f0584ae509ec Author: Stephane Glondu st...@glondu.net Date: Thu Jul 21 10:36:19 2011 +0200 Fix debian/rules logic to explude rpc-auth-local diff --git a/debian/rules b/debian/rules index 65da3bb..564dbeb 100755 --- a/debian/rules +++ b/debian/rules @@ -22,8 +22,11 @@ DEB_STRIP_EXCLUDE += usr/bin/netplex-admin DEB_STRIP_EXCLUDE += usr/bin/ocamlrpcgen # For Debian GNU/kFreeBSD and GNU/Hurd ports -NO_RPC_AUTH_LOCAL = $(findstring freebsd,$(DEB_HOST_ARCH)) -NO_RPC_AUTH_LOCAL += $(findstring hurd,$(DEB_HOST_ARCH)) +ifneq ($(findstring freebsd,$(DEB_HOST_ARCH)),) +RPC_AUTH_LOCAL = no +else ifneq ($(findstring hurd,$(DEB_HOST_ARCH)),) +RPC_AUTH_LOCAL = no +endif CFGFLAGS = CFGFLAGS += -enable-gtk2 -enable-ssl @@ -34,7 +37,7 @@ CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2 configure/$(PKGNAME):: debian/configure-stamp debian/configure-stamp: ./configure $(CFGFLAGS) -ifneq $(NO_RPC_AUTH_LOCAL) +ifeq ($(RPC_AUTH_LOCAL),no) sed -i -n '/rpc.auth.local/!p' debian/*.install endif touch debian/configure-stamp -- ocamlnet 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] ocamlnet packaging branch, experimental/master, updated. debian/2.2.9-8-43-gf80edf8
The following commit has been merged in the experimental/master branch: commit f80edf893d3db7f4c3c771485bd8a81eaf68cdb3 Author: Stephane Glondu st...@glondu.net Date: Thu Jul 21 11:11:35 2011 +0200 Update changelog and prepare upload to experimental diff --git a/debian/changelog b/debian/changelog index ff9eca7..565c3aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,18 @@ -ocamlnet (3.3.5-1) UNRELEASED; urgency=low +ocamlnet (3.3.5-1) experimental; urgency=low [ Stéphane Glondu ] + * New upstream release (Closes: #634906) +- newly installed components: netcamlbox, netgssapi, netmulticore * Remove misleading debian/README.source * Remove ancient versioned conflicts + * Rewrite debian/rules using dh with overrides + * Bump debhelper compatibility level to 8 * Bump Standards-Version to 3.9.2 [ Eric Cooper ] - * Imported Upstream version 3.2.1 - * Update patches for new upstream version * Don't ship *.so.owner files created by findlib - -- Eric Cooper e...@cmu.edu Sun, 06 Mar 2011 18:15:11 -0500 + -- Stéphane Glondu glo...@debian.org Thu, 21 Jul 2011 11:09:36 +0200 ocamlnet (2.2.9-8) unstable; urgency=low -- ocamlnet 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] ocamlnet packaging branch, experimental/master, updated. debian/2.2.9-8-43-gf80edf8
The following commit has been merged in the experimental/master branch: commit f2ede79ff373e63176bb1eac88d8580d2ff19d89 Author: Stephane Glondu st...@glondu.net Date: Thu Jul 21 10:53:28 2011 +0200 debian/rules using dh with overrides, bump compat to 8 diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index 1ba92f1..a2815ed 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,7 @@ Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Stéphane Glondu glo...@debian.org Build-Depends: - debhelper ( 7), - cdbs, + debhelper (= 8), dh-ocaml (= 0.9), ocaml-nox (= 3.11.1-3~), camlp4 (= 3.11.1-3~), diff --git a/debian/rules b/debian/rules index 564dbeb..d9ab256 100755 --- a/debian/rules +++ b/debian/rules @@ -1,26 +1,17 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/ocaml.mk -include /usr/share/cdbs/1/class/makefile.mk +# -*- makefile -*- -PKGNAME = libocamlnet-ocaml-dev +include /usr/share/ocaml/ocamlvars.mk +PKGNAME = libocamlnet-ocaml-dev DESTDIR = $(CURDIR)/debian/tmp -OCAMLFIND_DESTDIR = $(DESTDIR)$(OCAML_STDLIB_DIR) - -DEB_MAKE_CLEAN_TARGET = distclean -DEB_MAKE_BUILD_TARGET = all -DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR) OCAMLFIND_DESTDIR=$(OCAMLFIND_DESTDIR) +export OCAMLFIND_DESTDIR = $(DESTDIR)$(OCAML_STDLIB_DIR) +BUILD_TARGET = all ifeq ($(OCAML_HAVE_OCAMLOPT),yes) -DEB_MAKE_BUILD_TARGET += opt +BUILD_TARGET += opt endif -DEB_DH_COMPRESS_ARGS = -X.ml -# OCaml custom bytecode binaries can't be striped -DEB_STRIP_EXCLUDE += usr/bin/netplex-admin -DEB_STRIP_EXCLUDE += usr/bin/ocamlrpcgen - # For Debian GNU/kFreeBSD and GNU/Hurd ports ifneq ($(findstring freebsd,$(DEB_HOST_ARCH)),) RPC_AUTH_LOCAL = no @@ -34,13 +25,33 @@ CFGFLAGS += -with-nethttpd -prefer-netcgi2 -with-rpc-auth-dh CFGFLAGS += -bindir /usr/bin -datadir /usr/share/ocamlnet CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2 -configure/$(PKGNAME):: debian/configure-stamp -debian/configure-stamp: +%: + dh $@ --with ocaml + +.PHONY: override_dh_auto_configure +override_dh_auto_configure: ./configure $(CFGFLAGS) ifeq ($(RPC_AUTH_LOCAL),no) sed -i -n '/rpc.auth.local/!p' debian/*.install endif - touch debian/configure-stamp -clean:: - rm -f debian/configure-stamp + +.PHONY: override_dh_auto_build +override_dh_auto_build: + $(MAKE) $(BUILD_TARGET) + +.PHONY: override_dh_auto_install +override_dh_auto_install: + $(MAKE) install DESTDIR=$(DESTDIR) + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: + dh_auto_clean rm -Rf src/netcgi2-apache/.libs/ + +.PHONY: override_dh_install +override_dh_install: + dh_install --fail-missing -X.so.owner + +.PHONY: override_dh_compress +override_dh_compress: + dh_compress -X.ml -- ocamlnet 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
