[Pkg-sugar-commit] [sugar-toolkit] 04/06: Merge branch 'git+git+tarball+misc' of git://git.debian.org/git/collab-maint/cdbs-skel into master-0.86

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/0.86.2-3
in repository sugar-toolkit.

commit c18c105ee72d9882a7ca3fb585d59de774acf1b6
Merge: 15d2e3a 5aca1b1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Feb 8 18:37:35 2010 +0100

    Merge branch 'git+git+tarball+misc' of git://git.debian.org/git/collab-maint/cdbs-skel into master-0.86
    
    Conflicts (manually resolved: used files from pulled-in cdbs-skel branch):
    	debian/cdbs/1/rules/copyright-check.mk
    	debian/cdbs/1/rules/package-relations.mk
    	debian/cdbs/1/rules/upstream-tarball.mk
    	debian/gbp.conf

 debian/README.source                     |  4 +---
 debian/cdbs/1/rules/copyright-check.mk   | 32 +++++++++++++++++++++-----------
 debian/cdbs/1/rules/package-relations.mk | 18 ++++++++++--------
 debian/cdbs/1/rules/upstream-tarball.mk  |  4 ++--
 4 files changed, 34 insertions(+), 24 deletions(-)

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