[Pkg-sugar-commit] [sugar-datastore] 06/09: 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-0.104
in repository sugar-datastore.

commit 974e636624f2bc8fff03f0b79150a36b2dc73925
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jun 26 12:58:43 2015 -0500

    Update changelog, control file and copyright hints.
---
 debian/changelog |  6 ++++++
 debian/control   | 10 +++-------
 debian/watch     |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31436e1..ef8a04e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sugar-datastore (0.104.1-5) UNRELEASED; urgency=medium
+
+  * Drop branch from source and binary package.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 26 Jun 2015 12:58:01 -0500
+
 sugar-datastore-0.104 (0.104.1-4) unstable; urgency=medium
 
   * Modernize short and long description.
diff --git a/debian/control b/debian/control
index 0e0e3a8..66393b8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: sugar-datastore-0.104
+Source: sugar-datastore
 Section: python
 Priority: optional
 Maintainer: Debian Sugar Team <pkg-sugar-devel at lists.alioth.debian.org>
@@ -17,7 +17,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-sugar/sugar-datastore.git
 Homepage: http://wiki.sugarlabs.org/go/Sugar
 XS-Python-Version: >= 2.7
 
-Package: python-carquinyol-0.104
+Package: python-carquinyol
 Architecture: any
 Depends: ${cdbs:Depends},
  ${misc:Depends},
@@ -25,11 +25,7 @@ Depends: ${cdbs:Depends},
  ${shlibs:Depends}
 Recommends: ${cdbs:Recommends}
 Suggests: ${cdbs:Suggests}
-Provides: ${cdbs:Provides},
- ${python:Provides}
-Breaks: ${cdbs:Breaks}
-Conflicts: ${cdbs:Conflicts}
-Replaces: ${cdbs:Replaces}
+Provides: ${python:Provides}
 Description: Sugar Learning Platform - datastore
  Sugar Learning Platform promotes collaborative learning through Sugar
  Activities that encourage critical thinking, the heart of a quality
diff --git a/debian/watch b/debian/watch
index 610b98c..e29e282 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 # run the "uscan" command to check for upstream updates and more.
 version=3
-http://download.sugarlabs.org/sources/sucrose/glucose/sugar-datastore/sugar-datastore-(0.104\..*)\.tar\.(?:bz2|xz)
+http://download.sugarlabs.org/sources/sucrose/glucose/sugar-datastore/sugar-datastore-(.*)\.tar\.(?:bz2|xz)

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