[Pkg-sugar-commit] [sugar-base] 09/09: Prepare for release: Update changelog, control file and copyright hints.

Mon Jun 15 22:08:49 UTC 2015

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

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

commit 3d3e986b19322c749430f4a292d27dd99988d098
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jun 15 16:55:15 2015 -0500

    Prepare for release: Update changelog, control file and copyright hints.
---
 debian/changelog       | 18 +++++++++++++
 debian/control         | 11 ++++----
 debian/copyright_hints | 73 +++++++++++++++++++-------------------------------
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b570ed1..072a650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+sugar-base-0.98 (0.98.0-3) unstable; urgency=medium
+
+  * Modernize short and long description.
+  * Update copyright info:
+    + Use License-Grant and License-Reference fields.
+      Thanks to Ben Finney.
+    + Add comments on LGPL Lesser versus Library assumption.
+    + Drop duplicate copyright statement in BSD-3-clause~O'Brien License
+      section.
+  * Add lintian overrides regarding license in License-Reference field.
+    See bug#786450.
+  * Remove debian/source/local-options: abort-on-upstream-changes and
+    unapply-patches are default in dpkg-source since 1.16.1.
+  * Modernize git-buildpackage config: Avoid "git-" prefix.
+  * Drop obsolete TODO file.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Mon, 15 Jun 2015 16:53:58 -0500
+
 sugar-base-0.98 (0.98.0-2) unstable; urgency=medium
 
   * Track xz compressed upstream tarballs (but favor bzip2).
diff --git a/debian/control b/debian/control
index 25d01d6..45c0706 100644
--- a/debian/control
+++ b/debian/control
@@ -32,12 +32,11 @@ Provides: ${cdbs:Provides},
  ${python:Provides}
 Conflicts: ${cdbs:Conflicts}
 Replaces: ${cdbs:Replaces}
-Description: Sugar graphical shell - legacy core functionality
- Sugar is a desktop environment. It is conceived as a platform upon
- which children learn with Sugar Activities. The platform provides
- mechanisms for collaboration, reflection, and exploration. Sugar
- Activities cover a broad range of applications: browsing, drawing,
- composing, writing, programming, etc.
+Description: Sugar Learning Platform - legacy core functionality
+ Sugar Learning Platform promotes collaborative learning through Sugar
+ Activities that encourage critical thinking, the heart of a quality
+ education.  Designed from the ground up especially for children, Sugar
+ offers an alternative to traditional “office-desktop” software.
  .
  This package contains some deprecated yet still widely used base
  modules for Sugar.  Please use python-sugar3 instead where possible.
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 7c54d4a..81c52cd 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -4,7 +4,27 @@ Upstream-Contact: FIXME
 Source: FIXME
 Disclaimer: Autogenerated by CDBS
 
-Files: po/af.po
+Files: Makefile.am
+ NEWS
+ configure.ac
+ debian/README.Debian
+ debian/README.source
+ debian/compat
+ debian/control
+ debian/control.in
+ debian/gbp.conf
+ debian/patches/1001_modernize_ipython_support.patch
+ 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/af.po
  po/am.po
  po/ar.po
  po/aym.po
@@ -16,6 +36,7 @@ Files: po/af.po
  po/dz.po
  po/el.po
  po/en.po
+ po/es.po
  po/fa.po
  po/fa_AF.po
  po/ff.po
@@ -59,31 +80,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: Makefile.am
- NEWS
- configure.ac
- debian/README.Debian
- debian/README.source
- debian/TODO
- debian/compat
- debian/control
- debian/control.in
- debian/gbp.conf
- debian/patches/1001_modernize_ipython_support.patch
- debian/patches/series
- debian/source/format
- debian/source/local-options
- 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
@@ -108,18 +104,18 @@ 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+
+License: AFL-2.0
  FIXME
 
 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
@@ -131,7 +127,7 @@ Files: src/sugar/xdgmimealias.c
 Copyright: 200 Matthias Clasen <mclasen at redhat.com>
   2004, Matthias Clasen <mclasen at redhat.com>
   2004, Red Hat, Inc
-License: LGPL-2+
+License: AFL-2.0
  FIXME
 
 Files: Makefile.in
@@ -154,7 +150,7 @@ License: UNKNOWN
 Files: src/sugar/xdgmimecache.c
  src/sugar/xdgmimecache.h
 Copyright: 2005, Matthias Clasen <mclasen at redhat.com>
-License: LGPL-2+
+License: AFL-2.0
  FIXME
 
 Files: src/sugar/__init__.py
@@ -180,6 +176,7 @@ License: BSD-3-clause
 
 Files: install-sh
 Copyright: 1994, X Consortium
+  and license
 License: Expat
  FIXME
 
@@ -222,12 +219,6 @@ Copyright: 1996-2001, 2003-2005
 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+
@@ -247,18 +238,10 @@ 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
 
-Files: po/es.po
-Copyright: David <gato at debian.ues.edu.sv>\n"
-  YEAR THE PACKAGE'S HOLDER
-License: UNKNOWN
- FIXME
-
 Files: m4/ltoptions.m4
 Copyright: 2004-2005, 2007-2009, Free Software Foundation
 License: UNKNOWN

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

