[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.8-1-10-g4c4ba74

2012-02-06 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit a1457b139cb83a23bde3e66112751c7b6305943e
Author: Ralf Treinen trei...@free.fr
Date:   Mon Feb 6 20:05:10 2012 +0100

bump build-dependency on cudf to 0.6.2

diff --git a/debian/control b/debian/control
index 22f7101..c1df992 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.6),
+ libcudf-ocaml-dev (= 0.6.2),
  libzip-ocaml-dev, libbz2-ocaml-dev, librpm-dev (= 4.8)
 Standards-Version: 3.9.2
 Homepage: http://www.mancoosi.org/software/

-- 
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.8-1-10-g4c4ba74

2012-02-06 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit c79b83d65193b82f60a5f0cfdb053a520467df72
Author: Ralf Treinen trei...@free.fr
Date:   Mon Feb 6 20:18:48 2012 +0100

do not install /usr/lib/ocaml/stublibs whioch seems to have gone

diff --git a/debian/libdose3-ocaml.install b/debian/libdose3-ocaml.install
index 76ac9d5..0d7a525 100644
--- a/debian/libdose3-ocaml.install
+++ b/debian/libdose3-ocaml.install
@@ -1 +1 @@
-usr/lib/ocaml/stublibs/* usr/lib/ocaml/stublibs
\ No newline at end of file
+# usr/lib/ocaml/stublibs/* usr/lib/ocaml/stublibs
\ No newline at end of file

-- 
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.8-1-10-g4c4ba74

2012-02-06 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit 6ba87e9dec8f53eb22f6ceb9f52a63aa7347e041
Author: Ralf Treinen trei...@free.fr
Date:   Mon Feb 6 20:07:13 2012 +0100

fix binary prefix from edos- to dose3-

diff --git a/debian/patches/binaries-prefix-edos 
b/debian/patches/binaries-prefix-edos
index e335c70..a4ed7c4 100644
--- a/debian/patches/binaries-prefix-edos
+++ b/debian/patches/binaries-prefix-edos
@@ -3,8 +3,8 @@ Description: all binaries have prefix dose3-
 
 Index: dose3/doc/manpages/distcheck.pod
 ===
 dose3.orig/doc/manpages/distcheck.pod  2012-02-06 15:27:40.0 
+0100
-+++ dose3/doc/manpages/distcheck.pod   2012-02-06 16:39:59.0 +0100
+--- dose3.orig/doc/manpages/distcheck.pod  2012-02-06 20:01:28.0 
+0100
 dose3/doc/manpages/distcheck.pod   2012-02-06 20:05:39.0 +0100
 @@ -1,19 +1,19 @@
  =head1 NAME
  
@@ -88,3 +88,21 @@ Index: dose3/doc/manpages/distcheck.pod
  project. The current version has been rewritten on the basis of the dose3
  library by Pietro Abate.
  
+Index: dose3/applications/distcheck.ml
+===
+--- dose3.orig/applications/distcheck.ml   2012-02-06 20:01:28.0 
+0100
 dose3/applications/distcheck.ml2012-02-06 20:06:09.0 +0100
+@@ -72,10 +72,10 @@
+   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, master, updated. debian/2.9.8-1-10-g4c4ba74

2012-02-06 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit 4c4ba7449e0c799c2fc9a7f5f87b2d7951799239
Author: Ralf Treinen trei...@free.fr
Date:   Mon Feb 6 20:32:12 2012 +0100

fix dependencies of libdose3-ocaml-dev, add real dependency for apt-cudf

diff --git a/debian/changelog b/debian/changelog
index 24f0a43..b96fb55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-dose3 (2.9.10-1) UNRELEASEDy; urgency=low
+dose3 (2.9.10-1) UNRELEASED; urgency=low
 
   * New upstream release
-
- -- Ralf Treinen trei...@debian.org  Mon, 06 Feb 2012 15:13:14 +0100
+  * Do not attempt to install /usr/lib/ocaml/dose3/stublibs which is no
+longer generated by upstream.
+  * debian/control:
+- The apt-cudf package now depends first on aspcud before the virtual
+  package cudf-solver
+- add ${shlibs:Depends} to dependencies of libdose3-ocaml-dev
+  
+ -- Ralf Treinen trei...@debian.org  Mon, 06 Feb 2012 20:31:20 +0100
 
 dose3 (2.9.8-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index c1df992..25b2e2d 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Vcs-Git: 
git://git.debian.org/git/pkg-ocaml-maint/packages/dose3.git
 
 Package: libdose3-ocaml-dev
 Architecture: any
-Depends: ${misc:Depends}, ${ocaml:Depends}
+Depends: ${misc:Depends}, ${ocaml:Depends}, ${shlibs:Depends}
 Provides: ${ocaml:Provides}
 Description: OCaml libraries for package dependencies (development files)
  Dose3 is a framework consisting of several OCaml libraries for analysing
@@ -110,7 +110,7 @@ Description: Parses package dependencies as set of 
constraints
 Package: apt-cudf
 Section: admin
 Architecture: any
-Depends: cudf-solver,
+Depends: aspcud | 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,

-- 
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