[Pkg-ocaml-maint-commits] [dose3] 03/05: Refreshed patch binaries-prefix-edos

Fri May 13 18:16:48 UTC 2016

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

josch pushed a commit to annotated tag debian/4.3-1
in repository dose3.

commit 7c6aeadb84a68c7dfbdf2384a11a9b4bc5178dee
Author: Johannes Schauer <josch at debian.org>
Date:   Fri May 13 17:32:23 2016 +0200

    Refreshed patch binaries-prefix-edos
---
 debian/changelog                    |  1 +
 debian/patches/binaries-prefix-edos | 64 +++++++++++++++----------------------
 2 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 606eee9..bde2977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ dose3 (4.3-1) experimental; urgency=medium
     upstream git master to let apt-cudf not create a removal request for
     upgrades or downgrades but only a single install request. See the patch
     description as well as the closed bug for details (closes: #823906)
+  * Refreshed patch binaries-prefix-edos
 
  -- Ralf Treinen <treinen at debian.org>  Sat, 23 Apr 2016 17:28:08 +0200
 
diff --git a/debian/patches/binaries-prefix-edos b/debian/patches/binaries-prefix-edos
index 03cab30..0939ffa 100644
--- a/debian/patches/binaries-prefix-edos
+++ b/debian/patches/binaries-prefix-edos
@@ -1,10 +1,8 @@
 Author: Ralf Treinen <treinen at debian.org>
 Description: all binaries have prefix dose-
 
-Index: dose3/doc/manpages/distcheck.pod
-===================================================================
---- dose3.orig/doc/manpages/distcheck.pod	2016-03-13 20:05:52.014344883 +0100
-+++ dose3/doc/manpages/distcheck.pod	2016-03-13 20:05:52.014344883 +0100
+--- a/doc/manpages/distcheck.pod
++++ b/doc/manpages/distcheck.pod
 @@ -1,25 +1,25 @@
  =head1 NAME
  
@@ -37,7 +35,7 @@ Index: dose3/doc/manpages/distcheck.pod
  repository, whether packages of the repository can be installed relative to the
  repository according to the inter-package relationsships expressed in the
  package control stanzas.  The exact set of relevant control fields and their
-@@ -39,17 +39,17 @@
+@@ -39,17 +39,17 @@ all packages are in the foreground.
  =head1 Input Specification
  
  Currently supported input types are debian, rpm, and eclipse. The
@@ -58,7 +56,7 @@ Index: dose3/doc/manpages/distcheck.pod
  .bz2) as positional arguments. Input read on standard input cannot be in
  compressed form.
  
-@@ -62,7 +62,7 @@
+@@ -62,7 +62,7 @@ compressed form.
  The input file has to contain stanzas in the format
  of L<deb-control(5)>, separated by one blank line. For instance, the Packages
  files as found on a Debian mirror server, or in the directory I</var/lib/apt/lists/>
@@ -67,7 +65,7 @@ Index: dose3/doc/manpages/distcheck.pod
  packages is analyzed according to their B<Depends>, B<Conflicts>, and B<Provides>
  fields with their meaning as of Debian policy version 3.9.0. B<Pre-depends> are
  treated like B<Depends>, and B<Breaks> are treated like B<Conflicts>.
-@@ -80,8 +80,8 @@
+@@ -80,8 +80,8 @@ with the same name but different version
  =head2 Rpm
  
  The input file can be either a I<synthesis> file or a I<hdlist> file.  By
@@ -78,7 +76,7 @@ Index: dose3/doc/manpages/distcheck.pod
  
  =cut
  
-@@ -349,13 +349,13 @@
+@@ -373,13 +373,13 @@ found in the directory B</var/lib/apt/li
  Check which packages in contrib are not installable when dependencies may
  be satisfied from main:
   
@@ -94,11 +92,9 @@ Index: dose3/doc/manpages/distcheck.pod
  project. 
  
  =cut
-Index: dose3/doc/manpages/deb-buildcheck.pod
-===================================================================
---- dose3.orig/doc/manpages/deb-buildcheck.pod	2016-03-13 20:05:52.014344883 +0100
-+++ dose3/doc/manpages/deb-buildcheck.pod	2016-03-13 20:07:36.166799219 +0100
-@@ -266,7 +266,7 @@
+--- a/doc/manpages/deb-buildcheck.pod
++++ b/doc/manpages/deb-buildcheck.pod
+@@ -258,7 +258,7 @@ Compute the list of source packages for
  possible to install a mix build environment on amd64 plus armel, assuming that
  the binary packages described in file Packages are available: 
  
@@ -107,7 +103,7 @@ Index: dose3/doc/manpages/deb-buildcheck.pod
   --deb-foreign-archs=armel,linux-any --deb-host-arch=armel \
   DebianPackages/Sid-amd64-armel-Packages-050812.bz2 
   DebianPackages/Sid-Sources-single-version-050812.bz2
-@@ -284,7 +284,7 @@
+@@ -276,7 +276,7 @@ edos-distcheck.
  =head1 SEE ALSO
  
  L<B<deb-control>(5)>, 
@@ -116,10 +112,8 @@ Index: dose3/doc/manpages/deb-buildcheck.pod
  
  <http://www.edos-project.org> is the home page of the EDOS project. 
  <http://www.mancoosi.org> is the home page of the Mancoosi project. 
-Index: dose3/doc/manpages/outdated.pod
-===================================================================
---- dose3.orig/doc/manpages/outdated.pod	2016-03-13 20:05:52.014344883 +0100
-+++ dose3/doc/manpages/outdated.pod	2016-03-13 20:05:52.014344883 +0100
+--- a/doc/manpages/outdated.pod
++++ b/doc/manpages/outdated.pod
 @@ -1,16 +1,16 @@
  =head1 NAME
  
@@ -140,7 +134,7 @@ Index: dose3/doc/manpages/outdated.pod
  are not installable with respect to that repository by the their inter-package
  relationships (dependencies, conflicts, ...), and that furthermore cannot
  become installable (in the current version) how matter how the rest of the
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ from the input files.
  
  =head1 Output Specification
  
@@ -149,7 +143,7 @@ Index: dose3/doc/manpages/outdated.pod
  
  =head1 OPTIONS
  
-@@ -83,7 +83,7 @@
+@@ -83,7 +83,7 @@ errors).
  
  =head1 EXAMPLE
  
@@ -158,7 +152,7 @@ Index: dose3/doc/manpages/outdated.pod
  
  =cut
  
-@@ -95,8 +95,8 @@
+@@ -95,8 +95,8 @@ Pietro Abate and Ralf Treinen
  
  =head1 SEE ALSO
  
@@ -169,10 +163,8 @@ Index: dose3/doc/manpages/outdated.pod
  
  <http://www.mancoosi.org> is the home page of the Mancoosi project. 
   
-Index: dose3/doc/manpages/challenged.pod
-===================================================================
---- dose3.orig/doc/manpages/challenged.pod	2016-03-13 20:05:52.014344883 +0100
-+++ dose3/doc/manpages/challenged.pod	2016-03-13 20:05:52.014344883 +0100
+--- a/doc/manpages/challenged.pod
++++ b/doc/manpages/challenged.pod
 @@ -1,19 +1,19 @@
  =head1 NAME
  
@@ -196,7 +188,7 @@ Index: dose3/doc/manpages/challenged.pod
  packages that, if upgraded to a specific version, would break a large number of
  other packages in the repository. This tool would be particularly useful during
  the upgrade of a specific component to evaluate its impact on the software
-@@ -23,13 +23,13 @@
+@@ -23,13 +23,13 @@ archive.
  
  =head1 Input Specification
  
@@ -212,7 +204,7 @@ Index: dose3/doc/manpages/challenged.pod
  
  =cut
  
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ Display this list of options.
  
  =head1 EXAMPLE
  
@@ -221,7 +213,7 @@ Index: dose3/doc/manpages/challenged.pod
  
  =cut
  
-@@ -88,8 +88,8 @@
+@@ -88,8 +88,8 @@ Pietro Abate and Roberto Di Cosmo
  
  =head1 SEE ALSO
  
@@ -232,10 +224,8 @@ Index: dose3/doc/manpages/challenged.pod
  
  <http://www.mancoosi.org> is the home page of the Mancoosi project.
  
-Index: dose3/doc/manpages/debcoinstall.pod
-===================================================================
---- dose3.orig/doc/manpages/debcoinstall.pod	2016-03-13 20:05:52.014344883 +0100
-+++ dose3/doc/manpages/debcoinstall.pod	2016-03-13 20:05:52.014344883 +0100
+--- a/doc/manpages/debcoinstall.pod
++++ b/doc/manpages/debcoinstall.pod
 @@ -1,19 +1,19 @@
  =head1 NAME
  
@@ -259,7 +249,7 @@ Index: dose3/doc/manpages/debcoinstall.pod
  can be installed together given a set of background Debian binary packages. If
  a valid coinstallation set exists, than it is printed on standard output; else
  the application exists with exit code 1 and prints nothing. 
-@@ -130,13 +130,13 @@
+@@ -130,13 +130,13 @@ essential:
   /var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages \
   > essential
  
@@ -275,10 +265,8 @@ Index: dose3/doc/manpages/debcoinstall.pod
   --src /var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_source_Sources \
   --bg /var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages \
   --fg essential > essential_coinstall_src
-Index: dose3/doc/manpages/ceve.pod
-===================================================================
---- dose3.orig/doc/manpages/ceve.pod	2016-03-13 20:05:52.014344883 +0100
-+++ dose3/doc/manpages/ceve.pod	2016-03-13 20:05:52.014344883 +0100
+--- a/doc/manpages/ceve.pod
++++ b/doc/manpages/ceve.pod
 @@ -1,18 +1,18 @@
  =head1 NAME
  
@@ -301,7 +289,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. 
  
-@@ -258,7 +258,7 @@
+@@ -264,7 +264,7 @@ universe.
  
  =head2 DEBIAN SPECIFIC OPTIONS
  

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

