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

Jonas Smedegaard dr at jones.dk
Fri Jun 12 18:05:45 UTC 2015 

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

js pushed a commit to branch master
in repository sugar.

commit 5b86c20a5d0ef2d8e4c3ea280d87e88eb85f09f4
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jun 9 01:12:16 2015 +0200

    Prepare for release: Update changelog, control file(s) and copyright hints.
---
 debian/changelog       | 16 +++++++++++
 debian/control         | 41 +++++++++++++--------------
 debian/control.in      | 41 +++++++++++++--------------
 debian/copyright_hints | 77 +++++++++++++++++++++++++-------------------------
 4 files changed, 93 insertions(+), 82 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2efa5b8..048b533 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+sugar-0.104 (0.104.1-10) unstable; urgency=medium
+
+  * Update package relations:
+    + Have sugar-session-* recommend (and sucrose-* depend on)
+      sugar-log-activity (not suggest branch-sufficed one).
+  * Modernize short and long descriptions.
+  * 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.
+  * Modernize git-buildpackage config: Avoid "git-" prefix.
+  * Drop obsolete DM-Upload-Allowed field from control file.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 12 Jun 2015 12:46:10 -0500
+
 sugar-0.104 (0.104.1-9) unstable; urgency=medium
 
   * Update package relations:
diff --git a/debian/control b/debian/control
index e776eff..4615444 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Sugar Team <pkg-sugar-devel at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>,
  Luke Faraone <luke at faraone.cc>,
  Santiago Ruano Rincón <santiago at debian.org>
-DM-Upload-Allowed: yes
 Build-Depends: cdbs (>= 0.4.97~),
  devscripts,
  python,
@@ -35,12 +34,11 @@ Provides: ${cdbs:Provides},
  ${python:Provides}
 Conflicts: ${cdbs:Conflicts}
 Replaces: ${cdbs:Replaces}
-Description: Sugar graphical shell - Sucrose 0.104
- 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 - Sucrose 0.104
+ 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 depends on all packages which make up Sucrose, the
  official base Sugar environment.
@@ -58,12 +56,11 @@ Provides: ${cdbs:Provides},
 Breaks: ${cdbs:Breaks}
 Conflicts: ${cdbs:Conflicts}
 Replaces: ${cdbs:Replaces}
-Description: Sugar graphical shell - window manager
- 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 - window manager
+ 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 the integrated session and window manager Sugar.
 
@@ -81,16 +78,16 @@ Provides: ${cdbs:Provides},
 Breaks: ${cdbs:Breaks}
 Conflicts: ${cdbs:Conflicts}
 Replaces: ${cdbs:Replaces}
-Description: Sugar graphical shell - library
- Sugar is a graphical user interface aimed at children.
+Description: Sugar Learning Platform - graphical shell
+ 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.
  .
- 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.
+ "Jarabe" is Spanish for "Jelly" - a sugary layer spread on the surface.
  .
- This package contains Jarabe, the Sugar Graphical "Shell" Interface
- providing the shell-level operations for Sugar.  It interacts heavily
- with the Sugar UI libraries.
+ This package contains the parts of Sugar Learning Platform immediately
+ visible to the user - the views, the journal, and the control panel.
  .
- This is a "graphical" shell, the name does not refer to a command-line
+ This is a graphical shell, the name does not refer to a command-line
  "shell" interface.
diff --git a/debian/control.in b/debian/control.in
index 96bf459..14772c3 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,6 @@ Maintainer: Debian Sugar Team <pkg-sugar-devel at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>,
  Luke Faraone <luke at faraone.cc>,
  Santiago Ruano Rincón <santiago at debian.org>
-DM-Upload-Allowed: yes
 Build-Depends: @cdbs@
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-sugar/sugar
@@ -23,12 +22,11 @@ Provides: ${cdbs:Provides},
  ${python:Provides}
 Conflicts: ${cdbs:Conflicts}
 Replaces: ${cdbs:Replaces}
-Description: Sugar graphical shell - Sucrose 0.104
- 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 - Sucrose 0.104
+ 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 depends on all packages which make up Sucrose, the
  official base Sugar environment.
@@ -46,12 +44,11 @@ Provides: ${cdbs:Provides},
 Breaks: ${cdbs:Breaks}
 Conflicts: ${cdbs:Conflicts}
 Replaces: ${cdbs:Replaces}
-Description: Sugar graphical shell - window manager
- 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 - window manager
+ 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 the integrated session and window manager Sugar.
 
@@ -69,16 +66,16 @@ Provides: ${cdbs:Provides},
 Breaks: ${cdbs:Breaks}
 Conflicts: ${cdbs:Conflicts}
 Replaces: ${cdbs:Replaces}
-Description: Sugar graphical shell - library
- Sugar is a graphical user interface aimed at children.
+Description: Sugar Learning Platform - graphical shell
+ 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.
  .
- 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.
+ "Jarabe" is Spanish for "Jelly" - a sugary layer spread on the surface.
  .
- This package contains Jarabe, the Sugar Graphical "Shell" Interface
- providing the shell-level operations for Sugar.  It interacts heavily
- with the Sugar UI libraries.
+ This package contains the parts of Sugar Learning Platform immediately
+ visible to the user - the views, the journal, and the control panel.
  .
- This is a "graphical" shell, the name does not refer to a command-line
+ This is a graphical shell, the name does not refer to a command-line
  "shell" interface.
diff --git a/debian/copyright_hints b/debian/copyright_hints
index ffab374..bec8c95 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -49,6 +49,7 @@ Files: AUTHORS
  debian/patches/series
  debian/python-jarabe-__VER__.install.in
  debian/source/format
+ debian/source/lintian-overrides
  debian/sugar-session-__VER__.install.in
  debian/sugar-session-__VER__.menu.in
  debian/sugar.desktop
@@ -814,11 +815,6 @@ Copyright: 2008, Collabora Ltd. <http://www.collabora.co.uk/>
 License: LGPL-2.1+
  FIXME
 
-Files: po/ar.po
-Copyright: 
-License: UNKNOWN
- FIXME
-
 Files: po/zh_CN.po
 Copyright: %(selected)d
   YEAR THE PACKAGE'S HOLDER
@@ -861,39 +857,6 @@ Copyright: Jm
 License: UNKNOWN
  FIXME
 
-Files: po/fr.po
-Copyright: 2007, the Package Owner
-  Personnel (PIN) :"
-  [ args ...
-  afficher les informations sur cette cl� \n"
-  correspondante"
-  de chiffrement sans fil est requise pour\n"
-  de d�verrouillage personnelle (PUK) du r�seau GSM "
-  depuis %s"
-  d�finir la valeur actuelle de cette cl� \n"
-  et apportent de nouvelles fonctionnalit�s."
-  et licence"
-  incorrect. Utiliser 0/1."
-  incorrect. Utiliser marche/arrêt."
-  install�e"
-  install�es"
-  la d�connexion."
-  le transfert du fichier"
-  logicielle"
-  obtenir la valeur actuelle associ�e à cette cl� \n"
-  pour d�marrer l'entr�e"
-  pour reprendre l'entr�e"
-  retir�."
-  sans fil :"
-  supprim�e ou a disparu."
-  sur le serveur de l'�cole."
-  tactile"
-  trouv�es : %s module: %r"
-  une erreur inattendue."
-  à le modifier et/ou à en distribuer des copies "
-License: UNKNOWN
- FIXME
-
 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>
@@ -1050,9 +1013,47 @@ Copyright: YEAR THE PACKAGE'S HOLDER
 License: UNKNOWN
  FIXME
 
+Files: po/fr.po
+Copyright: [ args ...
+  afficher les informations sur cette cl� \n"
+  correspondante"
+  de chiffrement sans fil est requise pour\n"
+  de d�verrouillage personnelle (PUK) du r�seau GSM "
+  depuis %s"
+  d�finir la valeur actuelle de cette cl� \n"
+  et apportent de nouvelles fonctionnalit�s."
+  et licence"
+  incorrect. Utiliser 0/1."
+  incorrect. Utiliser marche/arrêt."
+  install�e"
+  install�es"
+  je ne parle pas '%s'."
+  la d�connexion."
+  le transfert du fichier"
+  logicielle"
+  obtenir la valeur actuelle associ�e à cette cl� \n"
+  pour d�marrer l'entr�e"
+  pour reprendre l'entr�e"
+  retir�."
+  sans fil :"
+  supprim�e ou a disparu."
+  sur le serveur de l'�cole."
+  tactile"
+  trouv�es : %s module: %r"
+  une erreur inattendue."
+  à le modifier et/ou à en distribuer des copies "
+License: UNKNOWN
+ FIXME
+
 Files: data/ISO-639-2_utf-8.txt
 Copyright: du Nord
   du Sud
 License: UNKNOWN
  FIXME
 
+Files: po/ar.po
+Copyright: تحكم سكر: key=%s ليس متاحا كخيار"
+  عند البدء، أو \"system\" (النظام) "
+License: UNKNOWN
+ FIXME
+

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

More information about the pkg-sugar-commit mailing list