[Pkg-ocaml-maint-commits] [dose3] 04/04: update patches

Thu Dec 24 13:53:35 UTC 2015

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch experimental/master
in repository dose3.

commit ae52764099a29a8b7276656e2aeb9efe957da114
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Dec 24 14:53:23 2015 +0100

    update patches
---
 debian/changelog                     |  4 +++-
 debian/patches/binaries-prefix-edos  | 34 +++++++++++++++++-----------------
 debian/patches/coinstall-binary-name | 15 ---------------
 debian/patches/series                |  1 -
 4 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9643480..4933525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 dose3 (4.1~beta1-1) experimental; urgency=medium
 
   * new upstream version
+    - refreshed patch coinstall-binary-name
+    - dropped patch coinstall-binary-name, fixed upstream
 
- -- Ralf Treinen <treinen at debian.org>  Thu, 24 Dec 2015 13:54:20 +0100
+ -- Ralf Treinen <treinen at debian.org>  Thu, 24 Dec 2015 14:52:09 +0100
 
 dose3 (4.0.2-3) unstable; urgency=medium
 
diff --git a/debian/patches/binaries-prefix-edos b/debian/patches/binaries-prefix-edos
index 2df91f1..df84775 100644
--- a/debian/patches/binaries-prefix-edos
+++ b/debian/patches/binaries-prefix-edos
@@ -3,8 +3,8 @@ Description: all binaries have prefix dose-
 
 Index: dose3/doc/manpages/distcheck.pod
 ===================================================================
---- dose3.orig/doc/manpages/distcheck.pod	2015-08-26 21:14:16.570279286 +0200
-+++ dose3/doc/manpages/distcheck.pod	2015-08-26 21:14:16.566279272 +0200
+--- dose3.orig/doc/manpages/distcheck.pod	2015-12-24 14:48:23.552855492 +0100
++++ dose3/doc/manpages/distcheck.pod	2015-12-24 14:48:23.548855473 +0100
 @@ -1,25 +1,25 @@
  =head1 NAME
  
@@ -78,7 +78,7 @@ Index: dose3/doc/manpages/distcheck.pod
  
  =cut
  
-@@ -280,13 +280,13 @@
+@@ -349,13 +349,13 @@
  Check which packages in contrib are not installable when dependencies may
  be satisfied from main:
   
@@ -96,9 +96,9 @@ Index: dose3/doc/manpages/distcheck.pod
  =cut
 Index: dose3/doc/manpages/buildcheck.pod
 ===================================================================
---- dose3.orig/doc/manpages/buildcheck.pod	2015-08-26 21:14:16.570279286 +0200
-+++ dose3/doc/manpages/buildcheck.pod	2015-08-26 21:14:16.566279272 +0200
-@@ -180,7 +180,7 @@
+--- dose3.orig/doc/manpages/buildcheck.pod	2015-12-24 14:48:23.552855492 +0100
++++ dose3/doc/manpages/buildcheck.pod	2015-12-24 14:48:23.548855473 +0100
+@@ -283,7 +283,7 @@
  =head1 SEE ALSO
  
  L<B<deb-control>(5)>, 
@@ -109,8 +109,8 @@ Index: dose3/doc/manpages/buildcheck.pod
  <http://www.mancoosi.org> is the home page of the Mancoosi project. 
 Index: dose3/doc/manpages/outdated.pod
 ===================================================================
---- dose3.orig/doc/manpages/outdated.pod	2015-08-26 21:14:16.570279286 +0200
-+++ dose3/doc/manpages/outdated.pod	2015-08-26 21:14:16.566279272 +0200
+--- dose3.orig/doc/manpages/outdated.pod	2015-12-24 14:48:23.552855492 +0100
++++ dose3/doc/manpages/outdated.pod	2015-12-24 14:48:23.548855473 +0100
 @@ -1,16 +1,16 @@
  =head1 NAME
  
@@ -162,8 +162,8 @@ Index: dose3/doc/manpages/outdated.pod
   
 Index: dose3/doc/manpages/challenged.pod
 ===================================================================
---- dose3.orig/doc/manpages/challenged.pod	2015-08-26 21:14:16.570279286 +0200
-+++ dose3/doc/manpages/challenged.pod	2015-08-26 21:14:16.566279272 +0200
+--- dose3.orig/doc/manpages/challenged.pod	2015-12-24 14:48:23.552855492 +0100
++++ dose3/doc/manpages/challenged.pod	2015-12-24 14:48:23.548855473 +0100
 @@ -1,19 +1,19 @@
  =head1 NAME
  
@@ -225,8 +225,8 @@ Index: dose3/doc/manpages/challenged.pod
  
 Index: dose3/doc/manpages/debcoinstall.pod
 ===================================================================
---- dose3.orig/doc/manpages/debcoinstall.pod	2015-08-26 21:14:16.570279286 +0200
-+++ dose3/doc/manpages/debcoinstall.pod	2015-08-26 21:14:16.566279272 +0200
+--- dose3.orig/doc/manpages/debcoinstall.pod	2015-12-24 14:48:23.552855492 +0100
++++ dose3/doc/manpages/debcoinstall.pod	2015-12-24 14:48:23.548855473 +0100
 @@ -1,19 +1,19 @@
  =head1 NAME
  
@@ -268,8 +268,8 @@ Index: dose3/doc/manpages/debcoinstall.pod
   --fg essential > essential_coinstall_src
 Index: dose3/doc/manpages/ceve.pod
 ===================================================================
---- dose3.orig/doc/manpages/ceve.pod	2015-08-26 21:14:12.134264139 +0200
-+++ dose3/doc/manpages/ceve.pod	2015-08-26 21:15:22.378509352 +0200
+--- dose3.orig/doc/manpages/ceve.pod	2015-12-24 14:48:23.552855492 +0100
++++ dose3/doc/manpages/ceve.pod	2015-12-24 14:48:23.548855473 +0100
 @@ -1,18 +1,18 @@
  =head1 NAME
  
@@ -280,8 +280,8 @@ Index: dose3/doc/manpages/ceve.pod
  
  =over 
  
--=item B<ceve> [-h] [-v] [-c I<pkgspec>] [-r I<pkgspec>] [--depth=I<n>]I<> [-T I<format>] [-G I<graph type>] [-o I<filename>] I<input-spec> 
-+=item B<dose-ceve> [-h] [-v] [-c I<pkgspec>] [-r I<pkgspec>] [--depth=I<n>]I<> [-T I<format>] [-G I<graph type>] [-o I<filename>] I<input-spec> 
+-=item B<ceve> [-h] [-v] [-c I<pkgspec>] [-r I<pkgspec>] [--depth=I<n>]I<> [-T I<format>] [-G I<graph type>] [-o I<filename>] I<input-spec> [I<input-spec>...]
++=item B<dose-ceve> [-h] [-v] [-c I<pkgspec>] [-r I<pkgspec>] [--depth=I<n>]I<> [-T I<format>] [-G I<graph type>] [-o I<filename>] I<input-spec> [I<input-spec>...]
  
  =back
  
@@ -292,7 +292,7 @@ Index: dose3/doc/manpages/ceve.pod
  extracts package metadata from them, performs some manipulations, and outputs
  the package metadata in one of several formats. 
  
-@@ -153,7 +153,7 @@
+@@ -258,7 +258,7 @@
  
  =head2 DEBIAN SPECIFIC OPTIONS
  
diff --git a/debian/patches/coinstall-binary-name b/debian/patches/coinstall-binary-name
deleted file mode 100644
index 31c6053..0000000
--- a/debian/patches/coinstall-binary-name
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: accept "dose-deb-coinstall" as alternative name of the 
-  coinstall binary.
-
-Index: dose3/applications/deb-coinstall.ml
-===================================================================
---- dose3.orig/applications/deb-coinstall.ml	2015-08-26 20:33:28.801372352 +0200
-+++ dose3/applications/deb-coinstall.ml	2015-08-26 20:34:06.173449333 +0200
-@@ -251,5 +251,5 @@
- ;;
- 
- StdUtils.if_application
--~alternatives:["dose-debcoinstall";"deb-coinstall"] __label main ;;
-+~alternatives:["dose-deb-coinstall";"deb-coinstall"] __label main ;;
- 
diff --git a/debian/patches/series b/debian/patches/series
index b7e42fd..96b0499 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 binaries-prefix-edos
-coinstall-binary-name
 # librpm-4.12

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git

