[Pkg-sugar-commit] [sugar-toolkit] 83/118: Update changelog, control file and copyright hints.
Jonas Smedegaard
dr at jones.dk
Thu Apr 16 18:49:45 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 8d20dc6caaaca7d03cb4b5ced82c078bffcc4fc6
Author: Jonas Smedegaard <dr at jones.dk>
Date: Mon Feb 8 19:57:55 2010 +0100
Update changelog, control file and copyright hints.
---
debian/changelog | 21 +++
debian/control | 4 +-
debian/copyright_hints | 376 +++++++++++++++++++++++++------------------------
3 files changed, 213 insertions(+), 188 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 933ad4a..4f0cf10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+sugar-toolkit-0.84 (0.84.7-2) UNRELEASED; urgency=low
+
+ * Update local cdbs snippets:
+ + Update package-relations.mk: Cleanup and tighten dependencies.
+ Improve whitespace cleanup. Rewrite and silence applying
+ dependencies.
+ + Let copyright-check.mk investigate top 99999 lines (not just 60 as
+ default for licensecheck), and make it configurable with
+ DEB_COPYRIGHT_CHECK_PARSELINES. Silence (GENERATED FILE) licensing
+ notices. Group ownerships by sorted owner list (ignoring years).
+ + Update upstream-tarball.mk to preserve bzip2 tarballs with source
+ format 3.0 (quilt).
+ * Use source format '3.0 "quilt"'.
+ * Add DEP3 header to patches.
+ * Bump Standards-Version to 3.8.4.
+ * Update debian/copyright: reorganize (to closer match autogenerated
+ copyright hints), fix a few years, add new owner (no new license).
+ * Cleanup double cdbs build-dependency.
+
+ -- Jonas Smedegaard <dr at jones.dk> Mon, 08 Feb 2010 19:55:16 +0100
+
sugar-toolkit-0.84 (0.84.7-1) unstable; urgency=low
* New upstream bugfix release.
diff --git a/debian/control b/debian/control
index aba44a9..119d00b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ 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, quilt, patchutils (>= 0.2.25), devscripts (>= 2.10.7), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 6), dh-buildinfo, libglib2.0-dev, python-gtk2-dev, libsm-dev, libice-dev, libasound2-dev | libasound-dev, gettext, intltool, libxml-parser-perl, chrpath
-Standards-Version: 3.8.3
+Build-Depends: autotools-dev, quilt, patchutils (>= 0.2.25), cdbs, devscripts (>= 2.10.7), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 6), dh-buildinfo, libglib2.0-dev, python-gtk2-dev, libsm-dev, libice-dev, libasound2-dev | libasound-dev, gettext, intltool, libxml-parser-perl, chrpath
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/collab-maint/sugar-toolkit.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-toolkit.git;a=shortlog;h=refs/heads/master-0.84
Homepage: http://wiki.sugarlabs.org/go/Sugar
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 21e649b..928e6fa 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -3,7 +3,6 @@ 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
@@ -61,6 +60,53 @@ Files: po/af.po
Copyright: YEAR THE PACKAGE'S HOLDER
License: UNKNOWN
+Files: src/sugar/_sugarextmodule.c
+ src/sugar/activity/__init__.py
+ src/sugar/activity/activityfactory.py
+ src/sugar/activity/activityhandle.py
+ src/sugar/activity/activityservice.py
+ src/sugar/activity/bundlebuilder.py
+ src/sugar/activity/main.py
+ src/sugar/bundle/__init__.py
+ src/sugar/bundle/activitybundle.py
+ src/sugar/bundle/bundle.py
+ src/sugar/eggaccelerators.h
+ src/sugar/env.py
+ src/sugar/graphics/__init__.py
+ src/sugar/graphics/animator.py
+ src/sugar/graphics/entry.py
+ src/sugar/graphics/icon.py
+ src/sugar/graphics/palettegroup.py
+ src/sugar/graphics/panel.py
+ src/sugar/graphics/roundbox.py
+ src/sugar/graphics/style.py
+ src/sugar/graphics/toggletoolbutton.py
+ src/sugar/graphics/toolbox.py
+ src/sugar/graphics/toolcombobox.py
+ src/sugar/graphics/window.py
+ src/sugar/graphics/xocolor.py
+ src/sugar/network.py
+ src/sugar/presence/__init__.py
+ src/sugar/presence/activity.py
+ src/sugar/presence/buddy.py
+ src/sugar/presence/presenceservice.py
+ src/sugar/profile.py
+ src/sugar/session.py
+ src/sugar/sugar-address-entry.c
+ src/sugar/sugar-address-entry.h
+ src/sugar/sugar-grid.c
+ src/sugar/sugar-grid.h
+ src/sugar/sugar-key-grabber.c
+ src/sugar/sugar-key-grabber.h
+ src/sugar/sugar-menu.c
+ src/sugar/sugar-menu.h
+ src/sugar/wm.py
+Copyright: 2002, Red Hat, Inc
+ 2006-2007, Red Hat, Inc
+ 2007, Red Hat, Inc
+ 2008, Red Hat, Inc
+License: LGPL-2+
+
Files: AUTHORS
Makefile.am
README
@@ -76,6 +122,7 @@ Files: AUTHORS
debian/patches/README
debian/patches/series
debian/pycompat
+ debian/source/format
debian/watch
intltool-extract.in
intltool-merge.in
@@ -86,6 +133,7 @@ Files: AUTHORS
po/POTFILES.skip
src/Makefile.am
src/sugar/Makefile.am
+ src/sugar/_sugarext.c
src/sugar/_sugarext.defs
src/sugar/_sugarext.override
src/sugar/activity/Makefile.am
@@ -99,48 +147,6 @@ Files: AUTHORS
Copyright: *No copyright*
License: UNKNOWN
-Files: src/sugar/_sugarextmodule.c
- src/sugar/activity/__init__.py
- src/sugar/activity/activityfactory.py
- src/sugar/activity/activityhandle.py
- src/sugar/activity/activityservice.py
- src/sugar/bundle/__init__.py
- src/sugar/env.py
- src/sugar/graphics/__init__.py
- src/sugar/graphics/icon.py
- src/sugar/graphics/roundbox.py
- src/sugar/graphics/xocolor.py
- src/sugar/network.py
- src/sugar/presence/__init__.py
- src/sugar/profile.py
- src/sugar/sugar-address-entry.c
- src/sugar/sugar-address-entry.h
- src/sugar/sugar-key-grabber.c
- src/sugar/sugar-key-grabber.h
- src/sugar/sugar-menu.c
- src/sugar/sugar-menu.h
- src/sugar/util.py
-Copyright: 2006-2007, Red Hat, Inc
-License: LGPL-2+
-
-Files: src/sugar/bundle/activitybundle.py
- src/sugar/bundle/bundle.py
- src/sugar/graphics/animator.py
- src/sugar/graphics/entry.py
- src/sugar/graphics/palettegroup.py
- src/sugar/graphics/panel.py
- src/sugar/graphics/style.py
- src/sugar/graphics/toggletoolbutton.py
- src/sugar/graphics/toolbox.py
- src/sugar/graphics/toolcombobox.py
- src/sugar/graphics/window.py
- src/sugar/presence/activity.py
- src/sugar/presence/buddy.py
- src/sugar/presence/presenceservice.py
- src/sugar/wm.py
-Copyright: 2007, Red Hat, Inc
-License: LGPL-2+
-
Files: src/sugar/gsm-app.c
src/sugar/gsm-client-xsmp.c
src/sugar/gsm-client-xsmp.h
@@ -153,6 +159,20 @@ Files: src/sugar/gsm-app.c
Copyright: 2007, Novell, Inc
License: GPL-2+
+Files: src/sugar/activity/namingalert.py
+ src/sugar/datastore/__init__.py
+ src/sugar/datastore/datastore.py
+ src/sugar/graphics/alert.py
+ src/sugar/graphics/canvastextview.py
+ src/sugar/graphics/combobox.py
+ src/sugar/graphics/iconentry.py
+ src/sugar/graphics/objectchooser.py
+ src/sugar/graphics/tray.py
+Copyright: 2007, One Laptop Per Child
+ 2008, One Laptop Per Child
+ 2009, One Laptop Per Child
+License: LGPL-2+
+
Files: Makefile.in
src/Makefile.in
src/sugar/Makefile.in
@@ -162,25 +182,29 @@ Files: Makefile.in
src/sugar/graphics/Makefile.in
src/sugar/presence/Makefile.in
Copyright: 1994-2002
-License: UNKNOWN (GENERATED FILE)
+License: UNKNOWN
-Files: src/sugar/datastore/__init__.py
- src/sugar/datastore/datastore.py
- src/sugar/graphics/alert.py
- src/sugar/graphics/combobox.py
- src/sugar/graphics/iconentry.py
- src/sugar/graphics/objectchooser.py
- src/sugar/graphics/tray.py
-Copyright: 2007, One Laptop Per Child
-License: LGPL-2+
+Files: debian/cdbs/1/class/python-autotools.mk
+ debian/cdbs/1/class/python-vars.mk
+ debian/cdbs/1/rules/buildinfo.mk
+ debian/cdbs/1/rules/package-relations.mk
+ debian/cdbs/1/rules/upstream-tarball.mk
+ debian/rules
+Copyright: 2003,2008, Jonas Smedegaard <dr at jones.dk>
+ 2004-2007, Jonas Smedegaard <dr at jones.dk>
+ 2007-2008, Jonas Smedegaard <dr at jones.dk>
+ 2008, Jonas Smedegaard <dr at jones.dk>
+ 2008-2009, Jonas Smedegaard <dr at jones.dk>
+License: GPL
-Files: src/sugar/activity/bundlebuilder.py
- src/sugar/activity/main.py
- src/sugar/session.py
- src/sugar/sugar-grid.c
- src/sugar/sugar-grid.h
-Copyright: 2008, Red Hat, Inc
-License: LGPL-2+
+Files: debian/cdbs/1/class/autotools-vars.mk
+ debian/cdbs/1/class/autotools.mk
+ debian/cdbs/1/class/makefile-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>
+ 2008, Jonas Smedegaard <dr at jones.dk>
+License: GPL
Files: src/sugar/acme-volume-alsa.c
src/sugar/acme-volume-alsa.h
@@ -196,22 +220,23 @@ Files: src/sugar/eggdesktopfile.h
Copyright: 2007, Novell, Inc
License: LGPL-2+
-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: 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>
-License: GPL
+Files: src/sugar/activity/activity.py
+ src/sugar/datastore/dbus_helpers.py
+ src/sugar/graphics/radiotoolbutton.py
+ src/sugar/graphics/toolbutton.py
+Copyright: 2006-2007, Red Hat, Inc
+ 2007, One Laptop Per Child
+ 2007, Red Hat, Inc
+ 2007-2008, One Laptop Per Child
+ 2007-2009, One Laptop Per Child
+ 2008, One Laptop Per Child
+License: LGPL-2+
-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+
Files: src/sugar/sexy-icon-entry.c
src/sugar/sexy-icon-entry.h
@@ -223,129 +248,128 @@ Files: m4/ltoptions.m4
Copyright: 2004-2005, 2007-2008, Free Software Foundation, Inc
License: UNKNOWN
-Files: missing
-Copyright: 1996-1997, 1999-2000, 2002-2006
-License: GPL (GENERATED FILE)
-
-Files: depcomp
-Copyright: 1999-2000, 2003-2007, 2009, Free
-License: GPL (GENERATED FILE)
-
-Files: py-compile
-Copyright: 2000-2001, 2003-2005, 2008-2009, Free Software
-License: GPL (GENERATED FILE)
-
-Files: debian/cdbs/1/class/python-vars.mk
-Copyright: 2003,2008, Jonas Smedegaard <dr at jones.dk>
-License: GPL
+Files: m4/ltversion.m4
+ po/vi.po
+Copyright: 2004, Free Software Foundation, Inc
+ 2009, Free Software Foundation, Inc
+License: UNKNOWN
-Files: debian/cdbs/1/rules/buildinfo.mk
-Copyright: 2004-2007, Jonas Smedegaard <dr at jones.dk>
+Files: debian/cdbs/1/rules/copyright-check.mk
+Copyright:
License: GPL
-Files: debian/cdbs/1/rules/upstream-tarball.mk
-Copyright: 2007-2008, Jonas Smedegaard <dr at jones.dk>
+Files: missing
+Copyright: 1996-1997, 1999-2000, 2002-2006
License: GPL
-Files: debian/rules
-Copyright: 2008-2009, Jonas Smedegaard <dr at jones.dk>
+Files: py-compile
+Copyright: 2000-2001, 2003-2005, 2008-2009, Free Software
License: GPL
-Files: debian/cdbs/1/rules/copyright-check.mk
-Copyright: \s*(\S.*?)\s*\
+Files: depcomp
+Copyright: 1999-2000, 2003-2007, 2009, Free
License: GPL
-Files: config.guess
-Copyright: 1992-1999,
- 1992-2001
-License: GPL-2+ (GENERATED FILE)
-
-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, 2008,
+ 1996-2004,
+ 1997, 1999-2001, 2003-2005, 2008,
+ 1997, 2000-2001, 2003-2006, 2008,
+ 1999-2005, 2008,
+ 1999-2005, 2008-2009,
+ 1999-2006, 2009,
+ 2001, 2003, 2005, 2008, Free Software Foundation, Inc
+ 2001, 2003, 2005, Free Software Foundation, Inc
+ 2001-2003, 2005, 2008, Free Software Foundation, Inc
+ 2001-2003, 2005, 2009, Free Software Foundation, Inc
+ 2001-2004, Red Hat, Inc
+ 2002-2003, 2005-2008, Free Software Foundation, Inc
+ 2003, 2005, Free Software Foundation, Inc
+ 2003-2006, Free Software Foundation, Inc
+ 2004, Scott James Remnant <scott at netsplit.com>
+ 2004-2005, Free Software Foundation, Inc
+ 2006, 2008, Free Software Foundation, Inc
+License: GPL-2+
-Files: m4/intltool.m4
-Copyright: 2001, Eazel, Inc
-License: GPL-2+ (GENERATED FILE)
+Files: configure
+Copyright: (ISLOWER ? 'A' + ( - 'a') : )
+ (ISLOWER ? ( | 0x40) : )
+ 1992-1996, 1998-2001,
+ 1996-2001, 2003-2005
+ 2008, Free Software Foundation, Inc
+License: GPL-2+
Files: m4/libtool.m4
Copyright: 1996-2001, 2003-2005
+ 2008, Free Software Foundation, Inc
License: GPL-2+
Files: ltmain.sh
Copyright: 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc
License: GPL-2+
-Files: src/sugar/eggsmclient-xsmp.c
-Copyright: 1998, Carsten Schaar, and twm
- 1998, The Open Group
- 2007, Novell, Inc
-License: LGPL-2+
-
-Files: src/sugar/eggdesktopfile.c
-Copyright: 1999-2000, Red Hat Inc
- 2001, George Lebl
- 2007, Novell, Inc
-License: LGPL-2+
-
-Files: src/sugar/eggaccelerators.c
-Copyright: 2002, Red Hat, Inc.; 1998, 2001, Tim Janik
-License: LGPL-2+
+Files: m4/intltool.m4
+Copyright: 2001, Eazel, Inc
+License: GPL-2+
-Files: src/sugar/eggaccelerators.h
-Copyright: 2002, Red Hat, Inc
+Files: src/sugar/bundle/contentbundle.py
+Copyright: 2007, Red Hat, Inc
+ 2009, Aleksey Lim
License: LGPL-2+
-Files: src/sugar/datastore/dbus_helpers.py
-Copyright: 2006-2007, Red Hat, Inc
- 2007, One Laptop Per Child
+Files: src/sugar/graphics/colorbutton.py
+Copyright: 2007, Red Hat, Inc
+ 2008, Benjamin Berg <benjamin at sipsolutions.net>
License: LGPL-2+
-Files: src/sugar/activity/activity.py
-Copyright: 2006-2007, Red Hat, Inc
- 2007-2009, One Laptop Per Child
+Files: src/sugar/eggsmclient-xsmp.c
+Copyright: 1998, Carsten Schaar, and twm
+ 1998, The Open Group
+ 2007, Novell, Inc
License: LGPL-2+
Files: src/sugar/graphics/notebook.py
Copyright: 2007, Eduardo Silva (edsiper at gmail.com)
License: LGPL-2+
-Files: src/sugar/graphics/palette.py
-Copyright: 2007, Eduardo Silva <edsiper at gmail.com>
- 2008, One Laptop Per Child
-License: LGPL-2+
-
Files: src/sugar/graphics/menuitem.py
Copyright: 2007, Eduardo Silva <edsiper at gmail.com>
License: LGPL-2+
-Files: src/sugar/graphics/radiotoolbutton.py
-Copyright: 2007, Red Hat, Inc
- 2007-2008, One Laptop Per Child
-License: LGPL-2+
-
-Files: src/sugar/graphics/colorbutton.py
-Copyright: 2007, Red Hat, Inc
- 2008, Benjamin Berg <benjamin at sipsolutions.net>
+Files: src/sugar/graphics/palette.py
+Copyright: 2008, One Laptop Per Child
License: LGPL-2+
-Files: src/sugar/graphics/toolbutton.py
-Copyright: 2007, Red Hat, Inc
- 2008, One Laptop Per Child
+Files: src/sugar/eggdesktopfile.c
+Copyright: 1999-2000, Red Hat Inc
+ 2001, George Lebl
+ 2007, Novell, Inc
License: LGPL-2+
-Files: src/sugar/bundle/contentbundle.py
-Copyright: 2007, Red Hat, Inc
- 2009, Aleksey Lim
+Files: src/sugar/util.py
+Copyright: 2003, Josiah Carlson
+ 2006-2007, Red Hat, Inc
License: LGPL-2+
-Files: src/sugar/graphics/canvastextview.py
-Copyright: 2008, One Laptop Per Child
+Files: src/sugar/eggaccelerators.c
+Copyright: 2002, Red Hat, Inc.; 1998, 2001, Tim Janik
License: LGPL-2+
-Files: src/sugar/activity/namingalert.py
-Copyright: 2009, One Laptop Per Child
-License: LGPL-2+
+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+
Files: src/sugar/presence/tubeconn.py
Copyright: 2007, Collabora Ltd. <http://www.collabora.co.uk/>
@@ -359,47 +383,27 @@ Files: install-sh
Copyright: 1994, X Consortium
License: MIT/X11 (BSD like)
-Files: src/sugar/_sugarext.c
-Copyright: *No copyright*
-License: UNKNOWN (GENERATED FILE)
-
-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>
- 2004-2008, Rodney Dawes <dobey.pwns at gmail.com>
-License: UNKNOWN
-
-Files: m4/ltversion.m4
-Copyright: 2004, Free Software Foundation, Inc
+Files: po/ar.po
+Copyright: XO"
+ XO..."
+ (Firmware):"
+ YEAR THE PACKAGE'S HOLDER
License: UNKNOWN
Files: m4/lt~obsolete.m4
Copyright: 2004-2005, 2007, Free Software Foundation, Inc
License: UNKNOWN
-Files: src/sugar/gsm-app.h
-Copyright: 2006, Novell, Inc
-License: UNKNOWN
-
Files: debian/patches/1001_danish_l10n.patch
Copyright: 2008, Jonas Smedegaard <dr at jones.dk>
License: UNKNOWN
-Files: po/vi.po
-Copyright: 2009, Free Software Foundation, Inc
+Files: src/sugar/gsm-app.h
+Copyright: 2006, Novell, Inc
License: UNKNOWN
-Files: COPYING
-Copyright: the
- 1991, 1999, Free Software Foundation, Inc
+Files: po/Makefile.in.in
+Copyright: 1995-1997, by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+ 2004-2008, Rodney Dawes <dobey.pwns at gmail.com>
License: UNKNOWN
--
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