[Pkg-sugar-commit] [sugar-toolkit] 81/118: Merge branch 'git+git+tarball+misc' of git://git.debian.org/git/collab-maint/cdbs-skel into master-0.84
Jonas Smedegaard
dr at jones.dk
Thu Apr 16 18:49:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag debian/0.84.10-1
in repository sugar-toolkit.
commit 932f5610078b6ab273169856e284b0e39d2dc204
Merge: 059a4c0 5aca1b1
Author: Jonas Smedegaard <dr at jones.dk>
Date: Mon Feb 8 19:26:25 2010 +0100
Merge branch 'git+git+tarball+misc' of git://git.debian.org/git/collab-maint/cdbs-skel into master-0.84
Conflicts (manually resolved: use pulled-in files from 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
More information about the pkg-sugar-commit
mailing list