The following commit has been merged in the master branch:
commit 4a9a15eec304d44fb88cff18ef0e08ddf1f32b43
Merge: 98f6b219477e01ed3f1be5839657f3f41a423bae
f9e91232fed156e5c94b63636d491325321699cc
Author: Ralf Treinen <trei...@pps.univ-paris-diderot.fr>
Date: Wed Sep 26 17:22:26 2012 +0200
Merge branch 'bug687643'
Conflicts:
debian/changelog
debian/patches/series
diff --combined debian/changelog
index 8bd567d,4e32631..5c26f4c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,14 -2,14 +2,17 @@@ dose3 (3.0.2-2) unstable; urgency=lo
* Patch multiarch-conflicts: fix the translation of conflicts in case of
multiarchs, a conflict on package p has to apply to p of all possible
- architectures. (closes: #685171). Extracted from the upstream git
- repository (commit 7c30da3d). Thanks to Pietro Abate for having fixed
- this.
+ architectures. (closes: #685171). Patch extracted from the
+ 3.0.2-hotfix branch of the upstream git repository (commit
+ a2f69265323d8cead088eeee2a731db582d3cc81). Thanks to Pietro Abate for
+ having fixed this.
- * Fix architecture options in the dose-builddebcheck manpage
- (closes: #680271).
+ * Patch apt-cudf-pinning: Fix version numbers in the package installation
+ requests in the translation process from EDSP to CUDF (closes: #687643).
+ Thanks to Pietro Abate for the patch!
++ * Patch builddebcheck-manpage: Fix architecture options in the
++ dose-builddebcheck manpage (closes: #680271).
- -- Ralf Treinen <trei...@debian.org> Wed, 26 Sep 2012 17:16:02 +0200
- -- Ralf Treinen <trei...@debian.org> Fri, 14 Sep 2012 16:04:03 +0200
++ -- Ralf Treinen <trei...@debian.org> Wed, 26 Sep 2012 17:21:15 +0200
dose3 (3.0.2-1) unstable; urgency=low
diff --combined debian/patches/series
index b77967d,b6ff5fe..4670029
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,4 +1,5 @@@
binaries-prefix-edos
version-3.0.2
multiarch-conflicts
+builddebcheck-manpage
+ apt-cudf-pinning
--
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
