[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.0-1-26-g3fb94df

2011-05-15 Thread Ralf Treinen 
The following commit has been merged in the master branch:
commit bd402cf23af3409e9eb587cd6c5b6b2c99e24916
Merge: c6d7693ccbfa57dcbf9496f1c510eb8ed6683297 
ead4b6f5097bd54ec9dd35c2ea84ecc907ad5009
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 15 18:32:45 2011 +0200

Merge commit 'upstream/2.9.3'


-- 
dose3 packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.0-1-26-g3fb94df

2011-05-15 Thread Ralf Treinen 
The following commit has been merged in the master branch:
commit c413e012d921f0aa29b1d40b9cd6d15435cc91fb
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 15 18:41:37 2011 +0200

new upstream 2.9.3

diff --git a/debian/changelog b/debian/changelog
index edb189b..0df9f33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
-dose3 (2.9.2-1-1) experimental; urgency=low
+dose3 (2.9.3.1) experimental; urgency=low
+
+  * New upstream release. This release resolves the problems with the
+copyright of some of the files. In particular, common/url.ml has 
+been rewritten from scratch.
+  * Standards-Version 3.9.2 (no change)
+  * debian/control: remove redundant Section entry for libdose3-ocaml-dev.
+
+ -- Ralf Treinen trei...@debian.org  Sun, 15 May 2011 18:40:58 +0200
+
+dose3 (2.9.2-1-1) UNRELEASED; urgency=low
   
   * New upstream release.
   
diff --git a/debian/control b/debian/control
index acfb934..d1486f3 100644
--- a/debian/control
+++ b/debian/control
@@ -11,13 +11,12 @@ Build-Depends: debhelper (= 7.0.50~), dh-ocaml (= 0.9~),
  libocamlgraph-ocaml-dev,
  libcudf-ocaml-dev (= 0.5.99),
  libzip-ocaml-dev, libbz2-ocaml-dev, librpm-dev (= 4.8)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.mancoosi.org/software/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/dose3.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/dose3.git
 
 Package: libdose3-ocaml-dev
-Section: ocaml
 Architecture: any
 Depends: ${misc:Depends}, ${ocaml:Depends}
 Provides: ${ocaml:Provides}

-- 
dose3 packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.0-1-26-g3fb94df

2011-05-15 Thread Ralf Treinen 
The following commit has been merged in the master branch:
commit 0e6911893916b2822ab6ec75417689eb94c43569
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 15 18:46:42 2011 +0200

fix version number

diff --git a/debian/changelog b/debian/changelog
index 0df9f33..c15cc91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dose3 (2.9.3.1) experimental; urgency=low
+dose3 (2.9.3-1) experimental; urgency=low
 
   * New upstream release. This release resolves the problems with the
 copyright of some of the files. In particular, common/url.ml has 

-- 
dose3 packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.0-1-26-g3fb94df

2011-05-15 Thread Ralf Treinen 
The following commit has been merged in the master branch:
commit 684b916897524007d6644346ccb746860ff018b5
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 15 18:59:15 2011 +0200

refresh patch for binary prefix dose3-

diff --git a/debian/changelog b/debian/changelog
index c15cc91..080280f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ dose3 (2.9.3-1) experimental; urgency=low
 been rewritten from scratch.
   * Standards-Version 3.9.2 (no change)
   * debian/control: remove redundant Section entry for libdose3-ocaml-dev.
+  * Drop patch manpages since fixed by upstream.
 
- -- Ralf Treinen trei...@debian.org  Sun, 15 May 2011 18:40:58 +0200
+ -- Ralf Treinen trei...@debian.org  Sun, 15 May 2011 18:49:43 +0200
 
 dose3 (2.9.2-1-1) UNRELEASED; urgency=low
   
diff --git a/debian/patches/binaries-prefix-edos 
b/debian/patches/binaries-prefix-edos
index 6f41bef..bd227f9 100644
--- a/debian/patches/binaries-prefix-edos
+++ b/debian/patches/binaries-prefix-edos
@@ -2,20 +2,31 @@ Author: Ralf Treinen trei...@debian.org
 Description: In debian, the symlinks to distcheck for specific distribution
   formats are named dose3-*.
 
-Index: dose3/doc/manpages/distcheck.1
+Index: dose3/applications/distcheck.ml
 ===
 dose3.orig/doc/manpages/distcheck.12011-03-03 17:37:16.0 
+0100
-+++ dose3/doc/manpages/distcheck.1 2011-03-03 17:39:47.0 +0100
-@@ -1,18 +1,18 @@
--.TH distcheck 1 December 3, 2010 Version 2.9 USER COMMANDS
-+.TH dose3-distcheck 1 December 3, 2010 Version 2.9 USER COMMANDS
- .SH NAME
--distcheck \- check installability of packages according to metadata
-+dose3-distcheck \- check installability of packages according to metadata
- 
+--- dose3.orig/applications/distcheck.ml   2011-05-15 18:53:29.0 
+0200
 dose3/applications/distcheck.ml2011-05-15 18:54:36.0 +0200
+@@ -61,10 +61,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);
+Index: dose3/doc/manpages/distcheck.1.in
+===
+--- dose3.orig/doc/manpages/distcheck.1.in 2011-05-15 18:54:44.0 
+0200
 dose3/doc/manpages/distcheck.1.in  2011-05-15 18:58:24.0 +0200
+@@ -5,11 +5,11 @@
  .SH SYNOPSIS
--\fBdistcheck\fR [option] ... \fIuri\fR
-+\fBdose3-distcheck\fR [option] ... \fIuri\fR
+ \fBdistcheck\fR [option] ... \fIuri\fR
  .br
 -\fBdebcheck\fR [option] ... \fIfile\fR
 +\fBdose3-debcheck\fR [option] ... \fIfile\fR
@@ -27,26 +38,9 @@ Index: dose3/doc/manpages/distcheck.1
 +\fBdose3-eclipsecheck\fR [option] ... \fIfile\fR
  
  .SH DESCRIPTION
--.B distcheck
-+.B dose3-distcheck
- determines, for a set of package control stanzas, called the
- repository, whether packages of the repository can be installed
- relative to the repository according to the inter-package
-@@ -29,7 +29,7 @@
- 
- .SH INPUT SPECIFICATION
- Currently supported repository types are debian, rpm, and eclipse. The
--.B distcheck
-+.B dose3-distcheck
- tool expects its input specifiation in the form
- .I type://pathname
- where
-@@ -41,10 +41,10 @@
- .I type
- given in the URI.
- 
--When invoked as \fItype\fBcheck\fR, the type of the repository is
-+When invoked as \fBdose3-\fItype\fBcheck\fR, the type of the repository is
+ .B distcheck
+@@ -44,7 +44,7 @@
+ 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
@@ -63,42 +57,21 @@ Index: dose3/doc/manpages/distcheck.1
  .P
  Installability of packages is analyzed according to their
  \fBDepends\fR, \fBConflicts\fR, and \fBProvides\fR fields with their
-@@ -70,8 +70,8 @@
+@@ -70,7 +70,7 @@
  
  .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
--specify a hdlist file distcheck must be invoked with a file argument
 +file.  By default dose3-rpmcheck expects a synthesis file as input. To
-+specify a hdlist file dose3-distcheck must be invoked with a file argument
+ specify a hdlist file distcheck must be invoked with a file argument
  of the form hdlist://
  
- .SS Eclipse
-@@ -121,7 +121,7 @@
- found in the directory \fB/var/lib/apt/lists\fR.
+@@ -115,7 +115,7 @@
+ .SH EXAMPLE
+ Check which packages in a

[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.0-1-26-g3fb94df

2011-05-15 Thread Ralf Treinen 
The following commit has been merged in the master branch:
commit 8e83064226a1254b04fad6fd190819fdc5e98b8c
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 15 19:13:11 2011 +0200

fix confg error due to missing experimental/

diff --git a/debian/changelog b/debian/changelog
index 080280f..013f287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ dose3 (2.9.3-1) experimental; urgency=low
   * Standards-Version 3.9.2 (no change)
   * debian/control: remove redundant Section entry for libdose3-ocaml-dev.
   * Drop patch manpages since fixed by upstream.
+  * Patch ignore-experimental: remove references to experimental directory
+which does not exist in the released tarball.
 
- -- Ralf Treinen trei...@debian.org  Sun, 15 May 2011 18:49:43 +0200
+ -- Ralf Treinen trei...@debian.org  Sun, 15 May 2011 19:12:44 +0200
 
 dose3 (2.9.2-1-1) UNRELEASED; urgency=low
   
diff --git a/debian/patches/series b/debian/patches/series
index 9dceec7..b68ca93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 binaries-prefix-edos
+ignore-experimental

-- 
dose3 packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.0-1-26-g3fb94df

2011-05-15 Thread Ralf Treinen 
The following commit has been merged in the master branch:
commit 7903f1e73c37cab68ff0c13403b1e3aa3d363ce7
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 15 19:13:49 2011 +0200

now add the patch

diff --git a/debian/patches/ignore-experimental 
b/debian/patches/ignore-experimental
new file mode 100644
index 000..5277145
--- /dev/null
+++ b/debian/patches/ignore-experimental
@@ -0,0 +1,13 @@
+Index: dose3/configure
+===
+--- dose3.orig/configure   2011-05-15 19:11:02.0 +0200
 dose3/configure2011-05-15 19:11:33.0 +0200
+@@ -5882,7 +5882,7 @@
+ 
+ 
+ 
+-ac_config_files=$ac_config_files Makefile.config experimental/Makefile META 
db/db.mlpack db/_tags algo/_tags rpm/_tags deb/_tags eclipse/_tags 
algo/algo.mlpack common/_tags applications/_tags experimental/_tags 
applications/boilerplates/_tags common/versionInfo.ml doc/manpages/buildcheck.1 
doc/manpages/ceve.1 doc/manpages/distcheck.1 _tags
++ac_config_files=$ac_config_files Makefile.config META db/db.mlpack db/_tags 
algo/_tags rpm/_tags deb/_tags eclipse/_tags algo/algo.mlpack common/_tags 
applications/_tags applications/boilerplates/_tags common/versionInfo.ml 
doc/manpages/buildcheck.1 doc/manpages/ceve.1 doc/manpages/distcheck.1 _tags
+ 
+ cat confcache \_ACEOF
+ # This file is a shell script that caches the results of configure

-- 
dose3 packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.0-1-26-g3fb94df

2011-05-15 Thread Ralf Treinen 
The following commit has been merged in the master branch:
commit 2fa6022aab8651226c1a5c40f1a765f05c8c2c83
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 15 19:16:43 2011 +0200

document the patch

diff --git a/debian/patches/ignore-experimental 
b/debian/patches/ignore-experimental
index 5277145..798d474 100644
--- a/debian/patches/ignore-experimental
+++ b/debian/patches/ignore-experimental
@@ -1,3 +1,8 @@
+Author: Ralf Treinen trei...@debian.org
+Description: Remove references to experimental/ which is not ditsributed
+  with the upstream tarball
+Upstream-bug: 
http://gforge.info.ucl.ac.be/tracker/index.php?func=detailaid=332group_id=35atid=283
 
+
 Index: dose3/configure
 ===
 --- dose3.orig/configure   2011-05-15 19:11:02.0 +0200

-- 
dose3 packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.0-1-26-g3fb94df

2011-05-15 Thread Ralf Treinen 
The following commit has been merged in the master branch:
commit 9fcd49df1e7e3f73bf381074116854be7359b3dd
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 15 19:19:04 2011 +0200

cleanup changelog

diff --git a/debian/changelog b/debian/changelog
index 013f287..864d7d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 dose3 (2.9.3-1) experimental; urgency=low
 
+  * Initial upload (closes:  #587521)
   * New upstream release. This release resolves the problems with the
 copyright of some of the files. In particular, common/url.ml has 
 been rewritten from scratch.
@@ -10,29 +11,3 @@ dose3 (2.9.3-1) experimental; urgency=low
 which does not exist in the released tarball.
 
  -- Ralf Treinen trei...@debian.org  Sun, 15 May 2011 19:12:44 +0200
-
-dose3 (2.9.2-1-1) UNRELEASED; urgency=low
-  
-  * New upstream release.
-  
- -- Ralf Treinen trei...@debian.org  Fri, 01 Apr 2011 15:53:27 +0200
-  
-dose3 (2.9.2-1) UNRELEASED; urgency=low
-
-  * New upstream release. This release does not include the directory
-of experimental applications.
-
- -- Ralf Treinen trei...@debian.org  Fri, 01 Apr 2011 12:08:59 +0200
-
-dose3 (2.9.1-1) UNRELEASED; urgency=low
-
-  * New upstream release. This release seperates released applications
-from experimental applications.
-
- -- Ralf Treinen trei...@debian.org  Thu, 03 Mar 2011 15:31:22 +0100
-
-dose3 (2.9.0-1) UNRELEASED; urgency=low
-
-  * Initial release (Closes: #587521)
-
- -- Ralf Treinen trei...@debian.org  Sat, 04 Dec 2010 17:25:15 +0100

-- 
dose3 packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.0-1-26-g3fb94df

2011-05-15 Thread Ralf Treinen 
The following commit has been merged in the master branch:
commit 3fb94df9482cb73a8cb57eeafde465285b5b3846
Author: Ralf Treinen trei...@free.fr
Date:   Sun May 15 19:21:51 2011 +0200

update version in ceve NEWS

diff --git a/debian/ceve.NEWS b/debian/ceve.NEWS
index 2c6cf90..a94f199 100644
--- a/debian/ceve.NEWS
+++ b/debian/ceve.NEWS
@@ -1,4 +1,4 @@
-ceve (2.9.0-1) experimental; urgency=low
+ceve (2.9.3-1) experimental; urgency=low
 
 Several of the input and output formats of earlier versions of
 ceve versions are no longer supported: EGraph, Oz, and tart (which

-- 
dose3 packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits