[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.3-1-8-gf4d7102

Thu Jun 2 09:49:36 UTC 2011

The following commit has been merged in the master branch:
commit 6804a317bab0ebaa6f372976e7a268e2a141be35
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Jun 2 11:23:34 2011 +0200

    new upstream 2.9.4. Add new binary package for the stublibs.

diff --git a/applications/distcheck.ml b/applications/distcheck.ml
index 9a1ac2e..da856da 100644
--- a/applications/distcheck.ml
+++ b/applications/distcheck.ml
@@ -61,10 +61,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);
diff --git a/debian/changelog b/debian/changelog
index 55ffe40..6155abd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+dose3 (2.9.4-1) experimental; urgency=low
+
+  * New upstream release. This release solves an issue with spuriously
+    exported modules that blocked resolution of #627274.
+  * Install all of usr/lib/ocaml/dose3 in the -dev package (closes: #627274) 
+  * Bump version on build-dependency libcudf-ocaml-dev.
+  * Add a binary package libdose3-ocaml for the runtime stub libraries.
+  * debian/rules: install _build/algo/algo.{a,o}. 
+
+ -- Ralf Treinen <treinen at debian.org>  Thu, 02 Jun 2011 11:06:34 +0200
+
 dose3 (2.9.3-2) experimental; urgency=low
 
   * use debian/libdose3-ocaml-dev.install (instead of ..install.in)
diff --git a/debian/control b/debian/control
index d1486f3..e75065f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~),
  libpcre-ocaml-dev,
  libextlib-ocaml-dev,
  libocamlgraph-ocaml-dev,
- libcudf-ocaml-dev (>= 0.5.99),
+ libcudf-ocaml-dev (>= 0.6),
  libzip-ocaml-dev, libbz2-ocaml-dev, librpm-dev (>= 4.8)
 Standards-Version: 3.9.2
 Homepage: http://www.mancoosi.org/software/
@@ -36,6 +36,25 @@ Description: OCaml libraries for package dependencies (development files)
  This package contains the development stuff you need to use dose3 for
  the development of programs.
 
+Package: libdose3-ocaml
+Architecture: any
+Depends: ${misc:Depends}, ${ocaml:Depends}, ${shlibs:Depends} 
+Provides: ${ocaml:Provides}
+Description: OCaml libraries for package dependencies (runtime files)
+ Dose3 is a framework consisting of several OCaml libraries for analysing
+ the metadata of software packages (like Packages files of debian suites).
+ .
+ Though not tied to any particular distribution, Dose3 constitutes a
+ pool of libraries which enable analyzing packages coming from various
+ distributions. 
+ .
+ Besides basic functionalities for querying and setting package
+ properties, dose3 also implements algorithms for solving more complex
+ problems (monitoring package evolutions, correct and complete
+ dependency resolution, repository-wide uninstallability checks).
+ .
+ This package contains only the shared runtime stub libraries.
+
 Package: dose3-distcheck
 Section: devel
 Architecture: any
diff --git a/debian/libdose3-ocaml-dev.install b/debian/libdose3-ocaml-dev.install
index 3b78533..5f692e7 100644
--- a/debian/libdose3-ocaml-dev.install
+++ b/debian/libdose3-ocaml-dev.install
@@ -1,4 +1 @@
-usr/lib/ocaml/dose3/*.mli	usr/lib/ocaml/dose3
-usr/lib/ocaml/dose3/*.cmi	usr/lib/ocaml/dose3
-usr/lib/ocaml/dose3/*.o		usr/lib/ocaml/dose3
-usr/lib/ocaml/dose3/*.a		usr/lib/ocaml/dose3
+usr/lib/ocaml/dose3	usr/lib/ocaml
diff --git a/debian/libdose3-ocaml.install b/debian/libdose3-ocaml.install
new file mode 100644
index 0000000..76ac9d5
--- /dev/null
+++ b/debian/libdose3-ocaml.install
@@ -0,0 +1 @@
+usr/lib/ocaml/stublibs/* usr/lib/ocaml/stublibs
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index b68ca93..9749f5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 binaries-prefix-edos
-ignore-experimental
+# ignore-experimental
diff --git a/debian/rules b/debian/rules
index fb91ae6..e05c8b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,9 @@ override_dh_auto_install:
 	cd debian/tmp/usr/bin \
 		&& mv distcheck dose3-distcheck \
 		&& mv deb-buildcheck dose3-builddebcheck
+# this should be fixed upstream:
+	cp _build/algo/algo.o _build/algo/algo.a \
+		debian/tmp/usr/lib/ocaml/dose3
 
 override_dh_installman:
 	dh_installman
diff --git a/doc/manpages/distcheck.1.in b/doc/manpages/distcheck.1.in
index 8963548..524a96b 100644
--- a/doc/manpages/distcheck.1.in
+++ b/doc/manpages/distcheck.1.in
@@ -5,11 +5,11 @@ distcheck \- check installability of packages according to metadata
 .SH SYNOPSIS
 \fBdistcheck\fR [option] ... \fIuri\fR
 .br
-\fBdebcheck\fR [option] ... \fIfile\fR
+\fBdose3-debcheck\fR [option] ... \fIfile\fR
 .br
-\fBrpmcheck\fR [option] ... \fIfile\fR
+\fBdose3-rpmcheck\fR [option] ... \fIfile\fR
 .br
-\fBeclipsecheck\fR [option] ... \fIfile\fR
+\fBdose3-eclipsecheck\fR [option] ... \fIfile\fR
 
 .SH DESCRIPTION
 .B distcheck
@@ -44,7 +44,7 @@ given in the URI.
 When invoked as \fItype\fBcheck\fR, the type of the repository is
 assumed to be \fItype\fR, and the input is simply given in form of a
 pathname of a file containing the repository.
-.B debcheck
+.B dose3-debcheck
 accepts in addition 
 .B --
 as input specification, with the effect that input is taken from
@@ -57,7 +57,7 @@ The input file has to contain stanzas in the format of deb-control(5),
 separated by one blank line. For instance, the Packages files as found
 on a Debian mirror server, or in the directory
 \fI/var/lib/apt/lists/\fR of a Debian system, are suitable as input to
-\fBdebcheck\fR.
+\fBdose3-debcheck\fR.
 .P
 Installability of packages is analyzed according to their
 \fBDepends\fR, \fBConflicts\fR, and \fBProvides\fR fields with their
@@ -70,7 +70,7 @@ two packages with the same name but different versions.
 
 .SS RPM
 The input file can be either a \fIsynthesis\fR file or a \fIhdlist\fR
-file.  By default rpmcheck expects a synthesis file as input. To
+file.  By default dose3-rpmcheck expects a synthesis file as input. To
 specify a hdlist file distcheck must be invoked with a file argument
 of the form hdlist://
 
@@ -115,7 +115,7 @@ installable. Hence, the exit code 2 can occur only when the
 .SH EXAMPLE
 Check which packages in a particular distribution are not installable and why:
 
-  debcheck \-\-failures \-\-explain < Packages
+  dose3-debcheck \-\-failures \-\-explain < Packages
 
 where Packages is the file pertaining to that distribution, as for instance
 found in the directory \fB/var/lib/apt/lists\fR.

-- 
dose3 packaging

