[Pkg-sugar-commit] [sugar-browse-activity] 04/07: Update package relations: Drop bogus conflicts/replaces against itself.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository sugar-browse-activity.

commit e5f9fbe129084ebf1f0d12741a6040c4ec825885
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jun 18 14:43:23 2015 -0500

    Update package relations: Drop bogus conflicts/replaces against itself.
---
 debian/control.in | 2 --
 debian/rules      | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 57254aa..6f53046 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -16,8 +16,6 @@ Depends: ${cdbs:Depends},
  ${python:Depends}
 Recommends: ${cdbs:Recommends}
 Suggests: ${cdbs:Suggests}
-Conflicts: ${cdbs:Conflicts}
-Replaces: ${cdbs:Replaces}
 Description: Sugar Learning Platform - web browsing activity
  Sugar Learning Platform promotes collaborative learning through Sugar
  Activities that encourage critical thinking, the heart of a quality
diff --git a/debian/rules b/debian/rules
index 9f2d2ad..2aa61ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,10 +51,5 @@ CDBS_DEPENDS_$(pkg) +=, $(patsubst %,$(comma) gir1.2-%,$(gir-deps))
 CDBS_RECOMMENDS_$(pkg) +=, sugar-$(DEB_SUGAR_PRIMARY_BRANCH)-themes | sugar-themes | sugar-artwork
 CDBS_RECOMMENDS_$(pkg) +=, ca-certificates
 
-# Ensure only one variant is installed at a time (Debian Policy 7.6.2)
-# (unneeded since Wheezy: can be dropped after Wheezy+1)
-CDBS_CONFLICTS_$(pkg) = $(DEB_SUGAR_SOURCE_PKGBASE)
-CDBS_REPLACES_$(pkg) = $(DEB_SUGAR_SOURCE_PKGBASE)
-
 clean::
 	rm -rf locale

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-browse-activity.git