[Pkg-ocaml-maint-commits] [dose3] 03/07: updated patches
Ralf Treinen
treinen at moszumanska.debian.org
Sun Jun 19 18:54:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch experimental/master
in repository dose3.
commit 9010b4cac97ae8b1e4b5757cab09d12db8dd0f56
Author: Ralf Treinen <treinen at free.fr>
Date: Mon Jun 13 08:23:33 2016 +0200
updated patches
---
debian/changelog | 10 ++++
...s-apt-cudf.ml-Do-not-generate-removal-req.patch | 60 --------------------
debian/patches/0001-fix-licence-header.patch | 25 ---------
debian/patches/binaries-prefix-edos | 64 +++++++++++++---------
debian/patches/series | 2 -
5 files changed, 48 insertions(+), 113 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2e4805d..9408c7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dose3 (5.0~rc1-1) experimental; urgency=medium
+
+ * new upstream release:
+ - refreshed patch binaries-prefix-edos
+ - dropped patches integrated by upstream:
+ 0001-applications-apt-cudf.ml-Do-not-generate-removal-req.patch
+ 0001-fix-licence-header.patch
+
+ -- Ralf Treinen <treinen at debian.org> Mon, 13 Jun 2016 08:22:56 +0200
+
dose3 (4.3-3) experimental; urgency=medium
* dose-doc: breaks older versions of apt-cudf, libdose3-ocaml-dev,
diff --git a/debian/patches/0001-applications-apt-cudf.ml-Do-not-generate-removal-req.patch b/debian/patches/0001-applications-apt-cudf.ml-Do-not-generate-removal-req.patch
deleted file mode 100644
index 54ac3fa..0000000
--- a/debian/patches/0001-applications-apt-cudf.ml-Do-not-generate-removal-req.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 27afc8f6d290dd7f31a6bcde6b8761d0b55e87bd Mon Sep 17 00:00:00 2001
-From: Johannes 'josch' Schauer <josch at mister-muffin.de>
-Date: Thu, 12 May 2016 06:37:47 +0200
-Subject: [PATCH] applications/apt-cudf.ml: Do not generate removal requests
- for up/downgrades
-
-As far as solvers are concerned, changes in package versions mean that
-the old package is removed and the package in the new version is
-installed. This is how it was encoded in the EDSP output so far.
-
-Recently, (commit c0d57a2a) the order of installation and removal
-requests was turned around and it was discovered that apt will only
-parse the *last* request for a package (see Debian bug #823906). Thus,
-apt would remove a certain package but not install it in its new
-version.
-
-As a remedy, this commit makes sure that package up or downgrades are
-expressed in a single "Install" request and that these do not show up as
-a "Remove" request anymore.
----
- applications/apt-cudf.ml | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/applications/apt-cudf.ml b/applications/apt-cudf.ml
-index 29eb7b5..90fd450 100644
---- a/applications/apt-cudf.ml
-+++ b/applications/apt-cudf.ml
-@@ -506,10 +506,19 @@ let main () =
- Util.Timer.start timer3;
- let empty = ref true in
- let cache = CudfAdd.Cudf_hashtbl.create 1023 in
-+ (* In Debian (and thus for apt and dpkg), packages can only be installed in a
-+ * single version at a time. Thus, any up or downgrades always implicitly
-+ * remove the old version. Therefore, if a package installation request just
-+ * changes the version of the package, we remember this in a hash table such
-+ * that we do not generate a removal request for that package as well. As a
-+ * result, every package (name) only shows up exactly once in the solution.
-+ * Package removals are not explicitly shown for upgrades. *)
-+ let notremoved = Util.StringHashtbl.create 1023 in
-
- let (install,remove) = CudfDiff.make_solution ~universe ~solution:soluniv in
- CudfAdd.Cudf_set.iter (fun pkg ->
- CudfAdd.Cudf_hashtbl.add cache pkg ();
-+ Util.StringHashtbl.add notremoved pkg.Cudf.package ();
- Format.printf "Install: %a at ." pp_pkg (pkg,univ)
- ) install;
-
-@@ -527,7 +536,8 @@ let main () =
- ) cudf_request.Cudf.install;
-
- CudfAdd.Cudf_set.iter (fun p ->
-- Format.printf "Remove: %a at ." pp_pkg (p,univ)
-+ if Util.StringHashtbl.mem notremoved p.Cudf.package then ()
-+ else Format.printf "Remove: %a at ." pp_pkg (p,univ)
- ) remove;
-
- Util.Timer.stop timer3 ();
---
-2.5.1
-
diff --git a/debian/patches/0001-fix-licence-header.patch b/debian/patches/0001-fix-licence-header.patch
deleted file mode 100644
index 1bcff36..0000000
--- a/debian/patches/0001-fix-licence-header.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9e1e7e0aa93ed319ac1e1b5fce596989e3c85ccd Mon Sep 17 00:00:00 2001
-From: Pietro Abate <pietro.abate at pps.univ-paris-diderot.fr>
-Date: Sun, 24 Apr 2016 17:12:31 +0200
-Subject: [PATCH] fix licence header
-
----
- scripts/pack.ml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/pack.ml b/scripts/pack.ml
-index 7821b61..d12fa88 100644
---- a/scripts/pack.ml
-+++ b/scripts/pack.ml
-@@ -6,7 +6,7 @@
- (* *)
- (* Copyright 2011 OCamlPro SAS *)
- (* All rights reserved. This file is distributed under the terms of *)
--(* the GNU Public License version 3.0. *)
-+(* the GNU General Public License version 3.0. *)
- (* *)
- (***********************************************************************)
-
---
-2.5.1
-
diff --git a/debian/patches/binaries-prefix-edos b/debian/patches/binaries-prefix-edos
index 0939ffa..f013039 100644
--- a/debian/patches/binaries-prefix-edos
+++ b/debian/patches/binaries-prefix-edos
@@ -1,8 +1,10 @@
Author: Ralf Treinen <treinen at debian.org>
Description: all binaries have prefix dose-
---- a/doc/manpages/distcheck.pod
-+++ b/doc/manpages/distcheck.pod
+Index: dose3/doc/manpages/distcheck.pod
+===================================================================
+--- dose3.orig/doc/manpages/distcheck.pod 2016-06-13 08:15:17.411869264 +0200
++++ dose3/doc/manpages/distcheck.pod 2016-06-13 08:15:17.383869114 +0200
@@ -1,25 +1,25 @@
=head1 NAME
@@ -35,7 +37,7 @@ Description: all binaries have prefix dose-
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 @@ all packages are in the foreground.
+@@ -39,17 +39,17 @@
=head1 Input Specification
Currently supported input types are debian, rpm, and eclipse. The
@@ -56,7 +58,7 @@ Description: all binaries have prefix dose-
.bz2) as positional arguments. Input read on standard input cannot be in
compressed form.
-@@ -62,7 +62,7 @@ compressed form.
+@@ -62,7 +62,7 @@
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/>
@@ -65,7 +67,7 @@ Description: all binaries have prefix dose-
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 @@ with the same name but different version
+@@ -80,8 +80,8 @@
=head2 Rpm
The input file can be either a I<synthesis> file or a I<hdlist> file. By
@@ -76,7 +78,7 @@ Description: all binaries have prefix dose-
=cut
-@@ -373,13 +373,13 @@ found in the directory B</var/lib/apt/li
+@@ -373,13 +373,13 @@
Check which packages in contrib are not installable when dependencies may
be satisfied from main:
@@ -92,9 +94,11 @@ Description: all binaries have prefix dose-
project.
=cut
---- a/doc/manpages/deb-buildcheck.pod
-+++ b/doc/manpages/deb-buildcheck.pod
-@@ -258,7 +258,7 @@ Compute the list of source packages for
+Index: dose3/doc/manpages/deb-buildcheck.pod
+===================================================================
+--- dose3.orig/doc/manpages/deb-buildcheck.pod 2016-06-13 08:15:17.411869264 +0200
++++ dose3/doc/manpages/deb-buildcheck.pod 2016-06-13 08:15:17.383869114 +0200
+@@ -258,7 +258,7 @@
possible to install a mix build environment on amd64 plus armel, assuming that
the binary packages described in file Packages are available:
@@ -103,7 +107,7 @@ Description: all binaries have prefix dose-
--deb-foreign-archs=armel,linux-any --deb-host-arch=armel \
DebianPackages/Sid-amd64-armel-Packages-050812.bz2
DebianPackages/Sid-Sources-single-version-050812.bz2
-@@ -276,7 +276,7 @@ edos-distcheck.
+@@ -276,7 +276,7 @@
=head1 SEE ALSO
L<B<deb-control>(5)>,
@@ -112,8 +116,10 @@ Description: all binaries have prefix dose-
<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.
---- a/doc/manpages/outdated.pod
-+++ b/doc/manpages/outdated.pod
+Index: dose3/doc/manpages/outdated.pod
+===================================================================
+--- dose3.orig/doc/manpages/outdated.pod 2016-06-13 08:15:17.411869264 +0200
++++ dose3/doc/manpages/outdated.pod 2016-06-13 08:15:17.387869136 +0200
@@ -1,16 +1,16 @@
=head1 NAME
@@ -134,7 +140,7 @@ Description: all binaries have prefix dose-
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 @@ from the input files.
+@@ -28,7 +28,7 @@
=head1 Output Specification
@@ -143,7 +149,7 @@ Description: all binaries have prefix dose-
=head1 OPTIONS
-@@ -83,7 +83,7 @@ errors).
+@@ -83,7 +83,7 @@
=head1 EXAMPLE
@@ -152,7 +158,7 @@ Description: all binaries have prefix dose-
=cut
-@@ -95,8 +95,8 @@ Pietro Abate and Ralf Treinen
+@@ -95,8 +95,8 @@
=head1 SEE ALSO
@@ -163,8 +169,10 @@ Description: all binaries have prefix dose-
<http://www.mancoosi.org> is the home page of the Mancoosi project.
---- a/doc/manpages/challenged.pod
-+++ b/doc/manpages/challenged.pod
+Index: dose3/doc/manpages/challenged.pod
+===================================================================
+--- dose3.orig/doc/manpages/challenged.pod 2016-06-13 08:15:17.411869264 +0200
++++ dose3/doc/manpages/challenged.pod 2016-06-13 08:15:17.387869136 +0200
@@ -1,19 +1,19 @@
=head1 NAME
@@ -188,7 +196,7 @@ Description: all binaries have prefix dose-
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 @@ archive.
+@@ -23,13 +23,13 @@
=head1 Input Specification
@@ -204,7 +212,7 @@ Description: all binaries have prefix dose-
=cut
-@@ -74,7 +74,7 @@ Display this list of options.
+@@ -74,7 +74,7 @@
=head1 EXAMPLE
@@ -213,7 +221,7 @@ Description: all binaries have prefix dose-
=cut
-@@ -88,8 +88,8 @@ Pietro Abate and Roberto Di Cosmo
+@@ -88,8 +88,8 @@
=head1 SEE ALSO
@@ -224,8 +232,10 @@ Description: all binaries have prefix dose-
<http://www.mancoosi.org> is the home page of the Mancoosi project.
---- a/doc/manpages/debcoinstall.pod
-+++ b/doc/manpages/debcoinstall.pod
+Index: dose3/doc/manpages/debcoinstall.pod
+===================================================================
+--- dose3.orig/doc/manpages/debcoinstall.pod 2016-06-13 08:15:17.411869264 +0200
++++ dose3/doc/manpages/debcoinstall.pod 2016-06-13 08:15:17.387869136 +0200
@@ -1,19 +1,19 @@
=head1 NAME
@@ -249,7 +259,7 @@ Description: all binaries have prefix dose-
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 @@ essential:
+@@ -135,13 +135,13 @@
/var/lib/apt/lists/ftp.fr.debian.org_debian_dists_sid_main_binary-amd64_Packages \
> essential
@@ -265,8 +275,10 @@ Description: all binaries have prefix dose-
--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
---- a/doc/manpages/ceve.pod
-+++ b/doc/manpages/ceve.pod
+Index: dose3/doc/manpages/ceve.pod
+===================================================================
+--- dose3.orig/doc/manpages/ceve.pod 2016-06-13 08:15:17.411869264 +0200
++++ dose3/doc/manpages/ceve.pod 2016-06-13 08:15:17.387869136 +0200
@@ -1,18 +1,18 @@
=head1 NAME
@@ -289,7 +301,7 @@ Description: all binaries have prefix dose-
extracts package metadata from them, performs some manipulations, and outputs
the package metadata in one of several formats.
-@@ -264,7 +264,7 @@ universe.
+@@ -265,7 +265,7 @@
=head2 DEBIAN SPECIFIC OPTIONS
diff --git a/debian/patches/series b/debian/patches/series
index b707708..9dceec7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
binaries-prefix-edos
-0001-applications-apt-cudf.ml-Do-not-generate-removal-req.patch
-0001-fix-licence-header.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git
More information about the Pkg-ocaml-maint-commits
mailing list