[Pkg-sugar-commit] [sugar-base] 08/13: Update changelog, control file and copyright hints.

Jonas Smedegaard dr at jones.dk
Fri Apr 17 07:41:24 UTC 2015


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

js pushed a commit to annotated tag debian/0.84.1-3
in repository sugar-base.

commit 1b607e0f9cd08c3c5d694e950000fc9f63165d93
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Mar 24 10:46:23 2010 +0100

    Update changelog, control file and copyright hints.
---
 debian/changelog       |  18 ++
 debian/control         |   4 +-
 debian/copyright_hints | 458 ++++++++++++++++++++++++-------------------------
 3 files changed, 249 insertions(+), 231 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7645ab..70262e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+sugar-base-0.84 (0.84.1-3) UNRELEASED; urgency=low
+
+  * Set master-0.84 as master branch in gbp.conf.
+  * Set non-build dependencies using recursively-expanded variables (=,
+    not :=) in debian/rules.
+  * Use branch shortlog in Vcs-Browser stanza.
+  * Drop all local CDBS snippets: included with main cdbs package now.
+  * Switch to source format "3.0 (quilt)".
+  * Drop patchsys-quilt.mk snippet: superfluous with source format "3.0
+    (quilt)".
+  * Refresh and unfuzz patches.
+  * Drop build-dependencies on quilt and patchutils.
+  * Relax build-dependencies on python-central and python-all-dev.
+  * Relax build-dependency on devscripts slightly, to ease backporting.
+  * Tighten build-dependency on cdbs.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Wed, 24 Mar 2010 10:44:20 +0100
+
 sugar-base-0.84 (0.84.1-2) unstable; urgency=low
 
   * Rewrite copyright to use DEP5 r54 proposed machine-readable format.
diff --git a/debian/control b/debian/control
index 8329e14..2ee19e7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: python
 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), autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), debhelper (>= 6), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), dh-buildinfo, python-gtk2-dev, python-gobject-dev (>= 2) | python-gtk2-dev (<< 2.9), intltool, chrpath
+Build-Depends: autotools-dev, devscripts (>= 2.10.7~), dh-buildinfo, debhelper (>= 6), python-central, cdbs (>= 0.4.73~), python-all-dev, python-gtk2-dev, python-gobject-dev (>= 2) | python-gtk2-dev (<< 2.9), intltool, chrpath
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-base.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-base.git;a=summary
+Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-base.git;a=shortlog;h=refs/heads/master-0.84
 Homepage: http://wiki.sugarlabs.org/go/Sugar
 XS-Python-Version: >= 2.5
 
diff --git a/debian/copyright_hints b/debian/copyright_hints
index b8f2895..8798f3f 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,274 +1,274 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION
-Name: Untrusted draft - double-check copyrights yourself!
-
-Files: po/af.po
-	po/am.po
-	po/ar.po
-	po/ay.po
-	po/bg.po
-	po/bn.po
-	po/bn_IN.po
-	po/ca.po
-	po/de.po
-	po/dz.po
-	po/el.po
-	po/en.po
-	po/es.po
-	po/fa.po
-	po/fa_AF.po
-	po/ff.po
-	po/fr.po
-	po/gu.po
-	po/ha.po
-	po/hi.po
-	po/ht.po
-	po/ig.po
-	po/is.po
-	po/it.po
-	po/ja.po
-	po/km.po
-	po/ko.po
-	po/mk.po
-	po/ml.po
-	po/mn.po
-	po/mr.po
-	po/mvo.po
-	po/nb.po
-	po/ne.po
-	po/nl.po
-	po/pa.po
-	po/pap.po
-	po/pis.po
-	po/pl.po
-	po/ps.po
-	po/pt.po
-	po/pt_BR.po
-	po/qu.po
-	po/ro.po
-	po/ru.po
-	po/rw.po
-	po/sd.po
-	po/si.po
-	po/sl.po
-	po/te.po
-	po/th.po
-	po/tpi.po
-	po/tr.po
-	po/ur.po
-	po/vi.po
-	po/yo.po
-	po/zh_CN.po
-	po/zh_TW.po
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
+X-Draft: Autogenerated by CDBS snippet copyright-check.mk
+
+Files: ./po/af.po,
+	./po/am.po,
+	./po/ar.po,
+	./po/ay.po,
+	./po/bg.po,
+	./po/bn.po,
+	./po/bn_IN.po,
+	./po/ca.po,
+	./po/de.po,
+	./po/dz.po,
+	./po/el.po,
+	./po/en.po,
+	./po/es.po,
+	./po/fa.po,
+	./po/fa_AF.po,
+	./po/ff.po,
+	./po/fr.po,
+	./po/gu.po,
+	./po/ha.po,
+	./po/hi.po,
+	./po/ht.po,
+	./po/ig.po,
+	./po/is.po,
+	./po/it.po,
+	./po/ja.po,
+	./po/km.po,
+	./po/ko.po,
+	./po/mk.po,
+	./po/ml.po,
+	./po/mn.po,
+	./po/mr.po,
+	./po/mvo.po,
+	./po/nb.po,
+	./po/ne.po,
+	./po/nl.po,
+	./po/pa.po,
+	./po/pap.po,
+	./po/pis.po,
+	./po/pl.po,
+	./po/ps.po,
+	./po/pt.po,
+	./po/pt_BR.po,
+	./po/qu.po,
+	./po/ro.po,
+	./po/ru.po,
+	./po/rw.po,
+	./po/sd.po,
+	./po/si.po,
+	./po/sl.po,
+	./po/te.po,
+	./po/th.po,
+	./po/tpi.po,
+	./po/tr.po,
+	./po/ur.po,
+	./po/vi.po,
+	./po/yo.po,
+	./po/zh_CN.po,
+	./po/zh_TW.po
 Copyright: YEAR THE PACKAGE'S HOLDER
 License: UNKNOWN
-
-Files: Makefile.am
-	NEWS
-	configure.ac
-	debian/README.source
-	debian/TODO
-	debian/compat
-	debian/control
-	debian/control.in
-	debian/gbp.conf
-	debian/patches/2991_enable_danish_l10n.patch
-	debian/patches/README
-	debian/patches/series
-	debian/pycompat
-	debian/watch
-	intltool-extract.in
-	intltool-merge.in
-	intltool-update.in
-	m4/gnome-compiler-flags.m4
-	m4/python.m4
-	po/POTFILES.in
-	src/Makefile.am
-	src/sugar/Makefile.am
-	src/sugar/_sugarbaseext.defs
-	src/sugar/_sugarbaseext.override
-	src/sugar/dispatch/Makefile.am
-	src/sugar/dispatch/__init__.py
-	src/sugar/dispatch/dispatcher.py
-	src/sugar/dispatch/saferef.py
+ FIXME
+
+Files: ./Makefile.am,
+	./NEWS,
+	./configure.ac,
+	./debian/README.source,
+	./debian/TODO,
+	./debian/compat,
+	./debian/control,
+	./debian/control.in,
+	./debian/gbp.conf,
+	./debian/patches/2991_enable_danish_l10n.patch,
+	./debian/patches/README,
+	./debian/patches/series,
+	./debian/pycompat,
+	./debian/source/format,
+	./debian/watch,
+	./intltool-extract.in,
+	./intltool-merge.in,
+	./intltool-update.in,
+	./m4/gnome-compiler-flags.m4,
+	./m4/python.m4,
+	./po/POTFILES.in,
+	./src/Makefile.am,
+	./src/sugar/Makefile.am,
+	./src/sugar/_sugarbaseext.defs,
+	./src/sugar/_sugarbaseext.override,
+	./src/sugar/dispatch/Makefile.am,
+	./src/sugar/dispatch/__init__.py,
+	./src/sugar/dispatch/dispatcher.py,
+	./src/sugar/dispatch/saferef.py
 Copyright: *No copyright*
 License: UNKNOWN
-
-Files: src/sugar/xdgmime.h
-	src/sugar/xdgmimeglob.c
-	src/sugar/xdgmimeglob.h
-	src/sugar/xdgmimeint.c
-	src/sugar/xdgmimeint.h
-	src/sugar/xdgmimemagic.c
-	src/sugar/xdgmimemagic.h
+ FIXME
+
+Files: ./src/sugar/xdgmime.c,
+	./src/sugar/xdgmime.h,
+	./src/sugar/xdgmimeglob.c,
+	./src/sugar/xdgmimeglob.h,
+	./src/sugar/xdgmimeint.c,
+	./src/sugar/xdgmimeint.h,
+	./src/sugar/xdgmimemagic.c,
+	./src/sugar/xdgmimemagic.h
 Copyright: 2003, Jonathan Blandford <jrb at alum.mit.edu>
 	2003, Red Hat, Inc
+	2003-2004, Jonathan Blandford <jrb at alum.mit.edu>
+	2003-2004, Red Hat, Inc
 License: LGPL-2+
+ FIXME
 
-Files: Makefile.in
-	src/Makefile.in
-	src/sugar/Makefile.in
-	src/sugar/dispatch/Makefile.in
-Copyright: 1994-2002
-License: UNKNOWN (GENERATED FILE)
+Files: ./src/sugar/xdgmimealias.c,
+	./src/sugar/xdgmimealias.h,
+	./src/sugar/xdgmimeparent.c,
+	./src/sugar/xdgmimeparent.h
+Copyright: 200 Matthias Clasen <mclasen at redhat.com>
+	2004, Matthias Clasen <mclasen at redhat.com>
+	2004, Red Hat, Inc
+License: LGPL-2+
+ FIXME
 
-Files: compile
-	depcomp
-Copyright: 1999-2000, 2003-2005, Free Software Foundation, Inc
-License: GPL (GENERATED FILE)
+Files: ./Makefile.in,
+	./src/Makefile.in,
+	./src/sugar/Makefile.in,
+	./src/sugar/dispatch/Makefile.in
+Copyright: 1994-2002
+License: UNKNOWN
+ FIXME
 
-Files: debian/cdbs/1/class/autotools-vars.mk
-	debian/cdbs/1/class/makefile.mk
-Copyright: 2002-2003, Colin Walters <walters at debian.org>
-	2003,2008, Jonas Smedegaard <dr at jones.dk>
-License: GPL
+Files: ./m4/ltoptions.m4,
+	./m4/ltsugar.m4,
+	./m4/ltversion.m4,
+	./m4/lt~obsolete.m4
+Copyright: 2004, Free Software Foundation, Inc
+	2004-2005, 2007 Free Software Foundation, Inc
+	2004-2005, 2007-2008, Free Software Foundation, Inc
+License: UNKNOWN
+ FIXME
 
-Files: debian/cdbs/1/class/autotools.mk
-	debian/cdbs/1/class/makefile-vars.mk
-Copyright: 2002-2003, Colin Walters <walters at debian.org>
-	2008, Jonas Smedegaard <dr at jones.dk>
+Files: ./compile,
+	./depcomp,
+	./py-compile
+Copyright: 1999-2000, 2003-2005, Free Software Foundation, Inc
+	2000-2001, 2003-2005, Free Software Foundation, Inc
 License: GPL
+ FIXME
 
-Files: debian/cdbs/1/class/python-autotools.mk
-	debian/cdbs/1/rules/package-relations.mk
-Copyright: 2008, Jonas Smedegaard <dr at jones.dk>
-License: GPL
+Files: ./config.guess,
+	./config.sub
+Copyright: 1992-1999,
+	1992-2001
+License: GPL-2+
+ FIXME
 
-Files: src/sugar/xdgmimealias.h
-	src/sugar/xdgmimeparent.h
-Copyright: 200 Matthias Clasen <mclasen at redhat.com>
-	2004, Red Hat, Inc
+Files: ./src/sugar/xdgmimecache.c,
+	./src/sugar/xdgmimecache.h
+Copyright: 2005, Matthias Clasen <mclasen at redhat.com>
 License: LGPL-2+
+ FIXME
 
-Files: src/sugar/xdgmimealias.c
-	src/sugar/xdgmimeparent.c
-Copyright: 2004, Matthias Clasen <mclasen at redhat.com>
-	2004, Red Hat, Inc
+Files: ./src/sugar/__init__.py,
+	./src/sugar/mime.py
+Copyright: 2006-2007, Red Hat, Inc
+	2007, One Laptop Per Child
+	2007-2008, One Laptop Per Child
 License: LGPL-2+
+ FIXME
 
-Files: src/sugar/xdgmimecache.c
-	src/sugar/xdgmimecache.h
-Copyright: 2005, Matthias Clasen <mclasen at redhat.com>
+Files: ./src/sugar/_sugarbaseextmodule.c,
+	./src/sugar/logger.py
+Copyright: 2006-2007, Red Hat, Inc
+	2007, Red Hat, Inc
 License: LGPL-2+
+ FIXME
 
-Files: m4/ltsugar.m4
-	m4/lt~obsolete.m4
-Copyright: 2004-2005, 2007, Free Software Foundation, Inc
+Files: ./debian/patches/1001_enable_danish_l10n.patch,
+	./po/da.po
+Copyright: 2008-2009, Jonas Smedegaard <dr at jones.dk>
 License: UNKNOWN
+ FIXME
 
-Files: src/sugar/dispatch/license.txt
-Copyright: HOLDERS AND CONTRIBUTORS "AS IS" AND
+Files: ./src/sugar/dispatch/license.txt
+Copyright: 2001-2003, Patrick K. O'Brien and Contributors
+	Django Software Foundation and individual contributors
 	HOLDERS AND CONTRIBUTORS
+	HOLDERS AND CONTRIBUTORS "AS IS" AND
 	HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT
-	Django Software Foundation and individual contributors
-	2001-2003, Patrick K. O'Brien and Contributors
 	OWNER OR CONTRIBUTORS BE LIABLE FOR
 License: BSD (3 clause)
+ FIXME
 
-Files: missing
+Files: ./missing
 Copyright: 1996-1997, 1999-2000, 2002-2005
-License: GPL (GENERATED FILE)
-
-Files: py-compile
-Copyright: 2000-2001, 2003-2005, Free Software Foundation, Inc
-License: GPL (GENERATED FILE)
-
-Files: debian/cdbs/1/class/python-vars.mk
-Copyright: 2003,2008, Jonas Smedegaard <dr at jones.dk>
 License: GPL
+ FIXME
 
-Files: debian/cdbs/1/rules/buildinfo.mk
-Copyright: 2004-2007, Jonas Smedegaard <dr at jones.dk>
-License: GPL
-
-Files: debian/cdbs/1/rules/upstream-tarball.mk
-Copyright: 2007-2008, Jonas Smedegaard <dr at jones.dk>
-License: GPL
-
-Files: debian/rules
-Copyright: 2007-2009, Jonas Smedegaard <dr at jones.dk>
-License: GPL
-
-Files: debian/cdbs/1/rules/copyright-check.mk
-Copyright: \s*(\S.*?)\s*\
+Files: ./debian/rules
+Copyright: 2007-2010, Jonas Smedegaard <dr at jones.dk>
 License: GPL
+ FIXME
+
+Files: ./configure
+Copyright: (ISLOWER ? 'A' + ( - 'a') : )
+	(ISLOWER ? ( | 0x40) : )
+	1992-1996, 1998-2001,
+	1996-2001, 2003-2005
+	2006, Free Software Foundation, Inc
+License: GPL-2+
+ FIXME
 
-Files: config.guess
-Copyright: 1992-1999,
-	1992-2001
-License: GPL-2+ (GENERATED FILE)
+Files: ./m4/libtool.m4
+Copyright: 1996-2001, 2003-2005
+	2008, Free Software Foundation, Inc
+License: GPL-2+
+ FIXME
 
-Files: config.sub
-Copyright: 1992-1999
-License: GPL-2+ (GENERATED FILE)
+Files: ./aclocal.m4
+Copyright: 1995-2002, Free Software Foundation, Inc
+	1995-2003, 2005-2006, Free Software Foundation, Inc
+	1996-1997, 2000-2001, 2003, 2005,
+	1996-2004,
+	1996-2005,
+	1997, 1999-2001, 2003, 2005
+	1997, 2000-2001, 2003-2005,
+	1999-2005,
+	2001, 2003, 2005, Free Software Foundation, Inc
+	2001-2003, 2005 Free Software Foundation, Inc
+	2001-2004, Red Hat, Inc
+	2002-2003, 2005 Free Software Foundation, Inc
+	2003, 2005 Free Software Foundation, Inc
+	2003-2005, Free Software Foundation, Inc
+	2004, Scott James Remnant <scott at netsplit.com>
+	2004-2005, Free Software Foundation, Inc
+License: GPL-2+
+ FIXME
 
-Files: m4/intltool.m4
+Files: ./m4/intltool.m4
 Copyright: 2001, Eazel, Inc
-License: GPL-2+ (GENERATED FILE)
-
-Files: m4/libtool.m4
-Copyright: 1996-2001, 2003-2005
 License: GPL-2+
+ FIXME
 
-Files: ltmain.sh
+Files: ./ltmain.sh
 Copyright: 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc
 License: GPL-2+
-
-Files: src/sugar/xdgmime.c
-Copyright: 2003-2004, Red Hat, Inc
-	2003-2004, Jonathan Blandford <jrb at alum.mit.edu>
-License: LGPL-2+
-
-Files: src/sugar/__init__.py
-Copyright: 2006-2007, Red Hat, Inc
-	2007-2008, One Laptop Per Child
-License: LGPL-2+
-
-Files: src/sugar/_sugarbaseextmodule.c
-Copyright: 2006-2007, Red Hat, Inc
-License: LGPL-2+
-
-Files: src/sugar/mime.py
-Copyright: 2007, One Laptop Per Child
-	2006-2007, Red Hat, Inc
-License: LGPL-2+
-
-Files: src/sugar/logger.py
-Copyright: 2007, Red Hat, Inc
-License: LGPL-2+
-
-Files: install-sh
+ FIXME
+
+Files: ./COPYING
+Copyright: 1991, 1999 Free Software Foundation, Inc
+	<year> <name of author>
+	HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+	HOLDERS AND/OR
+	disclaimer" for the library, if
+	holder or
+	holder who places the Library under this License may add
+	interest in the
+	law: that is to say, a work containing the Library or a
+	notices, you must include the
+	the
+License: LGPL-2.1+
+ FIXME
+
+Files: ./install-sh
 Copyright: 1994, X Consortium
 License: MIT/X11 (BSD like)
+ FIXME
 
-Files: configure
-Copyright: 1992-1996, 1998-2001
-License: UNKNOWN (GENERATED FILE)
-
-Files: aclocal.m4
-Copyright: 1995-2002, Free Software Foundation, Inc
-	2001-2004, Red Hat, Inc
-	1996-2004
-License: UNKNOWN (GENERATED FILE)
-
-Files: po/Makefile.in.in
-Copyright: 1995-1997, by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+Files: ./po/Makefile.in.in
+Copyright: 1995-1997, Ulrich Drepper <drepper at gnu.ai.mit.edu>
 	2004-2008, Rodney Dawes <dobey.pwns at gmail.com>
 License: UNKNOWN
-
-Files: m4/ltversion.m4
-Copyright: 2004, Free Software Foundation, Inc
-License: UNKNOWN
-
-Files: m4/ltoptions.m4
-Copyright: 2004-2005, 2007-2008, Free Software Foundation, Inc
-License: UNKNOWN
-
-Files: debian/patches/1001_enable_danish_l10n.patch
-Copyright: 2008-2009, Jonas Smedegaard <dr at jones.dk>
-License: UNKNOWN
-
-Files: COPYING
-Copyright: the
-	1991, 1999, Free Software Foundation, Inc
-License: UNKNOWN
+ FIXME
 

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



More information about the pkg-sugar-commit mailing list