[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 the
[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
[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),
[Pkg-ocaml-maint-commits] [SCM] obus packaging branch, master, updated. debian/1.0.rc1-2-11-g3efb0ca
The following commit has been merged in the master branch: commit 3efb0ca2a9f9a4bf1ab5745b6f4b380a35af7ab5 Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Sat Jun 11 23:38:48 2011 +0200 Add a patch disabling the communication test (which hangs if no session bus is present) diff --git a/debian/patches/0002-Disable-tests-needing-a-session-bus.patch b/debian/patches/0002-Disable-tests-needing-a-session-bus.patch new file mode 100644 index 000..87c20d5 --- /dev/null +++ b/debian/patches/0002-Disable-tests-needing-a-session-bus.patch @@ -0,0 +1,22 @@ +From: Nicolas Dandrimont nicolas.dandrim...@crans.org +Date: Sat, 11 Jun 2011 23:38:24 +0200 +Subject: Disable tests needing a session bus + +--- + tests/main.ml |2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tests/main.ml b/tests/main.ml +index 8f34e8c..f7ff34b 100644 +--- a/tests/main.ml b/tests/main.ml +@@ -61,7 +61,7 @@ lwt () = + serialization, Test_serialization.test; + string validation, Test_validation.test; + authentication, Test_auth.test; +-communication, Test_communication.test; ++(*communication, Test_communication.test;*) + garbage collection, Test_gc.test; + ] + +-- diff --git a/debian/patches/series b/debian/patches/series index 8b7cdf1..dbeda74 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Fix-for-type-conv-2.3.0.patch +0002-Disable-tests-needing-a-session-bus.patch -- obus 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] obus packaging branch, master, updated. debian/1.0.rc1-2-11-g3efb0ca
The following commit has been merged in the master branch:
commit 42aea8083ac1590051008ae5f1f7182a5779a8f0
Author: Nicolas Dandrimont nicolas.dandrim...@crans.org
Date: Sat Jun 11 23:33:48 2011 +0200
Update for type-conv 2.3.0
diff --git a/debian/changelog b/debian/changelog
index 5c42b29..b292207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
obus (1.1.2-1) unstable; urgency=low
* New upstream release
-- Drop patches (fixed upstream)
+- Drop patches fixed upstream
+- Add patch for compatibility with type-conv = 2.3.0
* Bump required OCaml version to 3.12.0, lwt to 2.2.0
* Bump Standards-Version to 3.9.2 (no changes)
* Upload to unstable
- -- Nicolas Dandrimont nicolas.dandrim...@crans.org Sun, 24 Apr 2011
20:06:02 +0200
+ -- Nicolas Dandrimont nicolas.dandrim...@crans.org Sat, 11 Jun 2011
23:33:06 +0200
obus (1.0~rc1-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 89b88c8..29f1e5f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Stéphane Glondu glo...@debian.org, Nicolas
Dandrimont nicolas.dan
Build-Depends:
debhelper (= 7.0.50~),
dh-ocaml (= 0.9),
- libtype-conv-camlp4-dev,
+ libtype-conv-camlp4-dev (= 2.3.0~),
libxmlm-ocaml-dev,
liblwt-ocaml-dev (= 2.2.0~),
ocaml-nox (= 3.12.0~)
diff --git a/debian/patches/0001-Fix-for-type-conv-2.3.0.patch
b/debian/patches/0001-Fix-for-type-conv-2.3.0.patch
new file mode 100644
index 000..fe7c455
--- /dev/null
+++ b/debian/patches/0001-Fix-for-type-conv-2.3.0.patch
@@ -0,0 +1,366 @@
+From: Nicolas Dandrimont nicolas.dandrim...@crans.org
+Date: Sat, 11 Jun 2011 23:31:23 +0200
+Subject: Fix for type-conv = 2.3.0~
+
+The type-conv.syntax module was renamed type-conv
+---
+ _oasis |8
+ _tags| 62 +++---
+ setup.ml |6 +++---
+ src/META |2 +-
+ 4 files changed, 39 insertions(+), 39 deletions(-)
+
+diff --git a/_oasis b/_oasis
+index 2cbf922..a56cd99 100644
+--- a/_oasis
b/_oasis
+@@ -61,7 +61,7 @@ Library obus
+ OBus_util,
+ OBus_xml_parser,
+ OBus_config
+- BuildDepends: lwt.unix, lwt.react, lwt.syntax, lwt.syntax.log,
type-conv.syntax, xmlm
++ BuildDepends: lwt.unix, lwt.react, lwt.syntax, lwt.syntax.log, type-conv,
xmlm
+ BuildTools: obus-gen-interface
+ XMETARequires: lwt.unix, lwt.react, xmlm
+ XMETADescription: Pure OCaml implementation of D-Bus
+@@ -86,10 +86,10 @@ Library obus-syntax
+ InternalModules: Pa_obus
+ FindlibName: syntax
+ FindlibParent: obus
+- BuildDepends: type-conv.syntax, camlp4.lib, camlp4.quotations.o
++ BuildDepends: type-conv, camlp4.lib, camlp4.quotations.o
+ CompiledObject: byte
+ XMETAType: syntax
+- XMETARequires: camlp4, type-conv.syntax
++ XMETARequires: camlp4, type-conv
+ XMETADescription: Syntactic sugars for defining D-Bus errors
+
+ # +---+
+@@ -185,7 +185,7 @@ Executable obus-gen-interface
+ Install: true
+ CompiledObject: best
+ MainIs: obus_gen_interface.ml
+- BuildDepends: lwt.unix, lwt.react, lwt.syntax, lwt.syntax.log,
type-conv.syntax, xmlm, camlp4.quotations.o, camlp4.extend, camlp4.lib
++ BuildDepends: lwt.unix, lwt.react, lwt.syntax, lwt.syntax.log, type-conv,
xmlm, camlp4.quotations.o, camlp4.extend, camlp4.lib
+
+ Executable obus-dump
+ Path: tools
+diff --git a/_tags b/_tags
+index 8e40807..3880c41 100644
+--- a/_tags
b/_tags
+@@ -5,10 +5,10 @@
+ syntax/*.ml: -pa_obus
+
+ # OASIS_START
+-# DO NOT EDIT (digest: f199336746b3cb0dc2249cddbc36e0d8)
++# DO NOT EDIT (digest: 210739cec55f01e17bfec3c9bc0592d3)
+ # Executable obus-gen-interface
+ tools/obus_gen_interface.{native,byte}: pkg_xmlm
+-tools/obus_gen_interface.{native,byte}: pkg_type-conv.syntax
++tools/obus_gen_interface.{native,byte}: pkg_type-conv
+ tools/obus_gen_interface.{native,byte}: pkg_lwt.unix
+ tools/obus_gen_interface.{native,byte}: pkg_lwt.syntax.log
+ tools/obus_gen_interface.{native,byte}: pkg_lwt.syntax
+@@ -23,7 +23,7 @@
+ bindings/upower/obus-upower.cmxs: use_obus-upower
+ bindings/upower/*.ml{,i}: use_obus
+ bindings/upower/*.ml{,i}: pkg_xmlm
+-bindings/upower/*.ml{,i}: pkg_type-conv.syntax
++bindings/upower/*.ml{,i}: pkg_type-conv
+ bindings/upower/*.ml{,i}: pkg_lwt.unix
+ bindings/upower/*.ml{,i}: pkg_lwt.syntax.log
+ bindings/upower/*.ml{,i}: pkg_lwt.syntax
+@@ -33,7 +33,7 @@
+ src/obus-idl.cmxs: use_obus-idl
+ src/*.ml{,i}: use_obus
+ src/*.ml{,i}: pkg_xmlm
+-src/*.ml{,i}: pkg_type-conv.syntax
++src/*.ml{,i}: pkg_type-conv
+ src/*.ml{,i}: pkg_lwt.unix
+ src/*.ml{,i}: pkg_lwt.syntax.log
+ src/*.ml{,i}: pkg_lwt.syntax
+@@ -45,7 +45,7 @@
+ bindings/network-manager/obus-network-manager.cmxs: use_obus-network-manager
+ bindings/network-manager/*.ml{,i}: use_obus
+ bindings/network-manager/*.ml{,i}: pkg_xmlm
+-bindings/network-manager/*.ml{,i}: pkg_type-conv.syntax
++bindings/network-manager/*.ml{,i}:
[Pkg-ocaml-maint-commits] [SCM] obus packaging branch, master, updated. debian/1.0.rc1-2-12-gf8b5e46
The following commit has been merged in the master branch: commit f8b5e46edfd9a5cf1589382f1d634cadccaf33ba Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Sun Jun 12 00:00:06 2011 +0200 Add build-dependency on ocaml-findlib diff --git a/debian/control b/debian/control index 29f1e5f..630eb8c 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: libtype-conv-camlp4-dev (= 2.3.0~), libxmlm-ocaml-dev, liblwt-ocaml-dev (= 2.2.0~), + ocaml-findlib, ocaml-nox (= 3.12.0~) Standards-Version: 3.9.2 Section: ocaml -- obus 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
