[r-cran-zelig] 93/102: Remove Conflicts: r-other-gking-zelig

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-zelig.

commit 913bed54ccb6c37a0ec693052b07162681bd2742
Author: Andreas Tille <tille at debian.org>
Date:   Sun Jan 8 10:03:26 2017 +0100

    Remove Conflicts: r-other-gking-zelig
---
 debian/changelog | 1 +
 debian/control   | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92391e6..8660ee8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ zelig (5.0-13-1) UNRELEASED; urgency=medium
   * New upstream version
   * Moved to Debian Science team maintenance
   * cme fix dpkg-control
+  * Remove Conflicts: r-other-gking-zelig
 
  -- Andreas Tille <tille at debian.org>  Sun, 08 Jan 2017 09:57:52 +0100
 
diff --git a/debian/control b/debian/control
index 4f950e1..1cf2d74 100644
--- a/debian/control
+++ b/debian/control
@@ -34,8 +34,6 @@ Depends: r-cran-mass,
          r-cran-lme4,
          ${shlibs:Depends},
          ${R:Depends}
-Conflicts: r-other-gking-zelig (<< 2.1-4-2)
-Replaces: r-other-gking-zelig (<< 2.1-4-2)
 Description: GNU R package providing a unified front-end for estimating statistical models
  With thousands of contributors who have written hundreds of packaged
  routines, R can deal with nearly any statistical problem.  Although

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-zelig.git