[Pkg-sugar-commit] [sugar-write-activity] 01/07: Drop branch from source and binary package.

[Jonas Smedegaard]

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

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

commit aaa50e2f0de885494546a110d6a23f737bd69e90
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jun 18 18:20:19 2015 -0500

    Drop branch from source and binary package.
---
 debian/control.in | 4 ++--
 debian/rules      | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index dba7d44..d16e166 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,4 +1,4 @@
-Source: sugar-write-activity-0.86
+Source: sugar-write-activity
 Section: x11
 Priority: optional
 Maintainer: Debian Sugar Team <pkg-sugar-devel at lists.alioth.debian.org>
@@ -10,7 +10,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-sugar/sugar-write-activity
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-sugar/sugar-write-activity.git
 Homepage: http://wiki.sugarlabs.org/go/Activities/Write
 
-Package: sugar-write-activity-0.86
+Package: sugar-write-activity
 Architecture: all
 Depends: ${cdbs:Depends},
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 374c81c..29fba09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,11 +43,6 @@ CDBS_DEPENDS_$(pkg) = python
 CDBS_DEPENDS_$(pkg) +=, $(patsubst %,$(comma) python-%,$(python-deps))
 CDBS_DEPENDS_$(pkg) +=, $(patsubst %,$(comma) gir1.2-%,$(gir-deps))
 
-# Ensure only one variant is installed at a time (Debian Policy 7.6.2)
-CDBS_PROVIDES_$(pkg) = $(DEB_SUGAR_SOURCE_PKGBASE)
-CDBS_CONFLICTS_$(pkg) = $(DEB_SUGAR_SOURCE_PKGBASE)
-CDBS_REPLACES_$(pkg) = $(DEB_SUGAR_SOURCE_PKGBASE)
-
 clean::
 	find -name *.mo -delete
 	find -name *.linfo -delete

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