[Pkg-sugar-commit] [sugar-browse-activity] 13/32: Prepare release. Update changelog, control file and copyright hints.

[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 c6dcd36c77c59110773b71c896d958847c12307e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Sep 18 20:08:29 2009 +0200

    Prepare release. Update changelog, control file and copyright hints.
---
 debian/changelog | 17 +++++++++++++++++
 debian/control   |  2 +-
 debian/rules     | 16 ++++++----------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04af8b3..757a5dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+sugar-browse-activity-0.84 (108-6) unstable; urgency=low
+
+  * Replace patch 1002 with improved workaround from upstream jhconvert
+    tool.
+  * Provide, conflict with and replace sugar-web-activity.
+  * Update CDBS snippets:
+    + Fix use underscore (not dash) for internal variables.
+    + Fix build-depend unversioned on python-sugar-toolkit, to allow
+      branched packages.
+    + Build-depend branched/unbranched on python-sugar-toolkit based on
+      new variable DEB_SUGAR_BRANCHES in python-sugar.mk.
+    + Add convenience variable DEB_SUGAR_SOURCE_PKGBASE to
+      python-sugar.mk.
+  * Fix build-depend on branched python-sugar-toolkit.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 18 Sep 2009 20:07:48 +0200
+
 sugar-browse-activity-0.84 (108-5) unstable; urgency=low
 
   * Rename package basename sugar-web-activity → sugar-browse-activity.
diff --git a/debian/control b/debian/control
index ea8e16b..e091dc3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian OLPC <debian-olpc-devel at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
-Build-Depends: cdbs (>= 0.4.39), debhelper (>= 6), python-sugar, python-sugar-toolkit (>= 0.82.5), unzip, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo
+Build-Depends: cdbs (>= 0.4.39), debhelper (>= 6), python-sugar-0.84, python-sugar-toolkit-0.84, unzip, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-browse-activity.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-browse-activity.git;a=shortlog;h=refs/heads/master-0.84
diff --git a/debian/rules b/debian/rules
index c654575..ef58ba6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@
 # 02111-1307 USA.
 
 DEB_PYTHON_SYSTEM = pycentral
+DEB_SUGAR_BRANCHES = 0.84
 ifneq (,$(DEB_MAINTAINER_MODE))
   # Enable stuff not policy compliant (eg. unsuitable for build daemons)
   DEB_COPYRIGHT_CHECK_STRICT = yes
@@ -30,11 +31,6 @@ include debian/cdbs/1/rules/copyright-check.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 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)
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2
@@ -42,15 +38,15 @@ DEB_UPSTREAM_TARBALL_MD5 = 148b5bfbe7f51749b51515a6009ded28
 
 # Needed (always/seldom) at runtime
 #  python-rsvg fallbacks unneeded since python-rsvg 2.24.0-2: can be dropped after Squeeze+1
-CDBS_DEPENDS = python-sugar$(pkgbranches:%=-%), python-sugar-toolkit$(pkgbranches:%=-%), python-carquinyol$(pkgbranches:%=-%)
+CDBS_DEPENDS = $(call cdbs_sugar_anybranchdeps,python-sugar python-sugar-toolkit python-carquinyol)
 CDBS_DEPENDS += , python-rsvg | python-gnome2-desktop (<= 2.24.0-1), python-rsvg | librsvg2-common
 CDBS_DEPENDS += , python-gobject, python-gtk2, python-dbus, python-cjson, python-xpcom, python-hulahop
-CDBS_RECOMMENDS = sugar$(pkgbranches:%=-%), sugar-artwork$(pkgbranches:%=-%)
+CDBS_RECOMMENDS = $(call cdbs_sugar_anybranchdeps,sugar sugar-artwork)
 
 # Ensure only one variant is installed at a time (Debian Policy 7.6.2)
-CDBS_PROVIDES = $(pkgbase)
-CDBS_CONFLICTS = $(pkgbase)
-CDBS_REPLACES = $(pkgbase)
+CDBS_PROVIDES = $(DEB_SUGAR_SOURCE_PKGBASE)
+CDBS_CONFLICTS = $(DEB_SUGAR_SOURCE_PKGBASE)
+CDBS_REPLACES = $(DEB_SUGAR_SOURCE_PKGBASE)
 
 # Transitional quirk: sugar-web-activity renamed to sugar-browse-activity
 # (unneeded since Squeeze: can be dropped after Squeeze+1)

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