[Pkg-sugar-commit] [sugar-toolkit] 06/10: Update changelog, control file and copyright hints.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository sugar-toolkit.

commit bff5edb44d6a17399d7899af39168444a313a2ed
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jun 16 08:37:56 2015 -0500

    Update changelog, control file and copyright hints.
---
 debian/changelog       | 13 +++++++++
 debian/control         |  9 ++----
 debian/copyright_hints | 74 ++++++++++++++++++++------------------------------
 3 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4539712..c1218a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+sugar-toolkit (0.98.1-5) UNRELEASED; urgency=medium
+
+  * Update copyright info:
+    + Use License-Grant and License-Reference fields.
+      Thanks to Ben Finney.
+  * Add lintian overrides regarding license in License-Reference field.
+    See bug#786450.
+  * Update package relations: Recommend/depend on unbranched Glucose
+    parts (i.e. core libraries).
+  * Drop branch from source and binary package.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Tue, 16 Jun 2015 08:35:52 -0500
+
 sugar-toolkit-0.98 (0.98.1-4) unstable; urgency=medium
 
   * Move to section oldlibs: Deprecated upstream.
diff --git a/debian/control b/debian/control
index 9303d96..a7eb0f6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: sugar-toolkit-0.98
+Source: sugar-toolkit
 Section: oldlibs
 Priority: optional
 Maintainer: Debian Sugar Team <pkg-sugar-devel at lists.alioth.debian.org>
@@ -25,7 +25,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-sugar/sugar-toolkit
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-sugar/sugar-toolkit.git
 Homepage: http://wiki.sugarlabs.org/go/Sugar
 
-Package: python-sugar-toolkit-0.98
+Package: python-sugar-toolkit
 Architecture: any
 Depends: ${cdbs:Depends},
  ${misc:Depends},
@@ -33,10 +33,7 @@ Depends: ${cdbs:Depends},
  ${shlibs:Depends}
 Recommends: ${cdbs:Recommends}
 Suggests: ${cdbs:Suggests}
-Provides: ${cdbs:Provides},
- ${python:Provides}
-Conflicts: ${cdbs:Conflicts}
-Replaces: ${cdbs:Replaces}
+Provides: ${python:Provides}
 Description: Sugar Learning Platform - legacy core widgets
  Sugar Learning Platform promotes collaborative learning through Sugar
  Activities that encourage critical thinking, the heart of a quality
diff --git a/debian/copyright_hints b/debian/copyright_hints
index e56a816..4c6ceef 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -4,7 +4,30 @@ Upstream-Contact: FIXME
 Source: FIXME
 Disclaimer: Autogenerated by CDBS
 
-Files: po/af.po
+Files: AUTHORS
+ Makefile.am
+ README
+ configure.ac
+ debian/README.source
+ debian/compat
+ debian/control
+ debian/control.in
+ debian/gbp.conf
+ debian/patches/2002_ignore_debian_and_quilt-patches.patch
+ debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch
+ debian/patches/README
+ debian/patches/series
+ debian/source/format
+ debian/source/lintian-overrides
+ debian/watch
+ intltool-extract.in
+ intltool-merge.in
+ intltool-update.in
+ m4/gnome-compiler-flags.m4
+ m4/python.m4
+ po/POTFILES.in
+ po/POTFILES.skip
+ po/af.po
  po/am.po
  po/ar.po
  po/aym.po
@@ -79,32 +102,6 @@ Files: po/af.po
  po/yo.po
  po/zh_CN.po
  po/zh_TW.po
-Copyright: YEAR THE PACKAGE'S HOLDER
-License: UNKNOWN
- FIXME
-
-Files: AUTHORS
- Makefile.am
- README
- configure.ac
- debian/README.source
- debian/compat
- debian/control
- debian/control.in
- debian/gbp.conf
- debian/patches/2002_ignore_debian_and_quilt-patches.patch
- debian/patches/2003_bundlebuilder_exit_nonzero_on_error.patch
- debian/patches/README
- debian/patches/series
- 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
- po/POTFILES.skip
  src/Makefile.am
  src/sugar/Makefile.am
  src/sugar/_sugarext.c
@@ -166,6 +163,7 @@ Files: Makefile.in
  m4/ltsugar.m4
  m4/ltversion.m4
  m4/lt~obsolete.m4
+ po/vi.po
  src/Makefile.in
  src/sugar/Makefile.in
  src/sugar/activity/Makefile.in
@@ -177,6 +175,7 @@ Copyright: 1994-2012, Free Software Foundation, Inc
   2004, Free Software Foundation, Inc
   2004-2005, 2007, 2009, Free Software Foundation, Inc
   2004-2005, 2007-2008, Free Software Foundation, Inc
+  2009, Free Software Foundation, Inc
 License: UNKNOWN
  FIXME
 
@@ -209,12 +208,12 @@ License: LGPL-2+
 Files: config.guess
  config.sub
  depcomp
+ ltmain.sh
  missing
 Copyright: 1992-1999
-  1992-1999,
-  1992-2000
   1992-2000,
   1996-1997, 1999-2000, 2002-2006
+  1996-2001, 2003-2006
   1999-2000, 2003-2007, 2009-2010
 License: GPL-2+
  FIXME
@@ -269,6 +268,7 @@ License: LGPL-2+
 
 Files: install-sh
 Copyright: 1994, X Consortium
+  and license
 License: Expat
  FIXME
 
@@ -282,17 +282,11 @@ License: GPL-2+
  FIXME
 
 Files: m4/libtool.m4
-Copyright: 1996-2001, 2003-2005,
+Copyright: 1996-2001, 2003-2005
   2011, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
-Files: ltmain.sh
-Copyright: 1996-2001, 2003-2006
-  all begin with the string "--lt-"
-License: GPL-2+
- FIXME
-
 Files: m4/intltool.m4
 Copyright: 2001, Eazel, Inc
 License: GPL-2+
@@ -425,8 +419,6 @@ Files: COPYING
 Copyright: 1991, 1999 Free Software Foundation, Inc
   <year> <name of author>
   disclaimer" for the library, if
-  interest in the
-  law: that is to say, a work containing the Library or a
   the
 License: LGPL-ever
  FIXME
@@ -436,12 +428,6 @@ Copyright: 2004-2005, 2007-2009, Free Software Foundation
 License: UNKNOWN
  FIXME
 
-Files: po/vi.po
-Copyright: 2009, Free Software Foundation, Inc
-  YEAR THE PACKAGE'S HOLDER
-License: UNKNOWN
- FIXME
-
 Files: debian/patches/1001_danish_l10n.patch
 Copyright: 2008, Jonas Smedegaard <dr at jones.dk>
 License: UNKNOWN

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