[Pkg-sugar-commit] [sugar-browse-activity] 05/32: Prepare release. Update changelog and control file.

[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 c8faf2aff595e925682b8bcf92f76b493f642612
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Sep 12 13:47:34 2009 +0200

    Prepare release. Update changelog and control file.
---
 debian/changelog |  9 +++++++--
 debian/control   | 10 ++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc6c815..5cb1b3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
-sugar-web-activity (108-4) UNRELEASED; urgency=low
+sugar-web-activity-0.84 (108-4) unstable; urgency=low
 
+  * Rename package to make room for multiple branches:
+    + Set versioned upstream and debian branches in gbp.conf.
+    + Use branch shortlog in Vcs-Browser stanza.
+    + Append major version (0.84) to binary and source package.
   * Update CDBS snippets:
     + Enhance package-relations.mk to support all binary package
       relations (except -indep ones).
@@ -11,8 +15,9 @@ sugar-web-activity (108-4) UNRELEASED; urgency=low
     + Update URL to draft DEP5 format in copyright-check.mk output.
   * Fix double build-dependency on cdbs.
   * Update debian/control format to DEP5 rev54.
+  * Disable watch file. Add note on lack of upstream namespace.
 
- -- Jonas Smedegaard <dr at jones.dk>  Fri, 11 Sep 2009 23:57:56 +0200
+ -- Jonas Smedegaard <dr at jones.dk>  Sat, 12 Sep 2009 13:46:47 +0200
 
 sugar-web-activity (108-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 99627d7..a815a41 100644
--- a/debian/control
+++ b/debian/control
@@ -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>
@@ -6,15 +6,17 @@ 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
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-web-activity.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-web-activity.git;a=summary
+Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-web-activity.git;a=shortlog;h=refs/heads/master-0.84
 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.

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