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

commit 0776f8001da75c0d08311b207d4117028d7a8084
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jun 15 17:14:50 2015 -0500

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

diff --git a/debian/control.in b/debian/control.in
index 0124986..6f93e93 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,4 +1,4 @@
-Source: sugar-base-0.98
+Source: sugar-base
 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-base
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-sugar/sugar-base.git
 Homepage: http://wiki.sugarlabs.org/go/Sugar
 
-Package: python-sugar-0.98
+Package: python-sugar
 Architecture: any
 Depends: ${cdbs:Depends},
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 1c80820..26026ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,11 +22,10 @@ include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-autotools.mk
 
-pkgbase = python-sugar
+pkg = python-sugar
 pkgbranch = $(basename $(DEB_UPSTREAM_VERSION))
-pkg = $(pkgbase)-$(pkgbranch)
 
-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.bz2
 
@@ -39,11 +38,6 @@ CDBS_BUILD_DEPENDS += , python-gtk2-dev, python-gobject-dev, intltool
 CDBS_DEPENDS_DEFAULT = python-gobject, python-decorator
 CDBS_SUGGESTS_DEFAULT = ipython
 
-# Ensure only one variant is installed at a time (Debian Policy 7.6.2)
-CDBS_PROVIDES_DEFAULT = $(pkgbase)
-CDBS_CONFLICTS_DEFAULT = $(pkgbase)
-CDBS_REPLACES_DEFAULT = $(pkgbase)
-
 # Remove .la file
 binary-post-install/$(pkg)::
 	find $(DEB_DESTDIR)/usr -type f -name '*.la' -delete

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