[Pkg-sugar-commit] [sugar-artwork] 04/08: 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-artwork.

commit 5e00ba2c7da4dd3fef113911ffc15a42259965b9
Merge: f282045 7ab07c4
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jul 2 18:48:38 2015 -0500

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

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

diff --cc debian/changelog
index bd77ec6,b6dbc6a..7c677c7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,11 +1,30 @@@
++sugar-artwork (0.105.2-2) UNRELEASED; urgency=medium
++
++  (0.104.1-6 changes re-applied)
++
++ -- Jonas Smedegaard <dr at jones.dk>  Thu, 02 Jul 2015 18:47:30 -0500
++
 +sugar-artwork (0.105.2-1) experimental; urgency=medium
 +
 +  [ upstream ]
 +  * New release(s).
 +
 +  [ Jonas Smedegaard ]
 +  * Prepare for new major branch:
 +    + Switch packaging git branch.
 +    + Relax watch file.
 +  * Drop branch from source and binary package.
 +
 + -- Jonas Smedegaard <dr at jones.dk>  Sun, 14 Jun 2015 19:23:29 -0500
 +
+ sugar-artwork (0.104.1-6) unstable; urgency=medium
+ 
+   * Drop branch from source and binary package.
+   * Bump debhelper compatibility level to 9.
+   * Add lintian override regarding debhelper 9.
+ 
+  -- Jonas Smedegaard <dr at jones.dk>  Fri, 26 Jun 2015 13:43:04 -0500
+ 
  sugar-artwork-0.104 (0.104.1-5) unstable; urgency=medium
  
    * Modernize git-buildpackage config: Avoid "git-" prefix.

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