[Pkg-sugar-commit] [sugar-browse-activity] 03/32: Append major version (0.84) to binary and source package.

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/108-10
in repository sugar-browse-activity.

commit 29ba6f6919380606be9db19498f7af3eea320494
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Sep 12 13:43:16 2009 +0200

    Append major version (0.84) to binary and source package.
---
 debian/control.in | 8 +++++---
 debian/rules      | 6 ++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 8423488..fcc413e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,4 +1,4 @@
-Source: sugar-web-activity
+Source: sugar-web-activity-0.84
 Section: x11
 Priority: optional
 Maintainer: Debian OLPC <debian-olpc-devel at lists.alioth.debian.org>
@@ -10,11 +10,13 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-web-activity.git;a=shor
 Homepage: http://sugarlabs.org/go/Activities#Browse
 XS-Python-Version: >= 2.5
 
-Package: sugar-web-activity
+Package: sugar-web-activity-0.84
 Architecture: all
 Depends: ${shlibs:Depends}, ${python:Depends}, ${cdbs:Depends}, ${misc:Depends}
 Recommends: ${cdbs:Recommends}
-Provides: ${python:Provides}
+Provides: ${python:Provides}, ${cdbs:Provides}
+Conflicts: ${cdbs:Conflicts}
+Replaces: ${cdbs:Replaces}
 XB-Python-Version: ${python:Versions}
 Description: web browsing activity for the Sugar graphical shell
  Sugar is a graphical user interface aimed at children.
diff --git a/debian/rules b/debian/rules
index 8c3c8e3..6caced4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,7 @@ include debian/cdbs/1/rules/buildinfo.mk
 # Comment out when all current branches are supported
 # FIXME: really make this plural - only a single branch handled for now
 pkgbranches = 0.84
+pkgbase = $(DEB_SOURCE_PACKAGE:%-$(firstword $(pkgbranches))=%)
 
 DEB_UPSTREAM_PACKAGE = Browse
 DEB_UPSTREAM_URL = http://download.sugarlabs.org/sources/sucrose/fructose/$(DEB_UPSTREAM_PACKAGE)
@@ -46,5 +47,10 @@ CDBS_DEPENDS += , python-rsvg | python-gnome2-desktop (<= 2.24.0-1), python-rsvg
 CDBS_DEPENDS += , python-gobject, python-gtk2, python-dbus, python-cjson, python-xpcom, python-hulahop
 CDBS_RECOMMENDS = sugar$(pkgbranches:%=-%), sugar-artwork$(pkgbranches:%=-%)
 
+# Ensure only one variant is installed at a time (Debian Policy 7.6.2)
+CDBS_PROVIDES = $(pkgbase)
+CDBS_CONFLICTS = $(pkgbase)
+CDBS_REPLACES = $(pkgbase)
+
 # Resolve, cleanup and apply CDBS-declared dependencies
 include debian/cdbs/1/rules/package-relations.mk

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