[Pkg-sugar-commit] [sugar-datastore] 02/06: Merge branch 'master-0.104'

[Jonas Smedegaard]

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

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

commit 753dddcd5fdfaa24ff030a830cb09ddf3f10c890
Merge: d7b245e aae8ddb
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jul 2 19:14:48 2015 -0500

    Merge branch 'master-0.104'
    
    Conflicts (manually resolved):
    	debian/changelog
    	debian/gbp.conf
    	debian/watch

 debian/changelog                | 17 ++++++++++++++++-
 debian/compat                   |  2 +-
 debian/rules                    |  4 ++++
 debian/source/lintian-overrides |  3 +++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index bb413ee,a68934f..934253d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,18 +1,31 @@@
 +sugar-datastore (0.105.2-1) experimental; urgency=medium
 +
 +  [ upstream ]
 +  * New release(s).
 +
 +  [ Jonas Smedegaard ]
-   * Drop branch from source and binary package.
 +  * Prepare for new major branch:
 +    + Switch packaging git branch.
 +    + Have watch file track any branch.
++  (0.104.1-5 changes re-applied)
 +
 + -- Jonas Smedegaard <dr at jones.dk>  Sun, 14 Jun 2015 18:19:59 -0500
 +
+ sugar-datastore (0.104.1-6) unstable; urgency=medium
+ 
+   * Fix limit watch file to current branch.
+   * Bump debhelper compatibility level to 9.
+   * Add lintian override regarding debhelper 9.
+   * Relax watch file to cover any compression suffix.
+ 
+  -- Jonas Smedegaard <dr at jones.dk>  Thu, 02 Jul 2015 18:35:17 -0500
+ 
+ sugar-datastore (0.104.1-5) unstable; urgency=medium
+ 
+   * Drop branch from source and binary package.
+ 
+  -- Jonas Smedegaard <dr at jones.dk>  Fri, 26 Jun 2015 13:01:20 -0500
+ 
  sugar-datastore-0.104 (0.104.1-4) unstable; urgency=medium
  
    * Modernize short and long description.

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