[Pkg-ocaml-maint-commits] [cudf] 01/01: upload to unstable
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch master in repository cudf. commit 9bc67853df6976a72ce4d7ef2d8e60c4aec07b00 Author: Stefano Zacchiroli z...@upsilon.cc Date: Tue May 27 10:15:56 2014 +0200 upload to unstable --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4d6f29e..9918db9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cudf (0.7-2) unstable; urgency=medium + + * upload to unstable + + -- Stefano Zacchiroli z...@debian.org Tue, 27 May 2014 10:15:18 +0200 + cudf (0.7-1) experimental; urgency=medium * new upstream release -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] branch master updated (9383e70 - 9bc6785)
This is an automated email from the git hooks/post-receive script. zack pushed a change to branch master in repository cudf. from 9383e70 upload 0.7-1 to experimental new 9bc6785 upload to unstable The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++ 1 file changed, 6 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] branch upstream updated (8f27b34 - 6289681)
This is an automated email from the git hooks/post-receive script. zack pushed a change to branch upstream in repository cudf. from 8f27b34 Imported Upstream version 0.7 adds 6289681 Imported Upstream version 0.8 No new revisions were added by this update. Summary of changes: ChangeLog | 8 Makefile| 1 + Makefile.config | 2 +- cudf.ml | 15 --- cudf.mli| 5 + cudf_parser.ml | 17 ++--- 6 files changed, 37 insertions(+), 11 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] 03/03: upload 0.8-1 to experimental
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch master in repository cudf. commit 05110d2f04181bd2e6a599d655ead0808095b2af Author: Stefano Zacchiroli z...@upsilon.cc Date: Mon Mar 30 19:45:01 2015 +0200 upload 0.8-1 to experimental --- debian/changelog | 7 +++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9918db9..e057943 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cudf (0.8-1) experimental; urgency=medium + + * new upstream release +- include workaround for parallel build FTBFS (Closes: #752212) + + -- Stefano Zacchiroli z...@debian.org Mon, 30 Mar 2015 19:44:28 +0200 + cudf (0.7-2) unstable; urgency=medium * upload to unstable -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] 02/03: Merge tag 'upstream/0.8'
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch master in repository cudf. commit eb0138143da48a3c99e7760cf23746f94da54ad9 Merge: 9bc6785 6289681 Author: Stefano Zacchiroli z...@upsilon.cc Date: Mon Mar 30 19:44:16 2015 +0200 Merge tag 'upstream/0.8' Upstream version 0.8 ChangeLog | 8 Makefile| 1 + Makefile.config | 2 +- cudf.ml | 15 --- cudf.mli| 5 + cudf_parser.ml | 17 ++--- 6 files changed, 37 insertions(+), 11 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] 01/01: pristine-tar data for cudf_0.8.orig.tar.gz
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch pristine-tar in repository cudf. commit 053e9838f243f823e3cf4dc2ba8c8a7eace72de6 Author: Stefano Zacchiroli z...@upsilon.cc Date: Mon Mar 30 19:44:16 2015 +0200 pristine-tar data for cudf_0.8.orig.tar.gz --- cudf_0.8.orig.tar.gz.delta | Bin 0 - 4369 bytes cudf_0.8.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/cudf_0.8.orig.tar.gz.delta b/cudf_0.8.orig.tar.gz.delta new file mode 100644 index 000..11fe262 Binary files /dev/null and b/cudf_0.8.orig.tar.gz.delta differ diff --git a/cudf_0.8.orig.tar.gz.id b/cudf_0.8.orig.tar.gz.id new file mode 100644 index 000..b6fb425 --- /dev/null +++ b/cudf_0.8.orig.tar.gz.id @@ -0,0 +1 @@ +5362aebe18d75bd269e34157bc99ff0792f5b817 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] branch pristine-tar updated (3e1e306 - 053e983)
This is an automated email from the git hooks/post-receive script. zack pushed a change to branch pristine-tar in repository cudf. from 3e1e306 pristine-tar data for cudf_0.7.orig.tar.gz new 053e983 pristine-tar data for cudf_0.8.orig.tar.gz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: cudf_0.8.orig.tar.gz.delta | Bin 0 - 4369 bytes cudf_0.8.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 cudf_0.8.orig.tar.gz.delta create mode 100644 cudf_0.8.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] 01/03: Imported Upstream version 0.8
This is an automated email from the git hooks/post-receive script.
zack pushed a commit to branch master
in repository cudf.
commit 6289681d8a273d1c477d7814ac707af2e648fa8b
Author: Stefano Zacchiroli z...@upsilon.cc
Date: Mon Mar 30 19:44:16 2015 +0200
Imported Upstream version 0.8
---
ChangeLog | 8
Makefile| 1 +
Makefile.config | 2 +-
cudf.ml | 15 ---
cudf.mli| 5 +
cudf_parser.ml | 17 ++---
6 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d01e8a1..31c5d3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-31 Stefano Zacchiroli z...@upsilon.cc
+ * ALL release 0.8
+ * Cudf: performance improvement by allocating larger hashtbl
+ * Cudf: expose empty_universe
+ (Thanks to Pietro Abate for the above 2 patches)
+ * Makefile: inhibit parallel build (thanks to Roberto Di Cosmo)
+ * Cudf_parser: prevent in_channel leaks when using from_file
+
2014-04-29 Stefano Zacchiroli z...@upsilon.cc
* ALL release 0.7
* Cudf_checker: do not report as multi-upgrade error a package
diff --git a/Makefile b/Makefile
index b03c6c8..f503631 100644
--- a/Makefile
+++ b/Makefile
@@ -130,3 +130,4 @@ world: all opt c-lib c-lib-opt doc
.PHONY: all opt world clean top-level headers test tags install uninstall
.PHONY: dep rpm c-lib c-lib-opt dist doc
+.NOTPARALLEL:
diff --git a/Makefile.config b/Makefile.config
index 7c4b9ed..6f69c17 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,4 +1,4 @@
-VERSION = 0.7
+VERSION = 0.8
export DESTDIR =
diff --git a/cudf.ml b/cudf.ml
index 3ab7cdd..d82359d 100644
--- a/cudf.ml
+++ b/cudf.ml
@@ -106,12 +106,12 @@ let default_request = {
req_extra = [] ;
}
-let empty_universe () =
- { id2pkg = Hashtbl.create 1023 ;
-uid2pkgs = Hashtbl.create 1023;
-id2uid = Hashtbl.create 1023;
-name2pkgs = Hashtbl.create 1023 ;
-features = Hashtbl.create 1023 ;
+let empty_universe ?(size=1023) () =
+ { id2pkg = Hashtbl.create size ;
+uid2pkgs = Hashtbl.create size;
+id2uid = Hashtbl.create size;
+name2pkgs = Hashtbl.create size;
+features = Hashtbl.create size;
univ_size = 0 ; inst_size = 0 ;
}
@@ -184,7 +184,8 @@ let remove_package univ id =
end
let load_universe pkgs =
- let univ = empty_universe () in
+ let size = List.length pkgs in
+ let univ = empty_universe ~size () in
let uid = ref 0 in
List.iter
(fun pkg -
diff --git a/cudf.mli b/cudf.mli
index 9bddf66..93fee10 100644
--- a/cudf.mli
+++ b/cudf.mli
@@ -98,6 +98,11 @@ type cudf = preamble * universe * request
status *)
type solution = preamble * universe
+(** return an empty universe.
+
+@param size represents the initial size of the universe (default: 1023) *)
+val empty_universe : ?size:int - unit - universe
+
(** @raise Constraint_violation when a global CUDF constraint is violated in
the given package list *)
val load_universe : package list - universe
diff --git a/cudf_parser.ml b/cudf_parser.ml
index 48d7ecd..5b4e966 100644
--- a/cudf_parser.ml
+++ b/cudf_parser.ml
@@ -1,6 +1,6 @@
(*)
(* libCUDF - CUDF (Common Upgrade Description Format) manipulation library *)
-(* Copyright (C) 2009-2012 Stefano Zacchiroli z...@upsilon.cc*)
+(* Copyright (C) 2009-2015 Stefano Zacchiroli z...@upsilon.cc*)
(* *)
(* This library is free software: you can redistribute it and/or modify *)
(* it under the terms of the GNU Lesser General Public License as *)
@@ -20,6 +20,10 @@ type cudf_parser = {
lexbuf: Lexing.lexbuf ;
fname: string ;
mutable typedecl: Cudf_conf.stanza_typedecl ;
+ priv_in_chan: in_channel option;
+ (* in_channel to be closed upon close() invocation, to avoid leaving up to
+ OCaml GC when to close it. Will be set only if it is Cudf_parser itself
+ who has created the in_channel, e.g., upon Cudf_parser.from_file *)
}
type loc_map = (string * loc) list
@@ -31,6 +35,7 @@ let from_in_channel ?(typedecl=Cudf_conf.stanza_typedecl) ic =
{ lexbuf = Lexing.from_channel ic ;
typedecl = typedecl ;
fname = ;
+priv_in_chan = None ;
}
let from_IO_in_channel ?(typedecl=Cudf_conf.stanza_typedecl) ic =
@@ -38,18 +43,24 @@ let from_IO_in_channel
?(typedecl=Cudf_conf.stanza_typedecl) ic =
{ lexbuf = Lexing.from_function f;
typedecl = typedecl ;
fname = ;
+priv_in_chan = None ;
}
let from_file ?(typedecl=Cudf_conf.stanza_typedecl) fname =
(* Syntax error with OCaml 3.10.2:
* { from_in_channel ?typedecl (open_in fname)
* with fname = fname } *)
- { lexbuf = Lexing.from_channel (open_in fname) ;
+ let ic = open_in fname in
+ { lexbuf = Lexing.from_channel ic ;
typedecl = typedecl
[Pkg-ocaml-maint-commits] [cudf] annotated tag upstream/0.8 created (now 4fcfb54)
This is an automated email from the git hooks/post-receive script. zack pushed a change to annotated tag upstream/0.8 in repository cudf. at 4fcfb54 (tag) tagging 6289681d8a273d1c477d7814ac707af2e648fa8b (commit) replaces upstream/0.7 tagged by Stefano Zacchiroli on Mon Mar 30 19:44:16 2015 +0200 - Log - Upstream version 0.8 Stefano Zacchiroli (1): Imported Upstream version 0.8 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] annotated tag debian/0.8-1 created (now c6acd95)
This is an automated email from the git hooks/post-receive script. zack pushed a change to annotated tag debian/0.8-1 in repository cudf. at c6acd95 (tag) tagging 05110d2f04181bd2e6a599d655ead0808095b2af (commit) replaces debian/0.7-1 tagged by Stefano Zacchiroli on Mon Mar 30 19:57:28 2015 +0200 - Log - cudf Debian release 0.8-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIVAwUAVRmOiJwxUDxthmOWAQiBfA//ZJtl3PuO7zSOMvizaoHstntEegCkqLT8 KeEuL6WrO1vdpabshVwH50hgrrkivwCELZrC+ezLEQjpI6SI+yIhNJEy/D8OD/P7 BjYRLXL9eAuRu/rtwAdfParjFuDe0DgSvYd0qMhEuFG+5QY8+f9BATK2ZhkeACNJ 8HIgXcqgCnF6SXwzKZIovmjdY/TIXg516oI9U10w23PcRRrWXkUn821dCA6NshV7 wSnHnvQZsuVBW31X0wv19y32YUAu+S85TIS3LkYFnZeFwh8aUK9+fjUxqIgMkqs1 BgGU2oJPLsDtMJYueshlFqFQ3Z1PhH2ut9DGPwxrDANA7Rt/cMcUzzttGRz868sS o0Y7v6S4xgW2vB4pMkVF9Czmdg4WiBXUUjI4nmAIq8Z1guRNX8k5J4kDgrNf7ySF hPQ4qtEoznhzG9e3gM95ivCS0aU05LzlT2myV7K1A2PuLMaOit74kq8KAqHF2mjE v3pTPHZNAJgi4L80THG5cDcLCly8k6HkSU12KwVsecIxqybEv/0HYnwByc5JU2Gn VjCsGD39X/rrX6QoNpArBfEmuBkZ6a7PfdkLkH3sS5nysrICBFJgf4edG0s4W9HD YEOg/Sb//8tIFwskga1kwPFgL9t+d23GC4+iPblqquSR4AK0XRUQfKBAXSzwwYxl 9UCZLZaGpV4= =qmJo -END PGP SIGNATURE- Stefano Zacchiroli (4): upload to unstable Imported Upstream version 0.8 Merge tag 'upstream/0.8' upload 0.8-1 to experimental --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] branch master updated (9bc6785 - 05110d2)
This is an automated email from the git hooks/post-receive script. zack pushed a change to branch master in repository cudf. from 9bc6785 upload to unstable new 6289681 Imported Upstream version 0.8 new eb01381 Merge tag 'upstream/0.8' new 05110d2 upload 0.8-1 to experimental The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: ChangeLog| 8 Makefile | 1 + Makefile.config | 2 +- cudf.ml | 15 --- cudf.mli | 5 + cudf_parser.ml | 17 ++--- debian/changelog | 7 +++ 7 files changed, 44 insertions(+), 11 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [dose3] 01/01: demote trigger on /usr/share/cudf/solvers to interest-noawait
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch master in repository dose3. commit 1dc224c1a97c4dc86a912b2679013dbd23faa1e9 Author: Stefano Zacchiroli z...@upsilon.cc Date: Fri Dec 12 16:18:21 2014 +0100 demote trigger on /usr/share/cudf/solvers to interest-noawait It was interest before. Rationale: there is no real need to block, and doing so avoid trigger cycles. Thanks Guillem Jover for the heads-up. Closes: #772875 --- debian/apt-cudf.triggers | 2 +- debian/changelog | 10 -- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/apt-cudf.triggers b/debian/apt-cudf.triggers index d009580..5218fc5 100644 --- a/debian/apt-cudf.triggers +++ b/debian/apt-cudf.triggers @@ -1 +1 @@ -interest /usr/share/cudf/solvers +interest-noawait /usr/share/cudf/solvers diff --git a/debian/changelog b/debian/changelog index 3e2b5f6..1f7e663 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -dose3 (3.3~beta1-3) UNRELEASED; urgency=medium +dose3 (3.3~beta1-2) unstable; urgency=medium + + [ Stefano Zacchiroli ] + * demote trigger on /usr/share/cudf/solvers from interest to +interest-noawait: there is no real need to block, and doing so avoid +trigger cycles. Thanks Guillem Jover for the heads-up. +(Closes: #772875) [ Johannes Schauer ] * fix debian/watch (add uversionmangle) - -- + -- Stefano Zacchiroli z...@debian.org Fri, 12 Dec 2014 16:12:44 +0100 dose3 (3.3~beta1-1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git ___ 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] [dose3] branch master updated (eff58b6 - 1dc224c)
This is an automated email from the git hooks/post-receive script. zack pushed a change to branch master in repository dose3. from eff58b6 changelog entry for Josch's fix of debian/watch. new 1dc224c demote trigger on /usr/share/cudf/solvers to interest-noawait The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/apt-cudf.triggers | 2 +- debian/changelog | 10 -- 2 files changed, 9 insertions(+), 3 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git ___ 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] [dose3] annotated tag debian/3.3_beta1-2 updated (ca8d41f - ddd177d)
This is an automated email from the git hooks/post-receive script. zack pushed a change to annotated tag debian/3.3_beta1-2 in repository dose3. *** WARNING: tag debian/3.3_beta1-2 was modified! *** from ca8d41f (tag) to ddd177d (tag) tagging 1dc224c1a97c4dc86a912b2679013dbd23faa1e9 (commit) replaces debian/3.3_beta1-1 tagged by Stefano Zacchiroli on Fri Dec 12 16:31:33 2014 +0100 - Log - dose3 Debian release 3.3~beta1-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIVAwUAVIsKVZwxUDxthmOWAQhEShAAmTQj7vMXhIZoAhHZulGM/yk+Zd14rUwP 9Yx8dOtceLG3VmaYr85slyBN5NTpaOQFpuvqw2yf96vbbV/5aNzIWpVQ9+TU7PS/ rAIlzFsP0qujrsKSpu4salwdkIJFZwi2KDJr7np1taY8s3w7MEw/Iu8U3OMiYUVU IkBWpXkSAVC4GxpV+l9jveT89m5aQENn1Cjpbwno3cWm93JgQBvkDM2K5j0AQy2c vuEYWgXMN+jhS3QzzIWqqj2s/mIy5jJR4Rdm/KNNtxTOgvYI9rDBvyiCNT5MeJp7 IDF2J9Y+tNJA2qAJQzX2Awcg/BuL71SBBxNz7LlE6fkHFjrgXX9qsKMjD3RPV2Wn bYXcNlHs4NtzpXfHCq2GPlY0n9DBoyZ4exn/sSOw/J+/TsxEkiDeQlOStTHlZsc5 85drV+bWOan0Pl8InkjR9U09hdbH/ln1PBh6TZLaN0rbgUkOzb6YWyjA10xYMdnB esbYkUvA6YikBcQ63gp4R+E2doyzZvRBO/Vw/mdjsfK/qyeCC+3i7SsdMhEkkS38 0F3tPycJltCw+3YsZ78l21eP/DWe/ozPA4cefQycLqwxyv/KH8Syy1cXE/QnkxNa gas8hprXOPgzXojvF4ttMxLOpAwJqJhWmmUOxyh9bu0gkvpZq+Yp8DqMEoygdnze pKtDYVFaM20= =URCL -END PGP SIGNATURE- Ralf Treinen (1): changelog entry for Josch's fix of debian/watch. Stefano Zacchiroli (1): demote trigger on /usr/share/cudf/solvers to interest-noawait josch (1): add a uversionmangle s/-/~/ --- omits a8c2a34 upload to experimental omits 34e7ab1 add patches fixDebPrinter and fixMETA to fix botch FTBFS adds 1a200fa add a uversionmangle s/-/~/ adds eff58b6 changelog entry for Josch's fix of debian/watch. adds 1dc224c demote trigger on /usr/share/cudf/solvers to interest-noawait This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the annotated tag are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ca8d41f) \ N -- N -- N refs/tags/debian/3.3_beta1-2 (ddd177d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked omits are not gone; other references still refer to them. Any revisions marked discards are gone forever. No new revisions were added by this update. Summary of changes: debian/apt-cudf.triggers | 2 +- debian/changelog | 16 --- debian/patches/fixDebPrinter | 52 - debian/patches/fixMETA | 109 --- debian/patches/series| 2 - debian/watch | 3 +- 6 files changed, 13 insertions(+), 171 deletions(-) delete mode 100644 debian/patches/fixDebPrinter delete mode 100644 debian/patches/fixMETA -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git ___ 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] [dose3] annotated tag debian/3.3_beta1-2 deleted (was ddd177d)
This is an automated email from the git hooks/post-receive script. zack pushed a change to annotated tag debian/3.3_beta1-2 in repository dose3. *** WARNING: tag debian/3.3_beta1-2 was deleted! *** tag was ddd177d The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git ___ 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] [dose3] branch master updated (1dc224c - b469d8f)
This is an automated email from the git hooks/post-receive script. zack pushed a change to branch master in repository dose3. from 1dc224c demote trigger on /usr/share/cudf/solvers to interest-noawait new b469d8f bump release for unstable upload to -3 The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git ___ 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] [dose3] annotated tag debian/3.3_beta1-2 created (now ddd177d)
This is an automated email from the git hooks/post-receive script. zack pushed a change to annotated tag debian/3.3_beta1-2 in repository dose3. at ddd177d (tag) tagging 1dc224c1a97c4dc86a912b2679013dbd23faa1e9 (commit) replaces debian/3.3_beta1-1 tagged by Stefano Zacchiroli on Fri Dec 12 16:31:33 2014 +0100 - Log - dose3 Debian release 3.3~beta1-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIVAwUAVIsKVZwxUDxthmOWAQhEShAAmTQj7vMXhIZoAhHZulGM/yk+Zd14rUwP 9Yx8dOtceLG3VmaYr85slyBN5NTpaOQFpuvqw2yf96vbbV/5aNzIWpVQ9+TU7PS/ rAIlzFsP0qujrsKSpu4salwdkIJFZwi2KDJr7np1taY8s3w7MEw/Iu8U3OMiYUVU IkBWpXkSAVC4GxpV+l9jveT89m5aQENn1Cjpbwno3cWm93JgQBvkDM2K5j0AQy2c vuEYWgXMN+jhS3QzzIWqqj2s/mIy5jJR4Rdm/KNNtxTOgvYI9rDBvyiCNT5MeJp7 IDF2J9Y+tNJA2qAJQzX2Awcg/BuL71SBBxNz7LlE6fkHFjrgXX9qsKMjD3RPV2Wn bYXcNlHs4NtzpXfHCq2GPlY0n9DBoyZ4exn/sSOw/J+/TsxEkiDeQlOStTHlZsc5 85drV+bWOan0Pl8InkjR9U09hdbH/ln1PBh6TZLaN0rbgUkOzb6YWyjA10xYMdnB esbYkUvA6YikBcQ63gp4R+E2doyzZvRBO/Vw/mdjsfK/qyeCC+3i7SsdMhEkkS38 0F3tPycJltCw+3YsZ78l21eP/DWe/ozPA4cefQycLqwxyv/KH8Syy1cXE/QnkxNa gas8hprXOPgzXojvF4ttMxLOpAwJqJhWmmUOxyh9bu0gkvpZq+Yp8DqMEoygdnze pKtDYVFaM20= =URCL -END PGP SIGNATURE- Ralf Treinen (1): changelog entry for Josch's fix of debian/watch. Stefano Zacchiroli (1): demote trigger on /usr/share/cudf/solvers to interest-noawait josch (1): add a uversionmangle s/-/~/ --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git ___ 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] [dose3] 01/01: bump release for unstable upload to -3
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch master in repository dose3. commit b469d8f158aa0108e22a1654ec481a93f6f036d0 Author: Stefano Zacchiroli z...@upsilon.cc Date: Fri Dec 12 16:41:08 2014 +0100 bump release for unstable upload to -3 rationale: -2 has already been taken by a former, now superseded, experimental upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1f7e663..699d92b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dose3 (3.3~beta1-2) unstable; urgency=medium +dose3 (3.3~beta1-3) unstable; urgency=medium [ Stefano Zacchiroli ] * demote trigger on /usr/share/cudf/solvers from interest to @@ -9,7 +9,7 @@ dose3 (3.3~beta1-2) unstable; urgency=medium [ Johannes Schauer ] * fix debian/watch (add uversionmangle) - -- Stefano Zacchiroli z...@debian.org Fri, 12 Dec 2014 16:12:44 +0100 + -- Stefano Zacchiroli z...@debian.org Fri, 12 Dec 2014 16:39:24 +0100 dose3 (3.3~beta1-1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git ___ 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] [dose3] annotated tag debian/3.3_beta1-3 created (now afcadcb)
This is an automated email from the git hooks/post-receive script. zack pushed a change to annotated tag debian/3.3_beta1-3 in repository dose3. at afcadcb (tag) tagging b469d8f158aa0108e22a1654ec481a93f6f036d0 (commit) replaces debian/3.3_beta1-2 tagged by Stefano Zacchiroli on Fri Dec 12 16:45:49 2014 +0100 - Log - dose3 Debian release 3.3~beta1-3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIVAwUAVIsNrZwxUDxthmOWAQiG+A//Rq3GykNipmOhYGb/r0smBFmsU3EZizk6 bQ++P2UC9X1QcncT0tCs7r9IkYuf9mvfkCO1Rdfd+0TqPWflj+USxrPs+GPBfAIz kQWDar9fZZyKHnyoaUA3FfHf+eKfks4VazEZzwTpn2ep0iOXzfTAwIMhuhLyRC4g 2YVr6mqZC46GuZaiXdRtibds/ty5cr2zn3+/wWg2kXAQr9vhaOhsJxfUtujd1zBx AcJAe2vPcG2WHcR8w+UoaqtfmnxnBCoBrLb2j+oevmcDFPPXAUgkmdukoCYnsIcO XMeICqKwT7lnyrIoFV4iFJLla9dAxnzMokjSJcoVLts8zAEDadzmT7D0Wie3aEvV 9suHYKObEH/1qd2/WJKNCog80Ki5q+ZaG/a8alhLb/e5CGwX8BWuZV7IDqTld+ip j1vlTYELTKgzGKkk/8nv7BUltlHNuDYbZjQT7nMsPvp0EpD6fg0gTIjMYi55Z/H4 B+oDSzn4nHwU7ogFxCaCjGnaslmVg7aOg1cIxsM96jpniNKCtLZ92/IDa9aJ24Yp fSuRM8jedTXX8gOGraWbY/PoQ4x67aJ0BJkv1kNGG+r0hvrUw83KudOkOPBLTt7X 3frUaDopefIr4UM7VwvA0t8qhECZ8lfHxyb8AyMmJWAnHX/35ZK29NYk2N0a4SCV G/s3Gq4AacA= =zCCK -END PGP SIGNATURE- Stefano Zacchiroli (1): bump release for unstable upload to -3 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git ___ 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] [dose3] annotated tag debian/3.3_beta1-2 deleted (was ddd177d)
This is an automated email from the git hooks/post-receive script. zack pushed a change to annotated tag debian/3.3_beta1-2 in repository dose3. *** WARNING: tag debian/3.3_beta1-2 was deleted! *** tag was ddd177d The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git ___ 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] [cudf] 01/06: Imported Upstream version 0.7
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch master in repository cudf. commit fd8ffb0a30ec9cf963dca52cfa0e5f5eec7ae8e7 Author: Stefano Zacchiroli z...@upsilon.cc Date: Tue Apr 29 14:54:56 2014 -0400 Imported Upstream version 0.7 --- BUGS | 6 +-- ChangeLog | 13 +++ INSTALL| 1 + Makefile | 18 ++--- Makefile.config| 2 +- README | 32 +++- TODO | 6 +-- cudf.ml| 105 - cudf.mli | 20 ++ cudf.spec | 2 +- cudf_checker.ml| 2 +- doc/.gitignore | 1 + doc/Makefile | 18 + doc/cudf-check.pod | 99 ++ main_cudf_check.ml | 30 +-- tests.ml | 17 + 16 files changed, 311 insertions(+), 61 deletions(-) diff --git a/BUGS b/BUGS index 66e31ae..46c2578 100644 --- a/BUGS +++ b/BUGS @@ -1,3 +1,3 @@ -See issue tracker at -http://gforge.info.ucl.ac.be/tracker/index.php?group_id=35atid=283 for -component libcudf. +See issue tracker at: + + https://gforge.inria.fr/tracker/?atid=13811group_id=4385func=browse diff --git a/ChangeLog b/ChangeLog index c9de1f2..d01e8a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2014-04-29 Stefano Zacchiroli z...@upsilon.cc + * ALL release 0.7 + * Cudf_checker: do not report as multi-upgrade error a package + providing itself + * Cudf refactoring: change name2pkgs and univ.features internal + structures to list ref from multi-binding hash table. + * Cudf: add iterators on packages grouped by name + * Cudf: allow add/remove imperative changes to universes + (Thanks Pietro Abate for the above 3 patches) + * test runner: port make test to ocamlbuild = 4.x + * cudf-check: make exit code dependent on check result + * cudf-check: include a man page, available under doc/ + 2012-08-03 Stefano Zacchiroli z...@upsilon.cc * ALL release 0.6.3 * Cudf: bugfix: ensure that Cudf.status sizes are non-bogus diff --git a/INSTALL b/INSTALL index b45ac06..5acfd78 100644 --- a/INSTALL +++ b/INSTALL @@ -14,6 +14,7 @@ Build dependencies: - glib (only needed to build the C bindings Debian package: libglib2.0-dev, RPM: libglib2.0-devel) +- perl (for pod2man, to build cudf-check.1 man page) To build run: diff --git a/Makefile b/Makefile index 82d2ecf..b03c6c8 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,9 @@ LIBS_OPT = _build/cudf.cmxa PROGS = _build/main_cudf_check _build/main_cudf_parse_822 PROGS_BYTE = $(addsuffix .byte,$(PROGS)) PROGS_OPT = $(addsuffix .native,$(PROGS)) -RESULTS = $(LIBS) $(PROGS_BYTE) _build/cudf_c.cmo -RESULTS_OPT = $(LIBS_OPT) $(PROGS_OPT) _build/cudf_c.cmx +DOC = doc/cudf-check.1 +RESULTS = $(DOC) $(LIBS) $(PROGS_BYTE) _build/cudf_c.cmo +RESULTS_OPT = $(DOC) $(LIBS_OPT) $(PROGS_OPT) _build/cudf_c.cmx SOURCES = $(wildcard *.ml *.mli *.mll *.mly) C_LIB_DIR = c-lib C_LIB_SOURCES = $(wildcard $(C_LIB_DIR)/*.c $(C_LIB_DIR)/*.h) @@ -33,7 +34,10 @@ opt: $(RESULTS_OPT) $(RESULTS): $(SOURCES) $(RESULTS_OPT): $(SOURCES) -.PHONY: c-lib c-lib-opt +doc/cudf-check.1: doc/cudf-check.pod + $(MAKE) -C doc/ + +.PHONY: c-lib c-lib-opt doc c-lib: make -C $(C_LIB_DIR) all c-lib-opt: @@ -41,6 +45,7 @@ c-lib-opt: clean: make -C $(C_LIB_DIR) clean + make -C doc/ clean $(OCAMLBUILD) $(OBFLAGS) -clean rm -rf $(NAME)-*.gz $(NAME)_*.gz $(NAME)-*/ @@ -55,12 +60,13 @@ top-level: _build/cudf.cma headers: header.txt .headache.conf headache -h header.txt -c .headache.conf $(SOURCES) $(C_LIB_SOURCES) -test: _build/test.byte - $ -verbose +test: test.byte + ./$ -verbose @echo c-lib-test: make -C $(C_LIB_DIR) test -_build/test.byte: $(SOURCES) +test.byte: $(SOURCES) + ocamlbuild $@ tags: TAGS TAGS: $(SOURCES) diff --git a/Makefile.config b/Makefile.config index 2f29c80..7c4b9ed 100644 --- a/Makefile.config +++ b/Makefile.config @@ -1,4 +1,4 @@ -VERSION = 0.6.3 +VERSION = 0.7 export DESTDIR = diff --git a/README b/README index ca61082..ba811e5 100644 --- a/README +++ b/README @@ -27,25 +27,39 @@ as found by a package manager. libCUDF enables manipulation of CUDF and related documents. -Bugs - +Development +--- -Please report bugs to the gforge bug tracker available at: +Development happens on the INRIA Forge, in the [cudf project][1]. There you can +find: - http://gforge.info.ucl.ac.be/tracker/?group_id=35 +* [releases][4] +* [Git repository][5] +* [bug reports][6] -when reporting bug, please select the libcudf component. +[1]: https://gforge.inria.fr/projects/cudf/ +[4]: https://gforge.inria.fr/frs/?group_id=4385 +[5]: https
[Pkg-ocaml-maint-commits] [cudf] 03/06: Merge tag 'upstream/0.7'
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch master in repository cudf. commit c1f0e3bd54640cc66daefb68cd19e446a7b1fe92 Merge: 11df4b3 8f27b34 Author: Stefano Zacchiroli z...@upsilon.cc Date: Tue Apr 29 14:55:09 2014 -0400 Merge tag 'upstream/0.7' Upstream version 0.7 BUGS | 6 +-- ChangeLog | 13 +++ INSTALL| 1 + Makefile | 18 ++--- Makefile.config| 2 +- README | 32 +++- TODO | 6 +-- cudf.ml| 105 - cudf.mli | 20 ++ cudf.spec | 2 +- cudf_checker.ml| 2 +- doc/.gitignore | 1 + doc/Makefile | 18 + doc/cudf-check.pod | 99 ++ main_cudf_check.ml | 30 +-- tests.ml | 17 + 16 files changed, 311 insertions(+), 61 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] branch master updated (11df4b3 - 9383e70)
This is an automated email from the git hooks/post-receive script. zack pushed a change to branch master in repository cudf. from 11df4b3 bump standards-version new fd8ffb0 Imported Upstream version 0.7 new 8f27b34 Imported Upstream version 0.7 new c1f0e3b Merge tag 'upstream/0.7' new 678e47a new upstream release: 0.7 new 435ab94 bump Standards-Version to 3.9.5 (no change) new 9383e70 upload 0.7-1 to experimental The 6 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: BUGS | 6 +-- ChangeLog | 13 ++ INSTALL| 1 + Makefile | 18 +--- Makefile.config| 2 +- README | 32 ++ TODO | 6 +-- cudf.ml| 105 ++--- cudf.mli | 20 + cudf.spec | 2 +- cudf_checker.ml| 2 +- debian/changelog | 11 + debian/control | 5 ++- debian/cudf-check.1| 33 -- debian/cudf-tools.manpages | 2 +- doc/.gitignore | 1 + doc/Makefile | 18 doc/cudf-check.pod | 99 ++ main_cudf_check.ml | 30 +++-- tests.ml | 17 20 files changed, 326 insertions(+), 97 deletions(-) delete mode 100644 debian/cudf-check.1 create mode 100644 doc/.gitignore create mode 100644 doc/Makefile create mode 100644 doc/cudf-check.pod -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] 02/06: Imported Upstream version 0.7
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch master in repository cudf. commit 8f27b3496f7a956cd778d789d6f3b295edff3b7c Author: Stefano Zacchiroli z...@upsilon.cc Date: Tue Apr 29 14:55:09 2014 -0400 Imported Upstream version 0.7 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] 04/06: new upstream release: 0.7
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch master in repository cudf. commit 678e47aa1d7c2f5e1948fb6247c17331166c2a38 Author: Stefano Zacchiroli z...@upsilon.cc Date: Tue Apr 29 15:02:27 2014 -0400 new upstream release: 0.7 * new upstream release - include new upstream cudf-check manpage with exit code information (Closes: #730529) * drop no longer needed Debian manpage from the package * add Build-Depends on perl (just in case), it is needed for pod2man --- debian/changelog | 10 ++ debian/control | 3 ++- debian/cudf-check.1| 33 - debian/cudf-tools.manpages | 2 +- 4 files changed, 13 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8a280ec..8048ffc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +cudf (0.7-1) unstable; urgency=medium + + * new upstream release +- include new upstream cudf-check manpage with exit code information + (Closes: #730529) + * drop no longer needed Debian manpage from the package + * add Build-Depends on perl (just in case), it is needed for pod2man + + -- Stefano Zacchiroli z...@debian.org Tue, 29 Apr 2014 14:55:42 -0400 + cudf (0.6.3-2) unstable; urgency=low * update debian/watch (on INRIA forge now) diff --git a/debian/control b/debian/control index 8ac4a0a..b7d4c30 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,8 @@ Build-Depends: ocaml-findlib, libextlib-ocaml-dev, libounit-ocaml-dev, - libglib2.0-dev + libglib2.0-dev, + perl Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cudf.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cudf.git diff --git a/debian/cudf-check.1 b/debian/cudf-check.1 deleted file mode 100644 index f8810c4..000 --- a/debian/cudf-check.1 +++ /dev/null @@ -1,33 +0,0 @@ -.\ DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. -.TH CUDF-CHECK 1 June 2010 cudf-check 0.5 User Commands -.SH NAME -cudf-check \- manipulate CUDF documents -.SH SYNOPSIS -.B cudf-check -[\fIOPTION\fR...] -.SH DESCRIPTION -.SS In particular: -.TP -cudf\-check \fB\-cudf\fR FILE -validate CUDF -.TP -cudf\-check \fB\-cudf\fR FILE \fB\-sol\fR FILE -validate CUDF and its solution -.TP -cudf\-check \fB\-univ\fR FILE -validate package universe (no request) -.SH OPTIONS -.HP -\fB\-cudf\fR parse the given CUDF (universe + request) -.HP -\fB\-univ\fR parse the given package universe -.HP -\fB\-sol\fR parse the given problem solution -.HP -\fB\-dump\fR dump parse results to standard output -.TP -\fB\-help\fR -Display this list of options -.TP -\fB\-\-help\fR -Display this list of options diff --git a/debian/cudf-tools.manpages b/debian/cudf-tools.manpages index 40ca774..98740f6 100644 --- a/debian/cudf-tools.manpages +++ b/debian/cudf-tools.manpages @@ -1 +1 @@ -debian/cudf-check.1 +doc/cudf-check.1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] branch pristine-tar updated (23086c4 - 3e1e306)
This is an automated email from the git hooks/post-receive script. zack pushed a change to branch pristine-tar in repository cudf. from 23086c4 pristine-tar data for cudf_0.6.3.orig.tar.gz new 612e579 pristine-tar data for cudf_0.7.orig.tar.gz new 3e1e306 pristine-tar data for cudf_0.7.orig.tar.gz The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: cudf_0.7.orig.tar.gz.delta | Bin 0 - 4092 bytes cudf_0.7.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 cudf_0.7.orig.tar.gz.delta create mode 100644 cudf_0.7.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] 01/02: pristine-tar data for cudf_0.7.orig.tar.gz
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch pristine-tar in repository cudf. commit 612e57941b64fc797fb9c183eccc55a4decc94b4 Author: Stefano Zacchiroli z...@upsilon.cc Date: Tue Apr 29 14:54:56 2014 -0400 pristine-tar data for cudf_0.7.orig.tar.gz --- cudf_0.7.orig.tar.gz.delta | Bin 0 - 4064 bytes cudf_0.7.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/cudf_0.7.orig.tar.gz.delta b/cudf_0.7.orig.tar.gz.delta new file mode 100644 index 000..f6709d3 Binary files /dev/null and b/cudf_0.7.orig.tar.gz.delta differ diff --git a/cudf_0.7.orig.tar.gz.id b/cudf_0.7.orig.tar.gz.id new file mode 100644 index 000..17790b5 --- /dev/null +++ b/cudf_0.7.orig.tar.gz.id @@ -0,0 +1 @@ +68da124317f9fa408c954033b4d26dda1c3d4518 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] 06/06: upload 0.7-1 to experimental
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch master in repository cudf. commit 9383e7072b15291a89d2bfe031f6e470befc85a2 Author: Stefano Zacchiroli z...@upsilon.cc Date: Tue Apr 29 23:09:17 2014 -0400 upload 0.7-1 to experimental --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 240c929..4d6f29e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -cudf (0.7-1) unstable; urgency=medium +cudf (0.7-1) experimental; urgency=medium * new upstream release - include new upstream cudf-check manpage with exit code information -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] 05/06: bump Standards-Version to 3.9.5 (no change)
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch master in repository cudf. commit 435ab9446c90b6c52876fb92c2a8d7ae855ca375 Author: Stefano Zacchiroli z...@upsilon.cc Date: Tue Apr 29 15:11:48 2014 -0400 bump Standards-Version to 3.9.5 (no change) --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8048ffc..240c929 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ cudf (0.7-1) unstable; urgency=medium (Closes: #730529) * drop no longer needed Debian manpage from the package * add Build-Depends on perl (just in case), it is needed for pod2man + * bump Standards-Version to 3.9.5 (no change) -- Stefano Zacchiroli z...@debian.org Tue, 29 Apr 2014 14:55:42 -0400 diff --git a/debian/control b/debian/control index b7d4c30..5a80fa3 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: libounit-ocaml-dev, libglib2.0-dev, perl -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cudf.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cudf.git Homepage: http://www.mancoosi.org/cudf/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] annotated tag debian/0.7-1 created (now 6840fd5)
This is an automated email from the git hooks/post-receive script. zack pushed a change to annotated tag debian/0.7-1 in repository cudf. at 6840fd5 (tag) tagging 9383e7072b15291a89d2bfe031f6e470befc85a2 (commit) replaces debian/0.6.3-2 tagged by Stefano Zacchiroli on Tue Apr 29 23:14:00 2014 -0400 - Log - cudf Debian release 0.7-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIVAwUAU2BqeJwxUDxthmOWAQj1ew//RiW7ZCxs53wRSvIVT6LExvUfNF6CcePJ Lf0wFcmOdwSfUNq2upj7DEalCASZC4N4g2kyT1gqe/Wid6zdty8ohdn11YF3ch9z kpkPqWz2BzyyLdEBHe8OZ0tXWGoSstw5NvSbI4j/RIBsSf44O4g09khy++5TaB47 JStlr0DvYqW3csvClp1/NE0+v1ZKhD9uWW4hak2ZPc9Y47YrFdi8EcE0gIc+hlxv 3ab3F6UvT72BYUHTAlpxRrjFhEtEYiuiYAe2wsmBxAk071yB+ww3uqFG/oARzqP5 zalDkZLsDu6mi4qn7S6z5opC/J0zLmNGM/okHGuAHsaJDM6GOpQsWc5q2ADsP1SW jT4koz70FE7Qh5x/nMdpaL7vVNRZjXBnbLxZbmuZBGUe3WJQbkjEq0vDkjP5w3Yf R0bxLIW4btDu2Htq5KvwlgqD3aKH3jQYgPQg3zFyy0T+Q9dzP42gyu95wRchtjeK 3hzVUnwkajcaOI6gfKG4pVbYI3CbCVJbrTGkO7ZjGLXxyx+zdKeZZivx+eWc3itN PoGX5SdmaIznnKIpAWzs90yWfo6bneOFrqQFqQtIJ/yIBXJIsMjar+/5bJ23vjLU CPQUUuMvdfyOeJHbiOJozQYsaaLx7Alpl1/Ldj4sZkuL3AyVRSMGFFjVhmD0CEnl 9ry9e17Rf/s= =4P7Q -END PGP SIGNATURE- Stefano Zacchiroli (6): Imported Upstream version 0.7 Imported Upstream version 0.7 Merge tag 'upstream/0.7' new upstream release: 0.7 bump Standards-Version to 3.9.5 (no change) upload 0.7-1 to experimental --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] 02/02: pristine-tar data for cudf_0.7.orig.tar.gz
This is an automated email from the git hooks/post-receive script. zack pushed a commit to branch pristine-tar in repository cudf. commit 3e1e306e106e3b69fd2a438f0883dcb85c5a21ec Author: Stefano Zacchiroli z...@upsilon.cc Date: Tue Apr 29 14:55:09 2014 -0400 pristine-tar data for cudf_0.7.orig.tar.gz --- cudf_0.7.orig.tar.gz.delta | Bin 4064 - 4092 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/cudf_0.7.orig.tar.gz.delta b/cudf_0.7.orig.tar.gz.delta index f6709d3..6122995 100644 Binary files a/cudf_0.7.orig.tar.gz.delta and b/cudf_0.7.orig.tar.gz.delta differ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] [cudf] annotated tag upstream/0.7 created (now 82eacde)
This is an automated email from the git hooks/post-receive script. zack pushed a change to annotated tag upstream/0.7 in repository cudf. at 82eacde (tag) tagging 8f27b3496f7a956cd778d789d6f3b295edff3b7c (commit) replaces upstream/0.6.3 tagged by Stefano Zacchiroli on Tue Apr 29 14:55:09 2014 -0400 - Log - Upstream version 0.7 Stefano Zacchiroli (2): Imported Upstream version 0.7 Imported Upstream version 0.7 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cudf.git ___ 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] pkglab packaging branch, master, updated. debian/1.4.2-13-1-g4f4bc7e
The following commit has been merged in the master branch:
commit 4f4bc7edebe76d8a1268ea1d6c8aadf7dd77ad45
Author: Stefano Zacchiroli z...@debian.org
Date: Wed Sep 5 13:27:37 2012 +0200
add-sources.py: use in syntax instead of has_key
for forward compatibility with Python 3
see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686731 for reference
diff --git a/debian/changelog b/debian/changelog
index 0d3d4dc..d15e3af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pkglab (1.4.2-14) UNRELEASED; urgency=low
+
+ [ Stefano Zacchiroli ]
+ * add-sources.py: use in syntax instead of has_key, for forward
+compatibilty with Python 3 (See: #686731 for details)
+
+ -- Stefano Zacchiroli z...@debian.org Wed, 05 Sep 2012 13:31:27 +0200
+
pkglab (1.4.2-13) unstable; urgency=low
[ Stéphane Glondu ]
diff --git a/debian/contrib/add-sources.py b/debian/contrib/add-sources.py
index 8bc5372..07a236a 100755
--- a/debian/contrib/add-sources.py
+++ b/debian/contrib/add-sources.py
@@ -76,7 +76,7 @@ def pkg_of_src(src):
def get_rels(fields, relations):
rels = []
for name in fields:
-if relations.has_key(name):
+if name in relations:
rels.extend(relations[name])
return rels
@@ -86,7 +86,7 @@ def pkg_of_src(src):
for dep in or_deps:
if dep['name'] in buildessentials \
-and not (dep.has_key('version') and dep['version']):
+and not ('version' in dep and dep['version']):
return True# unversioned build-dep on a
build-essential
return False
@@ -112,16 +112,16 @@ def pkg_of_src(src):
return '!' + arch
def pp_atomic_dep(dep):
s = dep['name']
-if dep.has_key('version') and dep['version'] is not None:
+if 'version' in dep and dep['version'] is not None:
s += ' (%s %s)' % dep['version']
-if dep.has_key('arch') and dep['arch'] is not None:
+if 'arch' in dep and dep['arch'] is not None:
s += ' [%s]' % string.join(map(pp_arch, dep['arch']))
return s
pp_or_dep = lambda deps: string.join(map(pp_atomic_dep, deps), ' | ')
return string.join(map(pp_or_dep, rels), ', ')
for field in ['Version', 'Priority', 'Section', 'Maintainer',
'Architecture']:
-if src.has_key(field):
+if field in src:
pkg[field] = src[field]
bin_depends = mk_bin_rels(['build-depends', 'build-depends-indep'],
src.relations)
--
pkglab 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] pkglab packaging branch, master, updated. debian/1.4.2-13-2-g801bac7
The following commit has been merged in the master branch: commit 801bac7eea2ec4752051b08ae82d5d8fbe0f0296 Author: Stefano Zacchiroli z...@debian.org Date: Wed Sep 5 13:41:52 2012 +0200 changelog: add missing Closes entry for Python 3 syntax fix diff --git a/debian/changelog b/debian/changelog index d15e3af..dcca845 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ pkglab (1.4.2-14) UNRELEASED; urgency=low [ Stefano Zacchiroli ] * add-sources.py: use in syntax instead of has_key, for forward compatibilty with Python 3 (See: #686731 for details) +(Closes: #686759) -- Stefano Zacchiroli z...@debian.org Wed, 05 Sep 2012 13:31:27 +0200 -- pkglab 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] cudf packaging branch, master, updated. debian/0.6.1-1-8-gd4a76c8
The following commit has been merged in the master branch: commit 92a2f4bd2de10168638d34aa27976a5f788e Merge: bb0f428342fc9af78218c6812d73e66399b83403 c2f430c9db99724ac293720a9214a48785bae822 Author: Stefano Zacchiroli z...@upsilon.cc Date: Fri Aug 3 12:53:10 2012 +0200 Merge tag 'upstream/0.6.3' Upstream version 0.6.3 -- cudf 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] cudf packaging branch, master, updated. debian/0.6.1-1-8-gd4a76c8
The following commit has been merged in the master branch: commit 34d5dd8b27a1c27aef7dde286e766ead9ce68c88 Author: Stefano Zacchiroli z...@upsilon.cc Date: Fri Aug 3 13:00:13 2012 +0200 new upstream release: 0.6.3 mark for upload to experimental diff --git a/debian/changelog b/debian/changelog index a5896be..46b4067 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cudf (0.6.3-1) experimental; urgency=low + + * New upstream release + + -- Stefano Zacchiroli z...@debian.org Fri, 03 Aug 2012 12:54:43 +0200 + cudf (0.6.2-1) unstable; urgency=low * New upstream release -- cudf 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] cudf packaging branch, master, updated. debian/0.6.1-1-8-gd4a76c8
The following commit has been merged in the master branch: commit c4075d68044a565724b3f1dcc8040274e41f4744 Author: Stefano Zacchiroli z...@upsilon.cc Date: Fri Aug 3 13:09:50 2012 +0200 debian/control: bump Standards-Version to 3.9.1 (no changes needed) diff --git a/debian/changelog b/debian/changelog index 46b4067..351c41c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ cudf (0.6.3-1) experimental; urgency=low * New upstream release + * debian/control: bump Standards-Version to 3.9.1 (no changes needed) -- Stefano Zacchiroli z...@debian.org Fri, 03 Aug 2012 12:54:43 +0200 diff --git a/debian/control b/debian/control index 9b96462..193bd5d 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: libextlib-ocaml-dev, libounit-ocaml-dev, libglib2.0-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cudf.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cudf.git Homepage: http://www.mancoosi.org/cudf/ -- cudf 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] cudf packaging branch, master, updated. debian/0.6.1-1-8-gd4a76c8
The following commit has been merged in the master branch: commit d4a76c86504c7bd1d21f099f04f5862e5b149bfe Author: Stefano Zacchiroli z...@upsilon.cc Date: Fri Aug 3 13:17:15 2012 +0200 debian/copyright: port the machine parseable copyright spec 1.0 diff --git a/debian/changelog b/debian/changelog index 351c41c..95025c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ cudf (0.6.3-1) experimental; urgency=low * New upstream release * debian/control: bump Standards-Version to 3.9.1 (no changes needed) + * debian/copyright: port syntax to machine-readable debian/copyright +specification, version 1.0 -- Stefano Zacchiroli z...@debian.org Fri, 03 Aug 2012 12:54:43 +0200 diff --git a/debian/copyright b/debian/copyright index 70497f2..204efdc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,19 @@ -This package was debianized by Stefano Zacchiroli z...@debian.org on -Thu, 08 Jan 2009 16:08:00 +0100. - -It was downloaded from http://gforge.info.ucl.ac.be/projects/mancoosi/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: cudf +Upstream-Contact: Stefano Zacchiroli z...@upsilon.cc +Source: http://www.mancoosi.org/cudf/ Files: * -Copyright: © 2009-2010 Stefano Zacchiroli z...@pps.jussieu.fr +Copyright: 2009-2012 Stefano Zacchiroli z...@upsilon.cc License: LGPL-3+ | other + This library is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + . + On Debian systems, the full text of the license can be found in + `/usr/share/common-licenses/LGPL-3'. + . As a special exception to the GNU Lesser 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 @@ -19,11 +27,3 @@ License: LGPL-3+ | other exception does not however invalidate any other reasons why the executable file might be covered by the GNU Lesser General Public License. - -This library is free software: you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. - -The full text of the license can be found in -`/usr/share/common-licenses/LGPL-3'. -- cudf 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] cudf packaging branch, pristine-tar, updated. 23086c42236e2b2b96f8a6968fbcfd9bd05aaace
The following commit has been merged in the pristine-tar branch: commit 23086c42236e2b2b96f8a6968fbcfd9bd05aaace Author: Stefano Zacchiroli z...@upsilon.cc Date: Fri Aug 3 12:53:10 2012 +0200 pristine-tar data for cudf_0.6.3.orig.tar.gz diff --git a/cudf_0.6.3.orig.tar.gz.delta b/cudf_0.6.3.orig.tar.gz.delta new file mode 100644 index 000..dabe794 Binary files /dev/null and b/cudf_0.6.3.orig.tar.gz.delta differ diff --git a/cudf_0.6.3.orig.tar.gz.id b/cudf_0.6.3.orig.tar.gz.id new file mode 100644 index 000..b459ad0 --- /dev/null +++ b/cudf_0.6.3.orig.tar.gz.id @@ -0,0 +1 @@ +7a4504df0d32099a7aa172bc3623008075ff6140 -- cudf 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] cudf packaging annotated tag, upstream/0.6.2, created. upstream/0.6.2
The annotated tag, upstream/0.6.2 has been created at 3046205b8c6e8e9d8bd5c443f62f31ec00c17280 (tag) tagging c6f17db44f893173932b643731b8e18a75ed15fc (commit) replaces upstream/0.6.1 tagged by Stefano Zacchiroli on Mon Feb 6 10:34:54 2012 +0100 - Shortlog Upstream version 0.6.2 Stefano Zacchiroli (1): Imported Upstream version 0.6.2 --- -- cudf 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] cudf packaging annotated tag, debian/0.6.3-1, created. debian/0.6.3-1
The annotated tag, debian/0.6.3-1 has been created at 173df9c932cc7f33d0e19b24691229cf912e375c (tag) tagging d4a76c86504c7bd1d21f099f04f5862e5b149bfe (commit) replaces debian/0.6.1-1 tagged by Stefano Zacchiroli on Fri Aug 3 13:18:22 2012 +0200 - Shortlog Debian release 0.6.3-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iD8DBQBQG7N+1cqbBPLEI7wRAqXlAJ9DBW03eZ+FWFs6C0Eq6e0bYvzOMwCgy4S2 aPz5Wj0ssBw7toyWmZW35c4= =aQQQ -END PGP SIGNATURE- Stefano Zacchiroli (7): Imported Upstream version 0.6.2 Merge tag 'upstream/0.6.2' Imported Upstream version 0.6.3 Merge tag 'upstream/0.6.3' new upstream release: 0.6.3 debian/control: bump Standards-Version to 3.9.1 (no changes needed) debian/copyright: port the machine parseable copyright spec 1.0 --- -- cudf 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] cudf packaging annotated tag, upstream/0.6.3, created. upstream/0.6.3
The annotated tag, upstream/0.6.3 has been created at 7e8c5904cbf605dd78d741f66a4137b9809352f0 (tag) tagging c2f430c9db99724ac293720a9214a48785bae822 (commit) replaces upstream/0.6.2 tagged by Stefano Zacchiroli on Fri Aug 3 12:53:10 2012 +0200 - Shortlog Upstream version 0.6.3 Stefano Zacchiroli (1): Imported Upstream version 0.6.3 --- -- cudf 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] cudf packaging branch, master, updated. debian/0.6.1-1-3-gbb0f428
The following commit has been merged in the master branch:
commit bb0f428342fc9af78218c6812d73e66399b83403
Merge: f11ad4a93851c06b9a65917a955ec470ccd9d5cb
c6f17db44f893173932b643731b8e18a75ed15fc
Author: Stefano Zacchiroli z...@upsilon.cc
Date: Mon Feb 6 10:34:54 2012 +0100
Merge tag 'upstream/0.6.2'
Upstream version 0.6.2
diff --combined debian/changelog
index 13a51ee,000..a5896be
mode 100644,00..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,97 -1,0 +1,97 @@@
- cudf (0.6.1-1) unstable; urgency=low
++cudf (0.6.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Stefano Zacchiroli z...@debian.org Thu, 15 Sep 2011 14:35:57 +0200
+
+cudf (0.6-1) unstable; urgency=low
+
+ * New upstream release; highlights:
+- speed improvements in the pretty printing engine and in cudf-check
+- fixes in the pretty printing engine
+ * debian/patches/
+- drop link-caml_hash_variant-with-ldl.patch (integrated upstream)
+
+ -- Stefano Zacchiroli z...@debian.org Wed, 01 Jun 2011 09:55:06 +0200
+
+cudf (0.5.99-2) unstable; urgency=low
+
+ [ Ralf Treinen ]
+ * Add debian/watch.
+ * Switched to debian source version 3.0 (quilt) (no change apart from
+adding debian/source)
+ * Put maintainer=debian-ocaml-maintainers, Zack and me as uploaders,
+with the previous maintainer's blessing.
+
+ [ Stefano Zacchiroli ]
+ * uploading to unstable
+ * debian/control: bump Standards-Version to 3.9.2 (no changes needed)
+ * debian/patches/
+- add patch link-caml_hash_variant-with-ldl.patch to avoid link
+ failure with recent binutils (and on non-Linux systems). Thanks
+ Cyril Brulebois for the patch! (Closes: #602489)
+
+ -- Stefano Zacchiroli z...@debian.org Fri, 06 May 2011 21:21:03 +0200
+
+cudf (0.5.99-1) experimental; urgency=low
+
+ * New upstream release
+ * debian/*.ocamldoc: pass -package extlib, as extlib types are now used
+in libcudf interface
+ * move packaging (i.e. debian/ dir) to git.d.o
+ * debian/control
+- update Vcs-* fields to reflect new packaging location
+- bump Standards-Version to 3.9.1 (no changes needed)
+ * debian/gbp.conf: add configuration file for git-buildpackage
+
+ -- Stefano Zacchiroli z...@debian.org Thu, 04 Nov 2010 16:59:35 +0100
+
+cudf (0.5.98-1) experimental; urgency=low
+
+ * New upstream release
+ * First upload to the Debian archive
+ * debian/control
+- add missing build-dep on camlp4
+- bump Standards-Version (no changes needed)
+ * debian/cudf-check.1: provide sensible whatis information
+ * debian/copyright: bump copyright year to include 2010
+
+ -- Stefano Zacchiroli z...@debian.org Fri, 25 Jun 2010 16:51:27 +0200
+
+cudf (0.5.97-1) mancoosi; urgency=low
+
+ * New upstream release
+
+ -- Stefano Zacchiroli z...@debian.org Thu, 03 Jun 2010 16:42:23 +0200
+
+cudf (0.5.96-1) mancoosi; urgency=low
+
+ * New upstream release
+ * debian/control: update Vcs-* fields to reflect upstream SVN change
+
+ -- Stefano Zacchiroli z...@debian.org Tue, 01 Jun 2010 15:56:54 +0200
+
+cudf (0.5.94-1) mancoosi; urgency=low
+
+ * New upstream release
+ * Use upstream make to install C bindings
+ * debian/control: point Homepage to CUDF homepage
+
+ -- Stefano Zacchiroli z...@debian.org Fri, 18 Dec 2009 11:37:40 +0100
+
+cudf (0.5.92-1) mancoosi; urgency=low
+
+ * New upstream release
+ * Port packaging to recent dh-ocaml (w/ ABI-based dependencies)
+ * debian/control:
+- bump Standards-Version to 3.8.3 (no changes needed)
+- drop deps on libpcre-ocaml{,-dev} (no longer needed)
+ * Enable generation of ocamldoc HTML API reference
+
+ -- Stefano Zacchiroli z...@debian.org Sat, 21 Nov 2009 19:38:54 +0100
+
+cudf (0.4-1) mancoosi; urgency=low
+
+ * First public release.
+
+ -- Stefano Zacchiroli z...@debian.org Fri, 17 Apr 2009 12:00:51 +0200
--
cudf 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] cudf packaging branch, pristine-tar, updated. 5da00e8fefa846c0975a66a89ff37f4be1c8d9d8
The following commit has been merged in the pristine-tar branch: commit 5da00e8fefa846c0975a66a89ff37f4be1c8d9d8 Author: Stefano Zacchiroli z...@upsilon.cc Date: Mon Feb 6 10:34:54 2012 +0100 pristine-tar data for cudf_0.6.2.orig.tar.gz diff --git a/cudf_0.6.2.orig.tar.gz.delta b/cudf_0.6.2.orig.tar.gz.delta new file mode 100644 index 000..3deb618 Binary files /dev/null and b/cudf_0.6.2.orig.tar.gz.delta differ diff --git a/cudf_0.6.2.orig.tar.gz.id b/cudf_0.6.2.orig.tar.gz.id new file mode 100644 index 000..c02b203 --- /dev/null +++ b/cudf_0.6.2.orig.tar.gz.id @@ -0,0 +1 @@ +c6f17db44f893173932b643731b8e18a75ed15fc -- cudf 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] bibtex2html packaging branch, master, updated. debian/1.96-3-1-ge342a3b
The following commit has been merged in the master branch: commit e342a3b23449960990baf0d8c275e77cf856dd24 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 17:10:10 2011 +0200 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index b412a7c..ec6b908 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +bibtex2html (1.96-4) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * Remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 17:09:39 +0200 + bibtex2html (1.96-3) unstable; urgency=low * Standards-version 3.9.2 (no change) diff --git a/debian/control b/debian/control index 1e6cb9e..772bd81 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Ralf Treinen trei...@debian.org, Remi Vanicat vani...@debian.org, - Stefano Zacchiroli z...@debian.org, Samuel Mimram smim...@debian.org, Sylvain Le Gall gil...@debian.org Standards-Version: 3.9.2 -- bibtex2html 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] camlzip packaging branch, master, updated. debian/1.04-6-2-g3eb662a
The following commit has been merged in the master branch: commit 3eb662a2453618b3073938116c0c78095100e672 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 17:11:57 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 6513585..aff18da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ camlzip (1.04-7) UNRELEASED; urgency=low + [ Stefano Zacchiroli ] + * remove myself from Uploaders + + [ Stéphane Glondu ] * Fix generation of documentation by dh_ocamldoc -- Stéphane Glondu glo...@debian.org Tue, 06 Oct 2009 01:16:25 +0200 diff --git a/debian/control b/debian/control index 83ba1bf..44651a5 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Sven Luther lut...@debian.org, - Stefano Zacchiroli z...@debian.org, Samuel Mimram smim...@debian.org, Sylvain Le Gall gil...@debian.org, Ralf Treinen trei...@debian.org, -- camlzip 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] cmigrep packaging branch, master, updated. debian/1.5-8-1-g392f48a
The following commit has been merged in the master branch: commit 392f48afbf0164ae21041fb585643758d037a85c Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 17:14:07 2011 +0200 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 2bb70d0..e24f3f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cmigrep (1.5-9) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * Remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 17:13:45 +0200 + cmigrep (1.5-8) unstable; urgency=low [ Stéphane Glondu ] diff --git a/debian/control b/debian/control index 5a7272d..5afac93 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,7 @@ Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Ralf Treinen trei...@debian.org, Remi Vanicat vani...@debian.org, Samuel Mimram smim...@debian.org, - Mehdi Dogguy me...@debian.org, - Stefano Zacchiroli z...@debian.org + Mehdi Dogguy me...@debian.org Build-Depends: debhelper (= 7.0.50~) Build-Depends-Indep: ocaml-nox (= 3.11.1-3~), libpcre-ocaml-dev (= 6.0.1), -- cmigrep 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] confluence packaging branch, master, updated. debian/0.10.6-6-3-g4fcb0a1
The following commit has been merged in the master branch: commit 4fcb0a1e9ea80ada59d38622138fce492d481773 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 17:17:54 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index d132012..2cf989a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ confluence (0.10.6-7) UNRELEASED; urgency=low + [ Stephane Glondu ] * Switch packaging to git + [ Stefano Zacchiroli ] + * remove myself from Uploaders + -- Stephane Glondu st...@glondu.net Mon, 15 Jun 2009 20:46:13 +0200 confluence (0.10.6-6) unstable; urgency=low diff --git a/debian/control b/debian/control index 6116343..15e34cc 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Ralf Treinen trei...@debian.org, Remi Vanicat vani...@debian.org, - Stefano Zacchiroli z...@debian.org, Samuel Mimram smim...@debian.org, Sylvain Le Gall gil...@debian.org, Mike Furr mf...@debian.org -- confluence 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] cryptgps packaging branch, master, updated. debian/0.2.1-7-1-g66623ad
The following commit has been merged in the master branch: commit 66623ade2c669018a650d5f3bb21db2ee191d229 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 17:19:52 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 7ab9315..7c5d20d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cryptgps (0.2.1-8) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 17:19:32 +0200 + cryptgps (0.2.1-7) unstable; urgency=low * debian/control: diff --git a/debian/control b/debian/control index f57a379..4b5b1b6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: ocaml Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: - Stefano Zacchiroli z...@debian.org, Stéphane Glondu glo...@debian.org Build-Depends: debhelper (= 7), -- cryptgps 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] cryptokit packaging branch, master, updated. debian/1.3-13-7-gb13286a
The following commit has been merged in the master branch: commit b13286a348ae5f51171e0eb7937435b601785fe1 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 17:20:34 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 6ac6399..189fcaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cryptokit (1.3-15) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 17:20:18 +0200 + cryptokit (1.3-14) unstable; urgency=low [ Stéphane Glondu ] diff --git a/debian/control b/debian/control index 762c4f5..842e745 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Ralf Treinen trei...@debian.org, Samuel Mimram smim...@debian.org, - Stefano Zacchiroli z...@debian.org, Sylvain Le Gall gil...@debian.org, Stéphane Glondu glo...@debian.org, Mehdi Dogguy me...@debian.org -- cryptokit 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] headache packaging branch, master, updated. debian/1.03-19-1-g5a2832a
The following commit has been merged in the master branch: commit 5a2832a3516245ee2899be15fbb1a0fcdcfc2e3f Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 17:25:22 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 3398e3e..faa6e66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +headache (1.03-20) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 17:25:06 +0200 + headache (1.03-19) unstable; urgency=low * Standards-version 3.9.2 (no change) diff --git a/debian/control b/debian/control index 06b1f30..d5bf3dd 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,7 @@ Source: headache Section: devel Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org -Uploaders: Stefano Zacchiroli z...@debian.org, - Ralf Treinen trei...@debian.org, +Uploaders: Ralf Treinen trei...@debian.org, Sylvain Le Gall gil...@debian.org Build-Depends-Indep: po-debconf, xsltproc, libxml2-utils, docbook-xsl, docbook-xml Build-Depends: cdbs (= 0.4.23-1.1), debhelper (= 5), ocaml-nox (= 3.10.0-8), dh-ocaml (= 0.9) -- headache 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] hlins packaging branch, master, updated. debian/0.39-17-1-g8c05668
The following commit has been merged in the master branch: commit 8c0566883c314b62445f4d6d348b0b46b01ad59c Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 17:26:08 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index da50912..bc657b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +hlins (0.39-18) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 17:25:53 +0200 + hlins (0.39-17) unstable; urgency=low * Standards-Version 3.9.2 (no change) diff --git a/debian/control b/debian/control index e577592..df0b7e7 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,7 @@ Source: hlins Section: text Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org -Uploaders: - Ralf Treinen trei...@debian.org, - Stefano Zacchiroli z...@debian.org +Uploaders: Ralf Treinen trei...@debian.org Standards-Version: 3.9.2 Build-Depends-Indep: ocaml-nox (= 3.11.1-3~) Build-Depends: debhelper (= 7.0.50~), dh-ocaml (= 0.9) -- hlins 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] janest-core packaging branch, master, updated. debian/0.6.0-3-1-gfb1911b
The following commit has been merged in the master branch: commit fb1911b0fcd27d142536ca6a128e4db7d9b62b62 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 17:28:06 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 130dd78..6496520 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +janest-core (0.6.0-4) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 17:27:50 +0200 + janest-core (0.6.0-3) unstable; urgency=low * Fix FTBFS with OCaml 3.12 (Closes: #585460) diff --git a/debian/control b/debian/control index e89d638..745a834 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: ocaml Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: - Stefano Zacchiroli z...@debian.org, Mehdi Dogguy me...@debian.org, Stéphane Glondu glo...@debian.org Build-Depends: -- janest-core 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] ledit packaging branch, master, updated. debian/2.02.1-2-1-gd882073
The following commit has been merged in the master branch: commit d88207351f883de08e556d1aeedfda532333ee51 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 17:28:47 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 9334157..dbc8eac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ledit (2.02.1-3) UNRELASED; urgency=low + + [ Stefano Zacchiroli ] + * remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 17:28:29 +0200 + ledit (2.02.1-2) unstable; urgency=low * Rebuild with OCaml 3.12.0 (no changes) diff --git a/debian/control b/debian/control index 6c6b2e6..b9809e4 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Samuel Mimram smim...@debian.org, - Stefano Zacchiroli z...@debian.org, Stéphane Glondu glo...@debian.org, Mehdi Dogguy me...@debian.org, Sylvain Le Gall gil...@debian.org -- ledit 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 packaging branch, master, updated. debian/3.12.0-7-16-g3ccb1fa
The following commit has been merged in the master branch:
commit 3ccb1fa116be012b1f17839ae0bbd80706eaa2c5
Author: Stefano Zacchiroli z...@debian.org
Date: Sat Oct 8 19:23:11 2011 +0200
remove myself from Uploaders
diff --git a/debian/changelog b/debian/changelog
index 821eef3..2d125c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ ocaml (3.12.1-1) UNRELEASED; urgency=low
[ Jonathan Nieder ]
* debian/control: add Breaks against versions of dh-ocaml that relied on
the ocaml{dumpapprox,plugininfo,byteinfo} tools (Closes: #642935)
+
+ [ Stefano Zacchiroli ]
+ * remove myself from Uploaders
-- Stéphane Glondu glo...@debian.org Wed, 15 Jun 2011 18:19:01 +0200
diff --git a/debian/control b/debian/control
index f947d0d..cf7add4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
Uploaders:
- Stefano Zacchiroli z...@debian.org,
Samuel Mimram smim...@debian.org,
Sylvain Le Gall gil...@debian.org,
Ralf Treinen trei...@debian.org,
--
OCaml 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] ocamlgraph packaging branch, master, updated. debian/1.7-1-1-g9db6cd1
The following commit has been merged in the master branch: commit 9db6cd10ea5cc3de04ae48ab35e57c805fa98476 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 19:23:54 2011 +0200 remove myself from uploaders diff --git a/debian/changelog b/debian/changelog index 0d299a9..df3f226 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ocamlgraph (1.7-2) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * remove myself from uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 19:23:37 +0200 + ocamlgraph (1.7-1) unstable; urgency=low * New upstream version. diff --git a/debian/control b/debian/control index e280216..cec247a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ocamlgraph Section: libdevel Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org -Uploaders: Sylvain Le Gall gil...@debian.org, Stefano Zacchiroli z...@debian.org, Mehdi Dogguy me...@debian.org +Uploaders: Sylvain Le Gall gil...@debian.org, Mehdi Dogguy me...@debian.org Build-Depends: cdbs, dh-ocaml (= 0.9), -- ocamlgraph 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] ocamlmakefile packaging branch, master, updated. debian/6.30.0-1-1-gf5fb779
The following commit has been merged in the master branch: commit f5fb77962b1ce0670b255c8ab0a8691be9790fa9 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 19:24:32 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 11ffc42..9a30562 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ocamlmakefile (6.30.0-2) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 19:24:17 +0200 + ocamlmakefile (6.30.0-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index e2e8512..16bb439 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,7 @@ Priority: extra Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Ralf Treinen trei...@debian.org, Remi Vanicat vani...@debian.org, - Samuel Mimram smim...@debian.org, - Stefano Zacchiroli z...@debian.org + Samuel Mimram smim...@debian.org Build-Depends: debhelper (= 7.0) Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlmakefile.git -- ocamlmakefile 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] ocamlodbc packaging branch, master, updated. debian/2.15-5-1-g2c582f4
The following commit has been merged in the master branch: commit 2c582f4278a9003741e23bfd9559deec66135834 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 19:25:39 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 7108ee0..d30f46b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ocamlodbc (2.15-6) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 19:25:22 +0200 + ocamlodbc (2.15-5) unstable; urgency=low * Use dh-ocaml 0.9.1 features diff --git a/debian/control b/debian/control index 1f61ad9..03a0bba 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ocamlodbc Section: ocaml Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org -Uploaders: Samuel Mimram smim...@debian.org, Stefano Zacchiroli z...@debian.org, Sylvain Le Gall gil...@debian.org +Uploaders: Samuel Mimram smim...@debian.org, Sylvain Le Gall gil...@debian.org Build-Depends: debhelper (= 7), unixodbc-dev, unixodbc-bin, dh-ocaml (= 0.9.1), ocaml-nox (= 3.11), ocaml-findlib (= 1.2.4), liblablgtk2-ocaml-dev (= 2.12.0), dpatch Standards-Version: 3.8.3 Homepage: http://download.gna.org/ocamlodbc/ -- ocamlodbc 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-res packaging branch, master, updated. debian/3.2.0-2-1-g2c198f0
The following commit has been merged in the master branch: commit 2c198f0092421344486960f9af847f4ce6cd285e Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 19:26:25 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 7eecee3..6fedb3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ocaml-res (3.2.0-3) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 19:26:09 +0200 + ocaml-res (3.2.0-2) unstable; urgency=low * Switch packaging to dh-ocaml 0.9 diff --git a/debian/control b/debian/control index 61de568..fe921c7 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,7 @@ Source: ocaml-res Section: ocaml Priority: extra Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org -Uploaders: - Stefano Zacchiroli z...@debian.org, - Stéphane Glondu glo...@debian.org, +Uploaders: Stéphane Glondu glo...@debian.org Build-Depends: cdbs, debhelper (= 7), -- ocaml-res 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] ulex0.8 packaging branch, master, updated. debian/0.8-9-2-g737958b
The following commit has been merged in the master branch: commit 737958bfac4aba0480a7e48f22d09b8a23433214 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 19:31:22 2011 +0200 remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index e0ff157..86b8b40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ulex0.8 (0.8-10) UNRELEASED; urgency=low * set package section to ocaml (override is right) + * remove myself from Uploaders -- Stefano Zacchiroli z...@debian.org Tue, 13 Apr 2010 10:06:58 +0200 diff --git a/debian/control b/debian/control index cc7de58..3e97319 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,7 @@ Source: ulex0.8 Section: ocaml Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org -Uploaders: - Stefano Zacchiroli z...@debian.org, - Enrico Tassi gareuselesi...@debian.org +Uploaders: Enrico Tassi gareuselesi...@debian.org Build-Depends: debhelper (= 7.1.0~), ocaml-nox (= 3.11), -- ulex0.8 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] xstr packaging branch, master, updated. debian/0.2.1-21-1-g86a277d
The following commit has been merged in the master branch: commit 86a277d1e1fc33ce3b54cf4c64a276dfd00d3d7c Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 19:34:39 2011 +0200 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 01c461e..be3c2ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xstr (0.2.1-22) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * Remove myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 19:34:18 +0200 + xstr (0.2.1-21) unstable; urgency=low * Remove ./depend through debian/clean diff --git a/debian/control b/debian/control index 4bfe246..2591ef0 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xstr Section: ocaml Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org -Uploaders: Stefano Zacchiroli z...@debian.org, Sylvain Le Gall gil...@debian.org +Uploaders: Sylvain Le Gall gil...@debian.org Build-Depends: debhelper (= 7), ocaml-nox (= 3.11), -- xstr 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] hevea-doc packaging branch, master, updated. debian/1.10-2-8-gf8cf3a7
The following commit has been merged in the master branch: commit f8cf3a76ea8a2a63fc0ccee648fe30f1aa1a9339 Author: Stefano Zacchiroli z...@debian.org Date: Sat Oct 8 19:39:35 2011 +0200 removes myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 288841e..738273f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +hevea-doc (1.10-4) UNRELEASED; urgency=low + + [ Stefano Zacchiroli ] + * removes myself from Uploaders + + -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 19:39:10 +0200 + hevea-doc (1.10-3) unstable; urgency=low [ Ralf Treinen ] diff --git a/debian/control b/debian/control index ebb0570..ccc36b8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: non-free/doc Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Ralf Treinen trei...@debian.org, - Remi Vanicat vani...@debian.org, Stefano Zacchiroli z...@debian.org, + Remi Vanicat vani...@debian.org, Samuel Mimram smim...@debian.org, Sylvain Le Gall gil...@debian.org Build-Depends: debhelper (= 7.0) Standards-Version: 3.8.3 -- hevea-doc 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] cudf packaging branch, master, updated. debian/0.6-1-3-gf11ad4a
The following commit has been merged in the master branch: commit a325111f0ce58422d1b0c528848a8f51e0dcf121 Merge: 75877349911b694648a69f4d38a2197b31a1ac1b 964965ab88da86bd6b7499202cd47db23eca203b Author: Stefano Zacchiroli z...@upsilon.cc Date: Thu Sep 15 14:35:38 2011 +0200 Merge commit 'upstream/0.6.1' -- cudf 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] cudf packaging branch, master, updated. debian/0.6-1-3-gf11ad4a
The following commit has been merged in the master branch: commit f11ad4a93851c06b9a65917a955ec470ccd9d5cb Author: Stefano Zacchiroli z...@upsilon.cc Date: Thu Sep 15 14:36:42 2011 +0200 new upstream release: 0.6.1 diff --git a/debian/changelog b/debian/changelog index 9b2cfa4..13a51ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cudf (0.6.1-1) unstable; urgency=low + + * New upstream release + + -- Stefano Zacchiroli z...@debian.org Thu, 15 Sep 2011 14:35:57 +0200 + cudf (0.6-1) unstable; urgency=low * New upstream release; highlights: -- cudf 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] cudf packaging branch, pristine-tar, updated. c7fe3e811695ce49a40ee1e8d757c05f6d0f60f5
The following commit has been merged in the pristine-tar branch: commit c7fe3e811695ce49a40ee1e8d757c05f6d0f60f5 Author: Stefano Zacchiroli z...@upsilon.cc Date: Thu Sep 15 14:35:38 2011 +0200 pristine-tar data for cudf_0.6.1.orig.tar.gz diff --git a/cudf_0.6.1.orig.tar.gz.delta b/cudf_0.6.1.orig.tar.gz.delta new file mode 100644 index 000..4f998ba Binary files /dev/null and b/cudf_0.6.1.orig.tar.gz.delta differ diff --git a/cudf_0.6.1.orig.tar.gz.id b/cudf_0.6.1.orig.tar.gz.id new file mode 100644 index 000..a3a865f --- /dev/null +++ b/cudf_0.6.1.orig.tar.gz.id @@ -0,0 +1 @@ +964965ab88da86bd6b7499202cd47db23eca203b -- cudf 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] cudf packaging annotated tag, debian/0.6.1-1, created. debian/0.6.1-1
The annotated tag, debian/0.6.1-1 has been created at 4e504fe2f2e441180551bfa63ce15f03003e02b1 (tag) tagging f11ad4a93851c06b9a65917a955ec470ccd9d5cb (commit) replaces debian/0.6-1 tagged by Stefano Zacchiroli on Thu Sep 15 14:41:56 2011 +0200 - Shortlog Debian release 0.6.1-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iD8DBQBOcfKU1cqbBPLEI7wRAi2XAJ0TvrGwISayBNDOFpzC3M+uSYaOjACgnKm1 yQ3iH+GL5XE3Yz3Wxhg/jPg= =/aSm -END PGP SIGNATURE- Stefano Zacchiroli (3): Imported Upstream version 0.6.1 Merge commit 'upstream/0.6.1' new upstream release: 0.6.1 --- -- cudf 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] cudf packaging annotated tag, upstream/0.6.1, created. upstream/0.6.1
The annotated tag, upstream/0.6.1 has been created at e4e282738bc38642b8f7aa2696671be183410a92 (tag) tagging 964965ab88da86bd6b7499202cd47db23eca203b (commit) replaces upstream/0.6 tagged by Stefano Zacchiroli on Thu Sep 15 14:35:38 2011 +0200 - Shortlog Upstream version 0.6.1 Stefano Zacchiroli (1): Imported Upstream version 0.6.1 --- -- cudf 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] dose3 packaging branch, master, updated. debian/2.9.4-2-19-gb0cd288
The following commit has been merged in the master branch:
commit 1354d588d76012b5d7926d35d27fb3f98281b8f0
Author: Stefano Zacchiroli z...@upsilon.cc
Date: Sat Jun 11 16:49:05 2011 +0200
update-cudf-solvers: add --list action
extras:
- add short getopt options
- fix detection of existing edsp/cudf solvers
diff --git a/debian/update-cudf-solvers b/debian/update-cudf-solvers
index cee0fd0..2d7037b 100755
--- a/debian/update-cudf-solvers
+++ b/debian/update-cudf-solvers
@@ -20,6 +20,7 @@ my $apt_cudf = /usr/bin/apt-cudf;
# globals
my $debug = 0;
my $help_action = 0;
+my $list_action = 0;
my $remove_action = 0;
sub warning($) {
@@ -38,10 +39,10 @@ sub die_usage() {
pod2usage(%podflags);
}
-sub shallow_find($$) {
+sub shallow_find($) {
my ($dir, $pred) = @_;
my @found = ();
-foreach my $f (`find $dir -maxdepth 1 $pred`) {
+foreach my $f (`find $dir -maxdepth 1 -mindepth 1 -type f -o -type l`) {
chomp $f;
push @found, basename $f;
}
@@ -100,20 +101,26 @@ sub remove_all($$) {
sub main() {
my $getopt = GetOptions(
- debug = \$debug,
+ d|debug = \$debug,
h|help = \$help_action,
- remove = \$remove_action,
+ l|list = \$list_action,
+ r|remove = \$remove_action,
);
die_usage if (! $getopt || $help_action);
-d $edsp_dir or make_path($edsp_dir, { mode = 0755 });
-my @cudf_solvers = shallow_find($cudf_dir, -type f);
-my @edsp_solvers = shallow_find($edsp_dir, -type l);
-foreach my $s (@cudf_solvers) { debug found cudf solver: $s; }
-foreach my $s (@edsp_solvers) { debug found edsp solver: $s; }
+my @cudf_solvers = shallow_find($cudf_dir);
+my @edsp_solvers = shallow_find($edsp_dir);
+if ($debug) {
+ foreach my $s (@cudf_solvers) { debug found cudf solver: $s; }
+ foreach my $s (@edsp_solvers) { debug found edsp solver: $s; }
+}
-if ($remove_action) {
+if ($list_action) {
+ foreach my $s (@cudf_solvers) { print cudf: $s\n; }
+ foreach my $s (@edsp_solvers) { print edsp: $s\n; }
+} elsif ($remove_action) {
remove_all(\@cudf_solvers, \@edsp_solvers);
} else {
install_new(\@cudf_solvers, \@edsp_solvers);
@@ -138,6 +145,8 @@ update-cudf-solvers - register available CUDF solvers as
APT external solvers
=item Bupdate-cudf-solvers [IOPTION]... --remove
+=item Bupdate-cudf-solvers [IOPTION]... --list
+
=back
=head1 DESCRIPTION
@@ -156,6 +165,8 @@ The second form (with the mandatory C--remove option)
will remove all
installed external APT solvers that originated from CUDF solvers. It's a
cleanup operation meant to be used only upon removal of the apt-cudf package.
+The third form just lists available solvers and exit.
+
Note that other, non-CUDF based, APT external solvers might be present under
F/usr/lib/apt/solvers. update-cudf-solvers leaves the untouched and act only
on (present or past) APT solvers corresponding to CUDF solvers.
@@ -170,6 +181,8 @@ you should not be required to opearte update-cudf-solvers
manually.
=over 4
+=item -d
+
=item --debug
Print debugging information during operation.
@@ -180,9 +193,18 @@ Print debugging information during operation.
Show usage information and exit.
+=item -l
+
+=item --list
+
+List available solvers and exit. Both CUDF and APT's external solvers (AKA
+EDSP solvers) will be listed.
+
+=item -r
+
=item --remove
-Unregister all CUDF solvers (see DESCRIPTION above).
+Unregister all CUDF solvers.
=back
--
dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-19-gb0cd288
The following commit has been merged in the master branch:
commit 9cd288e5d189f99da0390d91634b6bf8affbc51d
Author: Stefano Zacchiroli z...@upsilon.cc
Date: Sat Jun 11 16:32:34 2011 +0200
cosmetic changs: uniform indentation in update-cudf-solvers
diff --git a/debian/update-cudf-solvers b/debian/update-cudf-solvers
index 06a6324..cee0fd0 100755
--- a/debian/update-cudf-solvers
+++ b/debian/update-cudf-solvers
@@ -22,6 +22,22 @@ my $debug = 0;
my $help_action = 0;
my $remove_action = 0;
+sub warning($) {
+my ($msg) = @_;
+print STDERR update-cudf-solvers: W: $msg\n;
+}
+
+sub debug($) {
+my ($msg) = @_;
+print STDERR update-cudf-solvers: I: $msg\n if $debug;
+}
+
+sub die_usage() {
+my %podflags = ( verbose = 1,
+exitval = 2 );
+pod2usage(%podflags);
+}
+
sub shallow_find($$) {
my ($dir, $pred) = @_;
my @found = ();
@@ -32,15 +48,6 @@ sub shallow_find($$) {
return @found;
}
-sub warning($) { my ($msg) = @_; print STDERR update-cudf-solvers: W:
$msg\n; }
-sub debug($) { my ($msg) = @_; print STDERR update-cudf-solvers: I: $msg\n
if $debug; }
-
-sub die_usage() {
-my %podflags = ( verbose = 1,
-exitval = 2 );
-pod2usage(%podflags);
-}
-
# check whether a given EDSP solver path originates from a CUDF solver
sub is_cudf_solver($) {
my ($path) = @_;
--
dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-19-gb0cd288
The following commit has been merged in the master branch: commit b0cd288290da53e3c397299bb0c37d594e8b92f1 Author: Stefano Zacchiroli z...@upsilon.cc Date: Sat Jun 11 17:06:23 2011 +0200 update-cudf-solvers manpage: rename as belonging to section 8 diff --git a/debian/apt-cudf.manpages b/debian/apt-cudf.manpages index db08673..dfe8c9f 100644 --- a/debian/apt-cudf.manpages +++ b/debian/apt-cudf.manpages @@ -1,2 +1,2 @@ doc/manpages/apt-cudf.1 -debian/update-cudf-solvers.1 +debian/update-cudf-solvers.8 diff --git a/debian/rules b/debian/rules index d7a43c6..6f8da5f 100755 --- a/debian/rules +++ b/debian/rules @@ -25,10 +25,10 @@ override_dh_auto_build: dh_auto_build pod2man --section 8 \ --release apt-cudf $(shell dpkg-parsechangelog | grep ^Version: | cut -f 2 -d' ') \ - debian/update-cudf-solvers debian/update-cudf-solvers.1 + debian/update-cudf-solvers debian/update-cudf-solvers.8 override_dh_auto_clean: dh_auto_clean - rm -f debian/update-cudf-solvers.1 + rm -f debian/update-cudf-solvers.8 rm -f _tags -- dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-24-ga7c81d2
The following commit has been merged in the master branch: commit 20c7e09d53dc146ef05fb2649667aaec0e982e60 Merge: b0cd288290da53e3c397299bb0c37d594e8b92f1 a1fee0e0b1b80450eef8d56f3341052cf9f80883 Author: Stefano Zacchiroli z...@upsilon.cc Date: Sun Jun 12 09:37:28 2011 +0200 Merge commit 'upstream/2.9.8' -- dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-24-ga7c81d2
The following commit has been merged in the master branch: commit bf0a02b8995e87964ce502f583ffde1e15b19e14 Author: Stefano Zacchiroli z...@upsilon.cc Date: Sun Jun 12 09:39:49 2011 +0200 new upstream release diff --git a/debian/changelog b/debian/changelog index cd240d4..168bad3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,8 @@ -dose3 (2.9.4+r2709-1) UNRELEASED; urgency=low +dose3 (2.9.8-1) UNRELEASED; urgency=low [ Stefano Zacchiroli ] - * Imported Upstream version 2.9.4+r2709 -- upstream SVN snapshot, release 2709 -- contains apt-cudf + * New upstream release +- first release shipping apt-cudf * new binary package: apt-cudf - provides glue among CUDF solvers and EDSP (i.e. APT's native) external solvers @@ -12,7 +11,7 @@ dose3 (2.9.4+r2709-1) UNRELEASED; urgency=low - set up trigger monitoring /usr/share/cudf/solvers/; it will invoke update-cudf-solvers at each change - -- Stefano Zacchiroli z...@debian.org Sat, 11 Jun 2011 11:57:28 +0200 + -- Stefano Zacchiroli z...@debian.org Sun, 12 Jun 2011 09:37:58 +0200 dose3 (2.9.4-2) experimental; urgency=low -- dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-24-ga7c81d2
The following commit has been merged in the master branch: commit a7c81d27c1925e0909455268578449597dd7265e Author: Stefano Zacchiroli z...@upsilon.cc Date: Sun Jun 12 09:42:15 2011 +0200 debian/copyright: cover packaging work and update-cudf-solvers diff --git a/debian/changelog b/debian/changelog index 168bad3..03c046e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ dose3 (2.9.8-1) UNRELEASED; urgency=low installation of CUDF solvers, to bind them to APT - set up trigger monitoring /usr/share/cudf/solvers/; it will invoke update-cudf-solvers at each change + * debian/copyright: add coverage of packaging work, singling out +update-cudf-solvers -- Stefano Zacchiroli z...@debian.org Sun, 12 Jun 2011 09:37:58 +0200 diff --git a/debian/copyright b/debian/copyright index 57e1175..e4e3797 100644 --- a/debian/copyright +++ b/debian/copyright @@ -27,6 +27,15 @@ File: common/url.ml Copyright: © 2001,2002 b8_bavard, b8_fee_carabine, INRIA License: LGPL-2+ +File: debian/update-cudf-solvers +Copyright: © 2011 Stefano Zacchiroli +License: LGPL-3+ + +File: debian/* +Copyright: © 2011 Ralf Treinen + © 2011 Stefano Zacchiroli +License: LGPL-3+ + File: * Copyright: © 2009-2010 Pietro Abate License: LGPL-3+ -- dose3 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] dose3 packaging branch, pristine-tar, updated. 1ff9b7381ff78025c8b488f961ad5d944910a24d
The following commit has been merged in the pristine-tar branch: commit 1ff9b7381ff78025c8b488f961ad5d944910a24d Author: Stefano Zacchiroli z...@upsilon.cc Date: Sun Jun 12 09:37:28 2011 +0200 pristine-tar data for dose3_2.9.8.orig.tar.gz diff --git a/dose3_2.9.8.orig.tar.gz.delta b/dose3_2.9.8.orig.tar.gz.delta new file mode 100644 index 000..4b64bbf Binary files /dev/null and b/dose3_2.9.8.orig.tar.gz.delta differ diff --git a/dose3_2.9.8.orig.tar.gz.id b/dose3_2.9.8.orig.tar.gz.id new file mode 100644 index 000..db3f3ba --- /dev/null +++ b/dose3_2.9.8.orig.tar.gz.id @@ -0,0 +1 @@ +a1fee0e0b1b80450eef8d56f3341052cf9f80883 -- dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-25-g93c7d6f
The following commit has been merged in the master branch: commit 93c7d6fb2dcb022d4762fbb0fe83a041a47908bc Author: Stefano Zacchiroli z...@upsilon.cc Date: Sun Jun 12 09:46:27 2011 +0200 prepare for an upload to experimental diff --git a/debian/changelog b/debian/changelog index 03c046e..15ad5c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dose3 (2.9.8-1) UNRELEASED; urgency=low +dose3 (2.9.8-1) experimental; urgency=low [ Stefano Zacchiroli ] * New upstream release -- dose3 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] dose3 packaging annotated tag, debian/2.9.8-1, created. debian/2.9.8-1
The annotated tag, debian/2.9.8-1 has been created at 711bd19f7e4df4f247736ddc18965eb8ba2a09af (tag) tagging 93c7d6fb2dcb022d4762fbb0fe83a041a47908bc (commit) replaces debian/2.9.4-2 tagged by Stefano Zacchiroli on Sun Jun 12 09:57:42 2011 +0200 - Shortlog Debian release 2.9.8-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iD8DBQBN9HF21cqbBPLEI7wRAjH7AJ4gAhPTaXbYzou+mQhzxm+zs+NTHACfX3QQ kH2fxO2anWIFfsfxNX+ofu4= =sbt6 -END PGP SIGNATURE- Ralf Treinen (1): Imported Upstream version 2.9.4 Stefano Zacchiroli (24): Imported Upstream version 2.9.7+r2696 Merge commit 'upstream/2.9.7+r2696' new upstream release (SVN snapshot) apt-cudf packaging Imported Upstream version 2.9.4+r2696 Merge commit 'upstream/2.9.4+r2696' new binary package: apt-cudf add trigger to monitor /usr/share/cudf/solvers/ and run update-cudf-solvers at each change update-cudf-solvers: manpage generation and cleanup clean-up build left-overs update-cudf-solvers: support for --remove and documentation update-cudf-solvers: create EDSP dir if needed update-cudf-solvers manpage: fix section, release, and references Imported Upstream version 2.9.4+r2709 new upstream SVN snapshot, r2709 ship apt-cudf manpage cosmetic changs: uniform indentation in update-cudf-solvers update-cudf-solvers: add --list action update-cudf-solvers manpage: rename as belonging to section 8 Imported Upstream version 2.9.8 Merge commit 'upstream/2.9.8' new upstream release debian/copyright: cover packaging work and update-cudf-solvers prepare for an upload to experimental --- -- dose3 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] dose3 packaging annotated tag, upstream/2.9.4+r2709, created. upstream/2.9.4+r2709
The annotated tag, upstream/2.9.4+r2709 has been created at 7ccaa7a652164e83f545cb3831cb14d73b940810 (tag) tagging f347b11e56945258cf05b3240c91a81fda096d95 (commit) replaces upstream/2.9.4+r2696 tagged by Stefano Zacchiroli on Sat Jun 11 11:55:10 2011 +0200 - Shortlog Upstream version 2.9.4+r2709 Stefano Zacchiroli (1): Imported Upstream version 2.9.4+r2709 --- -- dose3 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] dose3 packaging annotated tag, upstream/2.9.7+r2696, created. upstream/2.9.7+r2696
The annotated tag, upstream/2.9.7+r2696 has been created at 76cd7f7c6e9b23b12e9ae356811451a85f5211e4 (tag) tagging 7a6cc47998cf18b055e8d84f5ca88848034e954d (commit) replaces upstream/2.9.3 tagged by Stefano Zacchiroli on Fri Jun 10 15:45:19 2011 +0200 - Shortlog Upstream version 2.9.7+r2696 Ralf Treinen (2): Imported Upstream version 2.9.4 Imported Upstream version 2.9.4 Stefano Zacchiroli (1): Imported Upstream version 2.9.7+r2696 --- -- dose3 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] dose3 packaging annotated tag, upstream/2.9.8, created. upstream/2.9.8
The annotated tag, upstream/2.9.8 has been created at 17aef566de6a494a70fd1a2b58472fd2db87d987 (tag) tagging a1fee0e0b1b80450eef8d56f3341052cf9f80883 (commit) replaces upstream/2.9.4+r2709 tagged by Stefano Zacchiroli on Sun Jun 12 09:37:28 2011 +0200 - Shortlog Upstream version 2.9.8 Stefano Zacchiroli (1): Imported Upstream version 2.9.8 --- -- dose3 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] dose3 packaging annotated tag, upstream/2.9.4+r2696, created. upstream/2.9.4+r2696
The annotated tag, upstream/2.9.4+r2696 has been created at 8e25c9e33fbd22a13d23b69f67834c7b95a632c9 (tag) tagging 441a8564ec993b77c9b4d99a27d1240231e7cf38 (commit) replaces upstream/2.9.7+r2696 tagged by Stefano Zacchiroli on Fri Jun 10 17:40:11 2011 +0200 - Shortlog Upstream version 2.9.4+r2696 Stefano Zacchiroli (1): Imported Upstream version 2.9.4+r2696 --- -- dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-13-gc77a550
The following commit has been merged in the master branch: commit 813803eb31f61417bf74a17a200ec7ce547b77db Author: Stefano Zacchiroli z...@upsilon.cc Date: Fri Jun 10 23:48:00 2011 +0200 add trigger to monitor /usr/share/cudf/solvers/ and run update-cudf-solvers at each change diff --git a/debian/apt-cudf.postinst b/debian/apt-cudf.postinst new file mode 100644 index 000..f15d5a2 --- /dev/null +++ b/debian/apt-cudf.postinst @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Will be invoked both at apt-cudf configuration time and each time the trigger +# monitoring CUDF solver dir (usually /usr/share/cudf/solvers/) is activated. +# +update-cudf-solvers + +#DEBHELPER# + +exit 0 diff --git a/debian/apt-cudf.prerm b/debian/apt-cudf.prerm new file mode 100644 index 000..316ea89 --- /dev/null +++ b/debian/apt-cudf.prerm @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Clean up EDSP (i.e. APT external) solvers which have been generated for CUDF +# solvers. They will be added back upon (re-)installation of apt-cudf. +# +update-cudf-solvers --remove + +#DEBHELPER# + +exit 0 diff --git a/debian/apt-cudf.triggers b/debian/apt-cudf.triggers new file mode 100644 index 000..d009580 --- /dev/null +++ b/debian/apt-cudf.triggers @@ -0,0 +1 @@ +interest /usr/share/cudf/solvers diff --git a/debian/changelog b/debian/changelog index a654c7e..8bbe7c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ dose3 (2.9.4+r2696-1) UNRELEASED; urgency=low external solvers - new helper update-cudf-solvers, to be invoked at each new installation of CUDF solvers, to bind them to APT +- set up trigger monitoring /usr/share/cudf/solvers/; it will invoke + update-cudf-solvers at each change -- Stefano Zacchiroli z...@debian.org Fri, 10 Jun 2011 15:45:43 +0200 -- dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-13-gc77a550
The following commit has been merged in the master branch: commit 344d88c0e7a1db8e3a05d1d0c8fbb031cd2d9135 Author: Stefano Zacchiroli z...@upsilon.cc Date: Sat Jun 11 09:58:31 2011 +0200 update-cudf-solvers: manpage generation and cleanup diff --git a/debian/apt-cudf.manpages b/debian/apt-cudf.manpages new file mode 100644 index 000..38e59a3 --- /dev/null +++ b/debian/apt-cudf.manpages @@ -0,0 +1 @@ +debian/update-cudf-solvers.1 diff --git a/debian/rules b/debian/rules index 2bf10e6..8b06b34 100755 --- a/debian/rules +++ b/debian/rules @@ -21,4 +21,11 @@ override_dh_installman: cd debian/dose3-distcheck/usr/share/man/man1 \ mv distcheck.1 dose3-distcheck.1 +override_dh_auto_build: + dh_auto_build + pod2man debian/update-cudf-solvers debian/update-cudf-solvers.1 + +override_dh_auto_clean: + dh_auto_clean + rm -f debian/update-cudf-solvers.1 -- dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-13-gc77a550
The following commit has been merged in the master branch: commit 16a325a4152402fb33436aaf05ef1c9b0950b733 Author: Stefano Zacchiroli z...@upsilon.cc Date: Sat Jun 11 09:58:57 2011 +0200 clean-up build left-overs diff --git a/debian/rules b/debian/rules index 8b06b34..5307bb8 100755 --- a/debian/rules +++ b/debian/rules @@ -28,4 +28,5 @@ override_dh_auto_build: override_dh_auto_clean: dh_auto_clean rm -f debian/update-cudf-solvers.1 + rm -f _tags -- dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-13-gc77a550
The following commit has been merged in the master branch:
commit c77a5501a8d417e1ca17cc0a4b538f19fb154641
Author: Stefano Zacchiroli z...@upsilon.cc
Date: Sat Jun 11 10:58:34 2011 +0200
update-cudf-solvers: create EDSP dir if needed
diff --git a/debian/update-cudf-solvers b/debian/update-cudf-solvers
index 1d149f7..8495705 100755
--- a/debian/update-cudf-solvers
+++ b/debian/update-cudf-solvers
@@ -8,6 +8,7 @@
use strict;
use File::Basename;
+use File::Path qw(make_path);
use Getopt::Long;
use Pod::Usage;
@@ -98,6 +99,8 @@ sub main() {
);
die_usage if (! $getopt || $help_action);
+-d $edsp_dir or make_path($edsp_dir, { mode = 0755 });
+
my @cudf_solvers = shallow_find($cudf_dir, -type f);
my @edsp_solvers = shallow_find($edsp_dir, -type l);
foreach my $s (@cudf_solvers) { debug found cudf solver: $s; }
--
dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-13-gc77a550
The following commit has been merged in the master branch:
commit eb42b0ee24762b83e1655006f7504f8a02eacdf0
Author: Stefano Zacchiroli z...@upsilon.cc
Date: Sat Jun 11 10:47:39 2011 +0200
update-cudf-solvers: support for --remove and documentation
- major changes (getopt, pod, etc.)
- substantial code refactoring for reuse and future extensions
diff --git a/debian/update-cudf-solvers b/debian/update-cudf-solvers
index 4f88067..1d149f7 100755
--- a/debian/update-cudf-solvers
+++ b/debian/update-cudf-solvers
@@ -2,17 +2,24 @@
#
# update-cudf-solvers: register available CUDF solvers and bind them to APT
#
-# Copyright (C) Stefano Zacchiroli 2011 z...@debian.org
+# Copyright: © Stefano Zacchiroli 2011 z...@debian.org
# License: GNU Lesser General Public License, version 3 or above
use strict;
+
use File::Basename;
+use Getopt::Long;
+use Pod::Usage;
+# configuration
my $cudf_dir = /usr/share/cudf/solvers;
my $edsp_dir = /usr/lib/apt/solvers;
my $apt_cudf = /usr/bin/apt-cudf;
+# globals
my $debug = 0;
+my $help_action = 0;
+my $remove_action = 0;
sub shallow_find($$) {
my ($dir, $pred) = @_;
@@ -27,16 +34,24 @@ sub shallow_find($$) {
sub warning($) { my ($msg) = @_; print STDERR update-cudf-solvers: W:
$msg\n; }
sub debug($) { my ($msg) = @_; print STDERR update-cudf-solvers: I: $msg\n
if $debug; }
-my @cudf_solvers = shallow_find($cudf_dir, -type f); # current CUDF solvers
-my @edsp_solvers = shallow_find($edsp_dir, -type l); # current EDSP solvers
+sub die_usage() {
+my %podflags = ( verbose = 1,
+exitval = 2 );
+pod2usage(%podflags);
+}
-foreach my $s (@cudf_solvers) { debug found cudf solver: $s; }
-foreach my $s (@edsp_solvers) { debug found edsp solver: $s; }
+# check whether a given EDSP solver path originates from a CUDF solver
+sub is_cudf_solver($) {
+my ($path) = @_;
+return (-l $path readlink($path) eq $apt_cudf);
+}
# install: act on new CUDF solvers; make them available as EDSP solvers
-foreach my $cudf_name (@cudf_solvers) {
-my $edsp_solver = $edsp_dir/$cudf_name;
-unless (-l $edsp_solver readlink($edsp_solver) eq $apt_cudf) {
+sub install_new($$) {
+my ($cudf_solvers, $edsp_solvers) = @_;
+foreach my $cudf_name (@$cudf_solvers) {
+ my $edsp_solver = $edsp_dir/$cudf_name;
+ next if is_cudf_solver($edsp_solver);
if (-e $edsp_solver || -l $edsp_solver) {
# either existing non CUDF solver or dangling symlink
warning refuse to overwrite $edsp_solver with a symlink to
$apt_cudf, skipping;
@@ -49,10 +64,12 @@ foreach my $cudf_name (@cudf_solvers) {
}
# garbage collection: act on old EDSP solvers; get rid of them
-foreach my $edsp_name (@edsp_solvers) {
-my $edsp_solver = $edsp_dir/$edsp_name;
-if (-l $edsp_solver readlink($edsp_solver) eq $apt_cudf) {
- if (! grep {$_ eq $edsp_name} @cudf_solvers) {
+sub remove_old($$) {
+my ($cudf_solvers, $edsp_solvers) = @_;
+foreach my $edsp_name (@$edsp_solvers) {
+ my $edsp_solver = $edsp_dir/$edsp_name;
+ next unless is_cudf_solver($edsp_solver);
+ if (! grep {$_ eq $edsp_name} @$cudf_solvers) {
# EDSP CUDF solver, no longer existing
debug unlink (gone) $edsp_solver;
unlink $edsp_solver
@@ -60,3 +77,113 @@ foreach my $edsp_name (@edsp_solvers) {
}
}
}
+
+# remove all EDSP solvers originating from CUDF solvers
+sub remove_all($$) {
+my ($cudf_solvers, $edsp_solvers) = @_;
+foreach my $edsp_name (@$edsp_solvers) {
+ my $edsp_solver = $edsp_dir/$edsp_name;
+ if (is_cudf_solver($edsp_solver)) {
+ unlink $edsp_solver
+ or warning cannot unlink $edsp_solver, skipping;
+ }
+}
+}
+
+sub main() {
+my $getopt = GetOptions(
+ debug = \$debug,
+ h|help = \$help_action,
+ remove = \$remove_action,
+ );
+die_usage if (! $getopt || $help_action);
+
+my @cudf_solvers = shallow_find($cudf_dir, -type f);
+my @edsp_solvers = shallow_find($edsp_dir, -type l);
+foreach my $s (@cudf_solvers) { debug found cudf solver: $s; }
+foreach my $s (@edsp_solvers) { debug found edsp solver: $s; }
+
+if ($remove_action) {
+ remove_all(\@cudf_solvers, \@edsp_solvers);
+} else {
+ install_new(\@cudf_solvers, \@edsp_solvers);
+ remove_old(\@cudf_solvers, \@edsp_solvers);
+}
+exit 0;
+}
+
+main();
+
+__END__
+
+=head1 NAME
+
+update-cudf-solvers - register available CUDF solvers as APT external solvers
+
+=head1 SYNOPSIS
+
+=over
+
+=item Bupdate-cudf-solvers [IOPTION]...
+
+=item Bupdate-cudf-solvers [IOPTION]... --remove
+
+=back
+
+=head1 DESCRIPTION
+
+update-cudf-solvers maintain the list of installed CUDF solvers and register
+them as external solvers for APT.
+
+The first form (without mandatory options) should be invoked each time a new
+CUDF solver specification file is added to or removed from
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.4-2-14-g21bd9cc
The following commit has been merged in the master branch: commit 21bd9cc77449bdb751f81cde55d2581f37e6fdb7 Author: Stefano Zacchiroli z...@upsilon.cc Date: Sat Jun 11 11:45:25 2011 +0200 update-cudf-solvers manpage: fix section, release, and references diff --git a/debian/rules b/debian/rules index 5307bb8..d7a43c6 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,9 @@ override_dh_installman: override_dh_auto_build: dh_auto_build - pod2man debian/update-cudf-solvers debian/update-cudf-solvers.1 + pod2man --section 8 \ + --release apt-cudf $(shell dpkg-parsechangelog | grep ^Version: | cut -f 2 -d' ') \ + debian/update-cudf-solvers debian/update-cudf-solvers.1 override_dh_auto_clean: dh_auto_clean diff --git a/debian/update-cudf-solvers b/debian/update-cudf-solvers index 8495705..06a6324 100755 --- a/debian/update-cudf-solvers +++ b/debian/update-cudf-solvers @@ -181,7 +181,9 @@ Unregister all CUDF solvers (see DESCRIPTION above). =head1 SEE ALSO -apt-get(8), LREADME.cudf-solvers|file:///usr/share/doc/apt-cudf/README.cudf-solvers, LREADME.Debian|file:///usr/share/doc/apt-cudf/README.Debian +apt-get(8), apt-cudf(8), +LREADME.cudf-solvers|file:///usr/share/doc/apt-cudf/README.cudf-solvers, +LREADME.Debian|file:///usr/share/doc/apt-cudf/README.Debian =head1 AUTHOR -- dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-16-g689f51c
The following commit has been merged in the master branch: commit c87be01fbc96229a51e2317164d1263de8c3febd Author: Stefano Zacchiroli z...@upsilon.cc Date: Sat Jun 11 11:56:32 2011 +0200 new upstream SVN snapshot, r2709 diff --git a/Makefile b/Makefile index ae4955b..e320345 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ DIST_TARBALL = $(DIST_DIR).tar.gz OBFLAGS = -use-ocamlfind #-classic-display -all: lib +all: lib man $(OCAMLBUILD) $(OBFLAGS) $(TARGETS) DOSELIBS = _build/doselibs @@ -87,15 +87,20 @@ doseparse/boilerplateNoRpm.%: lib: $(LIBS) +man: doc/manpages/apt-cudf.1 + +doc/manpages/apt-cudf.1: doc/manpages/apt-cudf.pod + pod2man --section 8 --release $(NAME) $(VERSION) $ $@ + clean: $(OCAMLBUILD) -clean distclean: clean rm -Rf Makefile.config aclocal.m4 config.log config.status autom4te.cache/ - rm algo/algo.mlpack - rm common/versionInfo.ml - rm db/db.mlpack - rm META + rm -f algo/algo.mlpack + rm -f common/versionInfo.ml + rm -f db/db.mlpack + rm -f _tags META rm -f doc/manpages/*.1 $(DOSELIBS)/%: diff --git a/debian/changelog b/debian/changelog index 8bbe7c8..cd240d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -dose3 (2.9.4+r2696-1) UNRELEASED; urgency=low +dose3 (2.9.4+r2709-1) UNRELEASED; urgency=low [ Stefano Zacchiroli ] - * Imported Upstream version 2.9.4+r2696 -- upstream SVN snapshot, release 2696 + * Imported Upstream version 2.9.4+r2709 +- upstream SVN snapshot, release 2709 - contains apt-cudf * new binary package: apt-cudf - provides glue among CUDF solvers and EDSP (i.e. APT's native) @@ -12,7 +12,7 @@ dose3 (2.9.4+r2696-1) UNRELEASED; urgency=low - set up trigger monitoring /usr/share/cudf/solvers/; it will invoke update-cudf-solvers at each change - -- Stefano Zacchiroli z...@debian.org Fri, 10 Jun 2011 15:45:43 +0200 + -- Stefano Zacchiroli z...@debian.org Sat, 11 Jun 2011 11:57:28 +0200 dose3 (2.9.4-2) experimental; urgency=low diff --git a/doc/apt-cudf/README.cudf-solvers b/doc/apt-cudf/README.cudf-solvers index 371778d..88e371e 100644 --- a/doc/apt-cudf/README.cudf-solvers +++ b/doc/apt-cudf/README.cudf-solvers @@ -1,17 +1,19 @@ CUDF solver specification = -Several CUDF solvers can be installed at once on any given system. +Several CUDF solvers may be installed at teh same time on any given +system. -Each solver must come together a CUDF solver specification file. CUDF solver -specifications must be installed under `/usr/share/cudf/solvers/`, one file per -solver. +Each solver must come together a CUDF solver specification file. The +CUDF solver specification files must be installed under +`/usr/share/cudf/solvers/`, one file per solver. -The CUDF solver specification file must carry the same name of the solver. CUDF -solver names must be formed using only alphanumeric ASCII characters, dashes, -and underscores; solver names must start with a lowercase ASCII letter. The -special name `internal` is reserved (for APT internal solver) and shall not be -used. +The name of a CUDF solver specification file must be formed using only +alphanumeric ASCII characters, dashes, and underscores, and must start +with a lowercase ASCII letter. The special name `internal` is reserved +(for the APT internal solver) and shall not be used. The name of this +file may hence be used as a unique identifier of the solver it +describes. A list of installed CUDF solvers can therefore be obtained by looking at the content of `usr/share/cudf/solvers`. E.g.: @@ -33,10 +35,11 @@ Allowed properties are: corresponding CUDF solver - **exec:** (mandatory) command line that should be used to invoke the CUDF - solver meant to be interpreted, after interpolation, by `/bin/sh`. The - command line must contain 3 wildcards, each one occurring only once: $in, - $out, $pref. All wildcards will be replaced before invoking the CUDF - solver as follows: + solver meant to be interpreted, after interpolation, by `/bin/sh` (warning: + that also means that no special treatment of shell meta characters is done, + you've been warned). The command line must contain 3 wildcards, each one + occurring only once: $in, $out, $pref. All wildcards will be replaced + before invoking the CUDF solver as follows: - **$in:** file name of the input CUDF document for the solver. The file must be read sequentially by the solver only once and cannot be lseek()-ed; @@ -52,7 +55,8 @@ Allowed properties are: - **cudf-version:** (mandatory) version of the CUDF standard supported by the CUDF solver -A sample CUDF solver specification is given below: +A sample CUDF solver specification, describing the solver 'ssolve', +is given below: $ cat /usr/share/cudf/solvers/ssolve description: super solver that will blow your mind diff --git a/doc/manpages/apt-cudf.pod b/doc/manpages
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.4-2-16-g689f51c
The following commit has been merged in the master branch: commit 689f51cbd8e0a87b7f198690e5cd0a4d1ad71515 Author: Stefano Zacchiroli z...@upsilon.cc Date: Sat Jun 11 11:58:45 2011 +0200 ship apt-cudf manpage diff --git a/debian/apt-cudf.manpages b/debian/apt-cudf.manpages index 38e59a3..db08673 100644 --- a/debian/apt-cudf.manpages +++ b/debian/apt-cudf.manpages @@ -1 +1,2 @@ +doc/manpages/apt-cudf.1 debian/update-cudf-solvers.1 -- dose3 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] dose3 packaging branch, pristine-tar, updated. c357bcf8afc8c3e38bad69e3dbf35299884b29c4
The following commit has been merged in the pristine-tar branch: commit c357bcf8afc8c3e38bad69e3dbf35299884b29c4 Author: Stefano Zacchiroli z...@upsilon.cc Date: Sat Jun 11 11:55:09 2011 +0200 pristine-tar data for dose3_2.9.4+r2709.orig.tar.gz diff --git a/dose3_2.9.4+r2709.orig.tar.gz.delta b/dose3_2.9.4+r2709.orig.tar.gz.delta new file mode 100644 index 000..0ae90f2 Binary files /dev/null and b/dose3_2.9.4+r2709.orig.tar.gz.delta differ diff --git a/dose3_2.9.4+r2709.orig.tar.gz.id b/dose3_2.9.4+r2709.orig.tar.gz.id new file mode 100644 index 000..44e943a --- /dev/null +++ b/dose3_2.9.4+r2709.orig.tar.gz.id @@ -0,0 +1 @@ +f347b11e56945258cf05b3240c91a81fda096d95 -- dose3 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] dose3 packaging branch, upstream, updated. upstream/2.9.3-5-gf347b11
The following commit has been merged in the upstream branch: commit f347b11e56945258cf05b3240c91a81fda096d95 Author: Stefano Zacchiroli z...@upsilon.cc Date: Sat Jun 11 11:55:09 2011 +0200 Imported Upstream version 2.9.4+r2709 diff --git a/Makefile b/Makefile index ae4955b..e320345 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ DIST_TARBALL = $(DIST_DIR).tar.gz OBFLAGS = -use-ocamlfind #-classic-display -all: lib +all: lib man $(OCAMLBUILD) $(OBFLAGS) $(TARGETS) DOSELIBS = _build/doselibs @@ -87,15 +87,20 @@ doseparse/boilerplateNoRpm.%: lib: $(LIBS) +man: doc/manpages/apt-cudf.1 + +doc/manpages/apt-cudf.1: doc/manpages/apt-cudf.pod + pod2man --section 8 --release $(NAME) $(VERSION) $ $@ + clean: $(OCAMLBUILD) -clean distclean: clean rm -Rf Makefile.config aclocal.m4 config.log config.status autom4te.cache/ - rm algo/algo.mlpack - rm common/versionInfo.ml - rm db/db.mlpack - rm META + rm -f algo/algo.mlpack + rm -f common/versionInfo.ml + rm -f db/db.mlpack + rm -f _tags META rm -f doc/manpages/*.1 $(DOSELIBS)/%: diff --git a/doc/apt-cudf/README.cudf-solvers b/doc/apt-cudf/README.cudf-solvers index 371778d..88e371e 100644 --- a/doc/apt-cudf/README.cudf-solvers +++ b/doc/apt-cudf/README.cudf-solvers @@ -1,17 +1,19 @@ CUDF solver specification = -Several CUDF solvers can be installed at once on any given system. +Several CUDF solvers may be installed at teh same time on any given +system. -Each solver must come together a CUDF solver specification file. CUDF solver -specifications must be installed under `/usr/share/cudf/solvers/`, one file per -solver. +Each solver must come together a CUDF solver specification file. The +CUDF solver specification files must be installed under +`/usr/share/cudf/solvers/`, one file per solver. -The CUDF solver specification file must carry the same name of the solver. CUDF -solver names must be formed using only alphanumeric ASCII characters, dashes, -and underscores; solver names must start with a lowercase ASCII letter. The -special name `internal` is reserved (for APT internal solver) and shall not be -used. +The name of a CUDF solver specification file must be formed using only +alphanumeric ASCII characters, dashes, and underscores, and must start +with a lowercase ASCII letter. The special name `internal` is reserved +(for the APT internal solver) and shall not be used. The name of this +file may hence be used as a unique identifier of the solver it +describes. A list of installed CUDF solvers can therefore be obtained by looking at the content of `usr/share/cudf/solvers`. E.g.: @@ -33,10 +35,11 @@ Allowed properties are: corresponding CUDF solver - **exec:** (mandatory) command line that should be used to invoke the CUDF - solver meant to be interpreted, after interpolation, by `/bin/sh`. The - command line must contain 3 wildcards, each one occurring only once: $in, - $out, $pref. All wildcards will be replaced before invoking the CUDF - solver as follows: + solver meant to be interpreted, after interpolation, by `/bin/sh` (warning: + that also means that no special treatment of shell meta characters is done, + you've been warned). The command line must contain 3 wildcards, each one + occurring only once: $in, $out, $pref. All wildcards will be replaced + before invoking the CUDF solver as follows: - **$in:** file name of the input CUDF document for the solver. The file must be read sequentially by the solver only once and cannot be lseek()-ed; @@ -52,7 +55,8 @@ Allowed properties are: - **cudf-version:** (mandatory) version of the CUDF standard supported by the CUDF solver -A sample CUDF solver specification is given below: +A sample CUDF solver specification, describing the solver 'ssolve', +is given below: $ cat /usr/share/cudf/solvers/ssolve description: super solver that will blow your mind diff --git a/doc/manpages/apt-cudf.pod b/doc/manpages/apt-cudf.pod new file mode 100644 index 000..8dfc2af --- /dev/null +++ b/doc/manpages/apt-cudf.pod @@ -0,0 +1,38 @@ +=head1 NAME + +apt-cudf - CUDF solver integration for APT + +=head1 SYNOPSIS + +=over + +=item Bsolvername + +=back + +=head1 DESCRIPTION + +apt-cudf translates back and forth among a CUDF-based dependency solver and the +protocol used by APT to talk with external dependency solvers. apt-cudf +therefore allows to use any CUDF solver as an external solver for APT. + +apt-cudf relies on its Cargv[0] name to find the CUDF solver to invoke. In +common setups, you should have a CUDF solver specification file under +F/usr/share/cudf/solvers/ for each installed CUDF solver. To use one such +solver with APT, you should create a symbolic link pointing to +F/usr/bin/apt-cudf under F/usr/lib/apt/solvers/ and call it with the name +of the CUDF solver you want to use. + +=head1 SEE ALSO + +apt-get(8), update
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.4-2-8-g8d93afe
The following commit has been merged in the master branch:
commit ba6c568dbf738d2c26932d6ab6e80658d91ab67b
Author: Stefano Zacchiroli z...@upsilon.cc
Date: Fri Jun 10 15:46:56 2011 +0200
new upstream release (SVN snapshot)
diff --git a/debian/changelog b/debian/changelog
index b5cbd0b..2997096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dose3 (2.9.7+r2696-1) UNRELEASED; urgency=low
+
+ [ Stefano Zacchiroli ]
+ * Imported Upstream version 2.9.7+r2696
+- upstream SVN snapshot, release 2696
+- contains apt-cudf
+
+ -- Stefano Zacchiroli z...@debian.org Fri, 10 Jun 2011 15:45:43 +0200
+
dose3 (2.9.4-2) experimental; urgency=low
* Attempt to install algo.{a,o} only when they exist. This should fix
--
dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-8-g8d93afe
The following commit has been merged in the master branch:
commit 4cd1ab847e13c932e0b2db1ea7142a13fa7b24c9
Author: Stefano Zacchiroli z...@upsilon.cc
Date: Fri Jun 10 17:39:46 2011 +0200
apt-cudf packaging
still missing: trigger that monitors /usr/share/cudf/solvers/
diff --git a/debian/apt-cudf.README.Debian b/debian/apt-cudf.README.Debian
new file mode 100644
index 000..85046bf
--- /dev/null
+++ b/debian/apt-cudf.README.Debian
@@ -0,0 +1,67 @@
+Packaging CUDF solvers in Debian
+
+
+Each CUDF solver should ship a CUDF solver specification file under
+`/usr/share/cudf/solvers/`, describing how to invoke the solver and its
+compatibility level with the CUDF standard.
+
+A precise description of the (very simple) CUDF solver specification format can
+be found in the `README.cudf-solvers` file in the apt-cudf package.
+
+
+Integration with APT
+
+
+APT can talk to external solvers by the means of the External Dependency Solver
+Protocol (EDSP). To reduce the burden on APT implementors and dependencies over
+specific features of the CUDF standard, the EDSP protocol is closer to typical
+APT syntaxes than to CUDF. Therefore, some plumbing is needed to use native
+CUDF solvers as external (EDSP-based) solvers for APT. The apt-cudf package
+provides such plumbing.
+
+The architecture is as follows:
+
+EDSP CUDF
+APT apt-cudf CUDF solver
+
+APT invokes apt-cudf as its external solver, which in turns invoke a proper
+CUDF solver. In such pipeline, apt-cudf plays man in the middle and performs
+the needed translations.
+
+The default directories where APT and apt-cudf look for solvers are as follows:
+
+- APT looks for (EDSP) solver *executables* into
`/usr/lib/apt/solvers/`
+- apt-cudf looks for (CUDF) solver *specifications* into
`/usr/share/cudf/solvers/`
+
+CUDF solvers can reside anywhere they please, as long as there is a CUDF solver
+specification pointing to them under `/usr/share/cudf/solvers/` (see Section
+above).
+
+For each CUDF solver that should be used as an external APT solver a (symbolic)
+link pointing to `/usr/bin/apt-cudf` must exist under `/usr/lib/apt/solvers/`.
+Upon invocation, apt-cudf will use the link name to lookup the corresponding
+CUDF solver specification.
+
+
+Trigger
+---
+
+The apt-cudf package comes with a trigger that monitors the
+`/usr/share/cudf/solvers/` directory for the installation of CUDF solver
+specifications. Upon activation, the trigger creates a symbolic link under
+`/usr/lib/apt/solvers`. Therefore:
+
+- If you are packaging a CUDF solver and would like it to be used as an
+ external solver for APT, you don't have to do anything special (besides
+ installing a proper CUDF solver specification for it under
+ `/usr/share/cudf/solvers/`).
+
+ Please note however that it will be usable as an external solver for APT only
+ upon installation of the apt-cudf package. If your CUDF solver is
+ specifically meant for apt, consider a Depends or a Recommends on apt-cudf.
+
+- If you want to use a CUDF solver as an external solver for APT, you just have
+ to install the apt-cudf package.
+
+
+ -- Stefano Zacchiroli z...@debian.org, Fri, 10 Jun 2011 17:30:30 +0200
diff --git a/debian/apt-cudf.docs b/debian/apt-cudf.docs
new file mode 100644
index 000..3749b52
--- /dev/null
+++ b/debian/apt-cudf.docs
@@ -0,0 +1 @@
+doc/apt-cudf/*
diff --git a/debian/apt-cudf.install b/debian/apt-cudf.install
new file mode 100644
index 000..0d62735
--- /dev/null
+++ b/debian/apt-cudf.install
@@ -0,0 +1 @@
+usr/bin/apt-cudf
diff --git a/debian/changelog b/debian/changelog
index 2997096..7025957 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-dose3 (2.9.7+r2696-1) UNRELEASED; urgency=low
+dose3 (2.9.4+r2696-1) UNRELEASED; urgency=low
[ Stefano Zacchiroli ]
- * Imported Upstream version 2.9.7+r2696
+ * Imported Upstream version 2.9.4+r2696
- upstream SVN snapshot, release 2696
- contains apt-cudf
diff --git a/debian/control b/debian/control
index e75065f..22f7101 100644
--- a/debian/control
+++ b/debian/control
@@ -106,3 +106,25 @@ Description: Parses package dependencies as set of
constraints
* dot/Graphviz
* CNF (formula in conjunctive normal form)
* DIMACS format of propositional formula
+
+Package: apt-cudf
+Section: admin
+Architecture: any
+Depends: cudf-solver,
+ ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Description: CUDF solver integration for APT
+ apt-cudf provides integration among the APT package manager and CUDF solvers,
+ allowing APT to rely on external (CUDF-based) dependency solvers to plan
+ package installation, upgrade, and removal.
+ .
+ CUDF is a distribution-independent, standard format to describe dependency
+ solving scenarios, as faced by package managers in popular package-based
+ GNU/Linux distributions. APT is a well-known package manager
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.4-2-8-g8d93afe
The following commit has been merged in the master branch: commit b172c9a7d3cb3689c4fd64d57c8cd43d96aa4ddd Merge: 4cd1ab847e13c932e0b2db1ea7142a13fa7b24c9 441a8564ec993b77c9b4d99a27d1240231e7cf38 Author: Stefano Zacchiroli z...@upsilon.cc Date: Fri Jun 10 17:40:11 2011 +0200 Merge commit 'upstream/2.9.4+r2696' -- dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-8-g8d93afe
The following commit has been merged in the master branch:
commit 8d93afe960920015bbcd51349682cb508ea19fc5
Author: Stefano Zacchiroli z...@upsilon.cc
Date: Fri Jun 10 22:30:24 2011 +0200
new binary package: apt-cudf
- provide glue among CUDF solvers and EDSP (i.e. APT's native)
external solvers
- new helper update-cudf-solvers, to be invoked at each new
installation of CUDF solvers, to bind them to APT
diff --git a/debian/apt-cudf.install b/debian/apt-cudf.install
index 0d62735..5e81ca4 100644
--- a/debian/apt-cudf.install
+++ b/debian/apt-cudf.install
@@ -1 +1,2 @@
usr/bin/apt-cudf
+debian/update-cudf-solvers usr/sbin
diff --git a/debian/changelog b/debian/changelog
index 7025957..a654c7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ dose3 (2.9.4+r2696-1) UNRELEASED; urgency=low
* Imported Upstream version 2.9.4+r2696
- upstream SVN snapshot, release 2696
- contains apt-cudf
+ * new binary package: apt-cudf
+- provides glue among CUDF solvers and EDSP (i.e. APT's native)
+ external solvers
+- new helper update-cudf-solvers, to be invoked at each new
+ installation of CUDF solvers, to bind them to APT
-- Stefano Zacchiroli z...@debian.org Fri, 10 Jun 2011 15:45:43 +0200
diff --git a/debian/update-cudf-solvers b/debian/update-cudf-solvers
new file mode 100755
index 000..4f88067
--- /dev/null
+++ b/debian/update-cudf-solvers
@@ -0,0 +1,62 @@
+#!/usr/bin/perl -w
+#
+# update-cudf-solvers: register available CUDF solvers and bind them to APT
+#
+# Copyright (C) Stefano Zacchiroli 2011 z...@debian.org
+# License: GNU Lesser General Public License, version 3 or above
+
+use strict;
+use File::Basename;
+
+my $cudf_dir = /usr/share/cudf/solvers;
+my $edsp_dir = /usr/lib/apt/solvers;
+my $apt_cudf = /usr/bin/apt-cudf;
+
+my $debug = 0;
+
+sub shallow_find($$) {
+my ($dir, $pred) = @_;
+my @found = ();
+foreach my $f (`find $dir -maxdepth 1 $pred`) {
+ chomp $f;
+ push @found, basename $f;
+}
+return @found;
+}
+
+sub warning($) { my ($msg) = @_; print STDERR update-cudf-solvers: W:
$msg\n; }
+sub debug($) { my ($msg) = @_; print STDERR update-cudf-solvers: I: $msg\n
if $debug; }
+
+my @cudf_solvers = shallow_find($cudf_dir, -type f); # current CUDF solvers
+my @edsp_solvers = shallow_find($edsp_dir, -type l); # current EDSP solvers
+
+foreach my $s (@cudf_solvers) { debug found cudf solver: $s; }
+foreach my $s (@edsp_solvers) { debug found edsp solver: $s; }
+
+# install: act on new CUDF solvers; make them available as EDSP solvers
+foreach my $cudf_name (@cudf_solvers) {
+my $edsp_solver = $edsp_dir/$cudf_name;
+unless (-l $edsp_solver readlink($edsp_solver) eq $apt_cudf) {
+ if (-e $edsp_solver || -l $edsp_solver) {
+ # either existing non CUDF solver or dangling symlink
+ warning refuse to overwrite $edsp_solver with a symlink to
$apt_cudf, skipping;
+ } else {# file exists, but doesn't point to apt-cudf
+ debug symlink $edsp_solver to $apt_cudf;
+ symlink $apt_cudf, $edsp_solver
+ or warning cannot symlink $edsp_solver to $apt_cudf, skipping;
+ }
+}
+}
+
+# garbage collection: act on old EDSP solvers; get rid of them
+foreach my $edsp_name (@edsp_solvers) {
+my $edsp_solver = $edsp_dir/$edsp_name;
+if (-l $edsp_solver readlink($edsp_solver) eq $apt_cudf) {
+ if (! grep {$_ eq $edsp_name} @cudf_solvers) {
+ # EDSP CUDF solver, no longer existing
+ debug unlink (gone) $edsp_solver;
+ unlink $edsp_solver
+ or warning cannot unlink $edsp_solver, skipping;
+ }
+}
+}
--
dose3 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] dose3 packaging branch, master, updated. debian/2.9.4-2-8-g8d93afe
The following commit has been merged in the master branch: commit a79c20dc4a65780d967f44739508bc51b3a84b6a Merge: 57a5cc4aa9e6eceffa29612a5ea744858e4371df 7a6cc47998cf18b055e8d84f5ca88848034e954d Author: Stefano Zacchiroli z...@upsilon.cc Date: Fri Jun 10 15:45:19 2011 +0200 Merge commit 'upstream/2.9.7+r2696' diff --combined applications/distcheck.ml index da856da,a5915f0..8ed9038 --- a/applications/distcheck.ml +++ b/applications/distcheck.ml @@@ -13,6 -13,7 +13,7 @@@ open ExtLib open Debian open Common + open Algo open Diagnostic module Options = struct @@@ -61,10 -62,10 +62,10 @@@ let main () let posargs = let args = OptParse.OptParser.parse_argv Options.options in match Filename.basename(Sys.argv.(0)),args with -|(debcheck|edos-debcheck),[] - [deb://-] -|(debcheck|edos-debcheck),l - List.map ((^) deb://) l +|(debcheck|dose3-debcheck),[] - [deb://-] +|(debcheck|dose3-debcheck),l - List.map ((^) deb://) l |eclipsecheck,l - List.map ((^) eclipse://) l -|(rpmcheck|edos-rpmcheck),l - List.map ((^) synth://) l +|(rpmcheck|dose3-rpmcheck),l - List.map ((^) synth://) l |_,_ - args in Boilerplate.enable_debug (OptParse.Opt.get Options.verbose); -- dose3 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] dose3 packaging branch, pristine-tar, updated. ecf9200eb855028f6462fe43964a933509a6e828
The following commit has been merged in the pristine-tar branch: commit ecf9200eb855028f6462fe43964a933509a6e828 Author: Stefano Zacchiroli z...@upsilon.cc Date: Fri Jun 10 17:40:11 2011 +0200 pristine-tar data for dose3_2.9.4+r2696.orig.tar.gz diff --git a/dose3_2.9.4+r2696.orig.tar.gz.delta b/dose3_2.9.4+r2696.orig.tar.gz.delta new file mode 100644 index 000..947eca3 Binary files /dev/null and b/dose3_2.9.4+r2696.orig.tar.gz.delta differ diff --git a/dose3_2.9.4+r2696.orig.tar.gz.id b/dose3_2.9.4+r2696.orig.tar.gz.id new file mode 100644 index 000..07fed19 --- /dev/null +++ b/dose3_2.9.4+r2696.orig.tar.gz.id @@ -0,0 +1 @@ +441a8564ec993b77c9b4d99a27d1240231e7cf38 -- dose3 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] cudf packaging annotated tag, debian/0.6-1, created. debian/0.6-1
The annotated tag, debian/0.6-1 has been created at 8a239d2a09ccdc8e8e1edf2f8912885b697896ed (tag) tagging 75877349911b694648a69f4d38a2197b31a1ac1b (commit) replaces debian/0.5.99-2 tagged by Stefano Zacchiroli on Thu Jun 2 12:47:07 2011 +0200 - Shortlog Debian release 0.6-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iD8DBQBN52or1cqbBPLEI7wRAmhXAJ47tQw4FV0P3jio7IGW1aqtFaRzhwCfYsD8 PfG32Je4h772Mwqy8DRj9AM= =jX8a -END PGP SIGNATURE- Stefano Zacchiroli (3): Imported Upstream version 0.6 Merge commit 'upstream/0.6' new upstream release, drop integrated patches --- -- cudf 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] cudf packaging annotated tag, upstream/0.6, created. upstream/0.6
The annotated tag, upstream/0.6 has been created at 8be60eb0407e2c793d2b1aef23795a4a897fc717 (tag) tagging 0678567424e16d2eb58d75c8c5b4886f48f33a7b (commit) replaces upstream/0.5.99 tagged by Stefano Zacchiroli on Wed Jun 1 09:54:39 2011 +0200 - Shortlog Upstream version 0.6 Stefano Zacchiroli (1): Imported Upstream version 0.6 --- -- cudf 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] cudf packaging branch, master, updated. debian/0.5.99-2-3-g7587734
The following commit has been merged in the master branch: commit d19469419c69188e9c364db76cdd184ac4534846 Merge: 60810b0e238b413c12fc5d1c52cc7845c8fe081e 0678567424e16d2eb58d75c8c5b4886f48f33a7b Author: Stefano Zacchiroli z...@upsilon.cc Date: Wed Jun 1 09:54:39 2011 +0200 Merge commit 'upstream/0.6' -- cudf 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] cudf packaging branch, master, updated. debian/0.5.99-2-3-g7587734
The following commit has been merged in the master branch: commit 75877349911b694648a69f4d38a2197b31a1ac1b Author: Stefano Zacchiroli z...@upsilon.cc Date: Wed Jun 1 09:58:47 2011 +0200 new upstream release, drop integrated patches diff --git a/debian/changelog b/debian/changelog index 44618d5..9b2cfa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +cudf (0.6-1) unstable; urgency=low + + * New upstream release; highlights: +- speed improvements in the pretty printing engine and in cudf-check +- fixes in the pretty printing engine + * debian/patches/ +- drop link-caml_hash_variant-with-ldl.patch (integrated upstream) + + -- Stefano Zacchiroli z...@debian.org Wed, 01 Jun 2011 09:55:06 +0200 + cudf (0.5.99-2) unstable; urgency=low [ Ralf Treinen ] diff --git a/debian/patches/link-caml_hash_variant-with-ldl.patch b/debian/patches/link-caml_hash_variant-with-ldl.patch deleted file mode 100644 index 1f36176..000 --- a/debian/patches/link-caml_hash_variant-with-ldl.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: link caml_hash_variant with -ldl - without that, one can run into the following issues, on non-Linux systems: - cc -Wall -DG_LOG_DOMAIN=\libCUDF\ -o caml_hash_variant caml_hash_variant.o dummy.o -L/usr/lib/ocaml -lcamlrun -lm -lcurses - /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlerror': - (.text+0x16c): undefined reference to `dlerror' - /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlsym': - (.text+0x17a): undefined reference to `dlsym' - /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlclose': - (.text+0x19e): undefined reference to `dlclose' - /usr/lib/ocaml/libcamlrun.a(unix.o): In function `caml_dlopen': - (.text+0x1bb): undefined reference to `dlopen' - collect2: ld returned 1 exit status -Author: Cyril Brulebois k...@debian.org -Last-Update: 2010-11-05 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=602489 - c-lib/Makefile.variants |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/c-lib/Makefile.variants b/c-lib/Makefile.variants -index 19af0ea..fdf2655 100644 a/c-lib/Makefile.variants -+++ b/c-lib/Makefile.variants -@@ -65,7 +65,7 @@ cudf-variants.h: caml_hash_variant Makefile.variants - caml_hash_variant: caml_hash_variant.o -dummy.ml - ocamlc -o dummy.o -output-obj dummy.ml -- $(CC) $(CFLAGS) -o $@ $ dummy.o -L$(OCAML_LIBDIR) -lcamlrun -lm -lcurses -+ $(CC) $(CFLAGS) -o $@ $ dummy.o -L$(OCAML_LIBDIR) -lcamlrun -lm -lcurses -ldl - @rm -f dummy.* - - clean: clean-variants --- diff --git a/debian/patches/series b/debian/patches/series index 8e6c57d..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -link-caml_hash_variant-with-ldl.patch -- cudf 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
