[Pkg-sugar-commit] [sugar-datastore] 01/01: Prepare for release: Update changelog, control file(s) and copyright hints.

[Jonas Smedegaard]

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

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

commit 5c59dd45e044d6f4abd856fcaec3c086cd4157c1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 14 17:09:57 2015 -0500

    Prepare for release: Update changelog, control file(s) and copyright hints.
---
 debian/changelog       | 15 +++++++++++++++
 debian/control         | 11 +++++------
 debian/control.in      | 11 +++++------
 debian/copyright_hints | 15 ++++++++-------
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 840d4ff..31436e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+sugar-datastore-0.104 (0.104.1-4) unstable; urgency=medium
+
+  * Modernize short and long description.
+  * 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.
+  * Adapt packaging in maintainer mode when targeting experimental:
+    + Switch git packaging branch.
+    + Track any release (else only current branch).
+  * Modernize git-buildpackage config: Avoid "git-" prefix.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sun, 14 Jun 2015 17:08:15 -0500
+
 sugar-datastore-0.104 (0.104.1-3) unstable; urgency=medium
 
   * Fix stop suggest sugar-* poppler-utils/xpdf-utils or abiword: Unused
diff --git a/debian/control b/debian/control
index 6c26c36..0e0e3a8 100644
--- a/debian/control
+++ b/debian/control
@@ -30,12 +30,11 @@ Provides: ${cdbs:Provides},
 Breaks: ${cdbs:Breaks}
 Conflicts: ${cdbs:Conflicts}
 Replaces: ${cdbs:Replaces}
-Description: Sugar graphical shell - datastore
- Sugar is a graphical user interface aimed at children.
- .
- Originating as integral part of the OLPC "XO" a.k.a. the $100 laptop,
- Sugar has since grown into a more widely usable low-ressource desktop
- environment for kids.
+Description: Sugar Learning Platform - datastore
+ 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 a simple log like datastore able to connect with
  multiple backends.  The datastore supports connecting and disconnecting
diff --git a/debian/control.in b/debian/control.in
index c65e77e..21279ee 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -24,12 +24,11 @@ Provides: ${cdbs:Provides},
 Breaks: ${cdbs:Breaks}
 Conflicts: ${cdbs:Conflicts}
 Replaces: ${cdbs:Replaces}
-Description: Sugar graphical shell - datastore
- Sugar is a graphical user interface aimed at children.
- .
- Originating as integral part of the OLPC "XO" a.k.a. the $100 laptop,
- Sugar has since grown into a more widely usable low-ressource desktop
- environment for kids.
+Description: Sugar Learning Platform - datastore
+ 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 a simple log like datastore able to connect with
  multiple backends.  The datastore supports connecting and disconnecting
diff --git a/debian/copyright_hints b/debian/copyright_hints
index c1d1f8e..1bd35d7 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -20,6 +20,7 @@ Files: AUTHORS
  debian/control.in.in
  debian/gbp.conf
  debian/source/format
+ debian/source/lintian-overrides
  debian/watch
  etc/Makefile.am
  etc/org.laptop.sugar.DataStore.service.in
@@ -78,14 +79,20 @@ License: GPL-2+
 Files: config.guess
  config.sub
 Copyright: 1992-2013, Free Software Foundation, Inc
-License: GPL GPL-3
+License: GPL-3
  FIXME
 
 Files: install-sh
 Copyright: 1994, X Consortium
+  and license
 License: Expat
  FIXME
 
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2006
+License: GPL-2+
+ FIXME
+
 Files: configure
 Copyright: (ISLOWER ? 'A' + ( - 'a') : )
   (ISLOWER ? ( | 0x40) : )
@@ -101,12 +108,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: src/carquinyol/datastore.py
 Copyright: 2007, ObjectRealms, LLC
   2008, One Laptop Per Child

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