[Pkg-sugar-commit] [sugar-datastore] 02/04: Merge branch 'master' into master-0.84

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/0.84.0-3
in repository sugar-datastore.

commit 25c0bdd7c42a14eea5564a6de78b883cbb6dfa25
Merge: 78d1753 f99e065
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Sep 18 13:04:36 2009 +0200

    Merge branch 'master' into master-0.84

 debian/cdbs/1/rules/copyright-check.mk   |  4 +-
 debian/cdbs/1/rules/package-relations.mk | 70 ++++++++++++++------------------
 debian/cdbs/1/rules/upstream-tarball.mk  | 15 ++++++-
 debian/changelog                         | 17 ++++++++
 debian/control                           |  7 ++--
 debian/control.in                        |  2 +-
 debian/copyright                         |  5 ++-
 debian/copyright_hints                   |  4 +-
 8 files changed, 73 insertions(+), 51 deletions(-)

diff --cc debian/control.in
index 2c79505,484c8e0..826c1d3
--- a/debian/control.in
+++ b/debian/control.in
@@@ -4,9 -4,9 +4,9 @@@ Priority: optiona
  Maintainer: Debian OLPC <debian-olpc-devel at lists.alioth.debian.org>
  Uploaders: Jonas Smedegaard <dr at jones.dk>
  Build-Depends: @cdbs@
- Standards-Version: 3.8.1
+ Standards-Version: 3.8.3
  Vcs-Git: git://git.debian.org/git/collab-maint/sugar-datastore.git
 -Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-datastore.git;a=summary
 +Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-datastore.git;a=shortlog;h=refs/heads/master-0.84
  Homepage: http://wiki.sugarlabs.org/go/Sugar
  XS-Python-Version: >= 2.5
  

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