[Pkg-ocaml-maint-commits] [advi] 02/03: advi-examples: drop conflict with very old advi

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository advi.

commit 089abd914e05c77e5f6c5cdae7c2e42aee592876
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Jun 18 07:41:32 2015 +0200

    advi-examples: drop conflict with very old advi
---
 debian/changelog | 4 +++-
 debian/control   | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 049ca3d..853bb88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ advi (1.10.2-3) UNRELEASED; urgency=low
 
   * advi-examples: drop spurious Suggests tk4.8 et mpg321
   * Standards-Version 3.9.6 (no change)
+  * advi-examples: drop Conflicts: advi (<< 1.6.0-4) since that version is
+    more than 10 years old.
 
- -- Ralf Treinen <treinen at debian.org>  Thu, 18 Jun 2015 07:29:28 +0200
+ -- Ralf Treinen <treinen at debian.org>  Thu, 18 Jun 2015 07:40:18 +0200
 
 advi (1.10.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 968b0e2..fac28cf 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,6 @@ Description: active DVI previewer and presenter
 Package: advi-examples
 Architecture: all
 Depends: ${misc:Depends}, texlive-latex-base, advi, imagemagick
-Conflicts: advi (<< 1.6.0-4)
 Suggests: fonts-ipafont-gothic | fonts-japanese-gothic,
  fonts-ipafont-mincho | fonts-japanese-mincho,
  ocaml-base-nox, xterm

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