[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] obus packaging annotated tag, upstream/1.1, created. upstream/1.1
The annotated tag, upstream/1.1 has been created at fe68da9ee03138b90f6cc625e84ebed180fe1754 (tag) tagging 5f535c940915842f1a7de4bd4ce91e58364688af (commit) replaces upstream/1.0.rc1 tagged by Stephane Glondu on Tue Dec 14 09:05:11 2010 +0100 - Shortlog Upstream version 1.1 Stephane Glondu (1): Imported Upstream version 1.1 --- -- 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 annotated tag, debian/1.1.2-1, created. debian/1.1.2-1
The annotated tag, debian/1.1.2-1 has been created at bd55fdce7a7c12e413eb942133d94595a010985b (tag) tagging f8b5e46edfd9a5cf1589382f1d634cadccaf33ba (commit) replaces debian/1.0.rc1-2 tagged by Stephane Glondu on Sun Jun 12 14:26:41 2011 +0200 - Shortlog Debian release 1.1.2-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJN9LCBAAoJEHhT2k1JiBrTGXIP/3pN/VB02rzEG4mIJIru16y1 I66CmJfBCKE4wgiP/RJ6IITcOpUYOsvqnCXh/UrxpX5M1FbZWck6VU9xcPDTUVCE buhLyNRGJZ51RIqEL3U+UKiJee7H9LyYhQOFLFtMRmafAiSVqsm+94yNPu2n5huh w8NkFNyjzd6H4RVhRjYkoKunWvjrFYDeHYEKTaKnYvYN8DcSBJM2KE4+jjXVRIXk aJgVIU4oJa6iuufLZnJ3rcA1spMd+S/0lgNQ99mLqYQxvQQT+In8149PgAN7U/eG BzBjx8rLeipNxaggTKN5E7ES2Dn4qNXdTHluPsT6e/FAGOaJ8GL4hMqhQxy5csRB +/0I9BOIFlFZJ889CnJiv/GrJ3rJ57mI8h1c0H/UAPcX53m6P2WeuANYKD6Q4bfP N/V6EyOWpyj6Ld51/jPkTyQ3in/u2eAzi3FZ/BSdkVSy3N1E5bY2wpskzab9q+uF Y4IKuO4WfY5VL6aiR9XD+VR2y4Lw3f4mSRH7YiM+Rq9HLc4BHmJDtouQ1SXIYFvj t9+jPtx8K6K85yxdvOo4zidcrOlXsOmO9xUHaagutYi99YywYGqZlIzhjAZhe7qe 4XbmiTJEGU98h2xvbH/2mFRduTISRA2+sMOOKwPViWJr4Q/lsdRjSUYT0gKvvZEK LU7Ib1D5urrSoz44fHdQ =R9A4 -END PGP SIGNATURE- Nicolas Dandrimont (12): Imported Upstream version 1.1.2 Merge commit 'upstream/1.1.2' Update build-deps for new upstream release Drop patches (fixed upstream) Sync debian/rules with new upstream release Update *.install files for new upstream release Use the right path for the documentation files Bump Standards-Version to 3.9.2 Prepare upload to unstable Update for type-conv 2.3.0 Add a patch disabling the communication test (which hangs if no session bus is present) Add build-dependency on ocaml-findlib --- -- 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 annotated tag, upstream/1.1, deleted. upstream/1.0.rc1-1-g5f535c9
The annotated tag, upstream/1.1 has been deleted was fe68da9ee03138b90f6cc625e84ebed180fe1754 --- tag upstream/1.1 Upstream version 1.1 5f535c940915842f1a7de4bd4ce91e58364688af Imported Upstream version 1.1 --- -- 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.1.2-1-2-gb429870
The following commit has been merged in the master branch: commit f440b7f78f574f5d3e40b1a53bf5d1e9ae7c996c Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Sun Jun 12 18:05:55 2011 +0200 Timeout instead of disabling tests diff --git a/debian/changelog b/debian/changelog index b292207..5f324d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +obus (1.1.2-2) unstable; urgency=low + + * Add a timeout instead of disabling tests + + -- Nicolas Dandrimont nicolas.dandrim...@crans.org Sun, 12 Jun 2011 18:04:01 +0200 + obus (1.1.2-1) unstable; urgency=low * New upstream release diff --git a/debian/patches/0002-Add-a-timeout-to-tests.patch b/debian/patches/0002-Add-a-timeout-to-tests.patch new file mode 100644 index 000..c2511fd --- /dev/null +++ b/debian/patches/0002-Add-a-timeout-to-tests.patch @@ -0,0 +1,22 @@ +From: Nicolas Dandrimont nicolas.dandrim...@crans.org +Date: Sat, 11 Jun 2011 23:38:24 +0200 +Subject: Add a timeout to tests + +--- + tests/main.ml |2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tests/main.ml b/tests/main.ml +index 8f34e8c..38d656d 100644 +--- a/tests/main.ml b/tests/main.ml +@@ -33,7 +33,7 @@ let rec run_tests failures total = function + lwt () = title name in + begin + try_lwt +- test () ++ Lwt_unix.with_timeout 30. test + with exn - + lwt () = Lwt_io.printlf test failed with: %s (Printexc.to_string exn) in + lwt () = Lwt_io.printl (Printexc.get_backtrace ()) in +-- diff --git a/debian/patches/0002-Disable-tests-needing-a-session-bus.patch b/debian/patches/0002-Disable-tests-needing-a-session-bus.patch deleted file mode 100644 index 87c20d5..000 --- a/debian/patches/0002-Disable-tests-needing-a-session-bus.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 dbeda74..7bc7644 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ 0001-Fix-for-type-conv-2.3.0.patch -0002-Disable-tests-needing-a-session-bus.patch +0002-Add-a-timeout-to-tests.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.1.2-1-2-gb429870
The following commit has been merged in the master branch: commit b4298707966bd5699466e45ee0843199a0cde804 Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Mon Jun 13 00:50:57 2011 +0200 Use a temporary $HOME for the tests (Closes: #630322) diff --git a/debian/changelog b/debian/changelog index 5f324d1..449ee1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ obus (1.1.2-2) unstable; urgency=low * Add a timeout instead of disabling tests + * Make the tests use a temporary directory as $HOME (Closes: #630322) - -- Nicolas Dandrimont nicolas.dandrim...@crans.org Sun, 12 Jun 2011 18:04:01 +0200 + -- Nicolas Dandrimont nicolas.dandrim...@crans.org Mon, 13 Jun 2011 00:49:35 +0200 obus (1.1.2-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 31a515c..7891b3e 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,9 @@ override_dh_auto_build: .PHONY: override_dh_auto_test override_dh_auto_test: - ocaml setup.ml -test + mkdir -p $(CURDIR)/debian/tmp_home + HOME=$(CURDIR)/debian/tmp_home ocaml setup.ml -test + rm -r $(CURDIR)/debian/tmp_home .PHONY: override_dh_auto_install override_dh_auto_install: -- 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
