[Pkg-sugar-commit] [sugar-toolkit] 05/10: 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-toolkit.

commit ad9ea994f1e81b1c315f876138a0f92b7e62fe47
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jun 16 08:33:16 2015 -0500

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

diff --git a/debian/control.in b/debian/control.in
index 5ff61c3..a551b6d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,4 +1,4 @@
-Source: sugar-toolkit-0.98
+Source: sugar-toolkit
 Section: oldlibs
 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-toolkit
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-sugar/sugar-toolkit.git
 Homepage: http://wiki.sugarlabs.org/go/Sugar
 
-Package: python-sugar-toolkit-0.98
+Package: python-sugar-toolkit
 Architecture: any
 Depends: ${cdbs:Depends},
  ${misc:Depends},
@@ -18,10 +18,7 @@ Depends: ${cdbs:Depends},
  ${shlibs:Depends}
 Recommends: ${cdbs:Recommends}
 Suggests: ${cdbs:Suggests}
-Provides: ${cdbs:Provides},
- ${python:Provides}
-Conflicts: ${cdbs:Conflicts}
-Replaces: ${cdbs:Replaces}
+Provides: ${python:Provides}
 Description: Sugar Learning Platform - legacy core widgets
  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 2be9477..81db440 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,9 +25,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 pkgbase = python-sugar-toolkit
 pkgbranch = $(basename $(DEB_UPSTREAM_VERSION))
-pkg = $(pkgbase)-$(pkgbranch)
+pkg = $(pkgbase)
 
-DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE:%-$(pkgbranch)=%)
+DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE)
 DEB_UPSTREAM_URL = http://download.sugarlabs.org/sources/sucrose/glucose/$(DEB_UPSTREAM_PACKAGE)
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.bzip2
 
@@ -79,11 +79,6 @@ CDBS_DEPENDS_$(pkg) = $(depends)
 CDBS_RECOMMENDS_$(pkg) = $(recommends)
 CDBS_SUGGESTS_$(pkg) = $(suggests)
 
-# Ensure only one variant is installed at a time (Debian Policy 7.6.2)
-CDBS_PROVIDES_$(pkg) = $(pkgbase)
-CDBS_CONFLICTS_$(pkg) = $(pkgbase)
-CDBS_REPLACES_$(pkg) = $(pkgbase)
-
 # Avoid .la files - see http://wiki.debian.org/ReleaseGoals/LAFileRemoval
 binary-post-install/$(pkg)::
 	find '$(cdbs_curdestdir)' -name '*.la' -delete

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