[Pkg-sugar-commit] [sugar-toolkit-gtk3] 01/04: 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-toolkit-gtk3.

commit a6790c2252d6574748d417d7a4f49727212915fc
Merge: 848c172 6a03072
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jul 2 18:08:45 2015 -0500

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

 debian/changelog                | 18 ++++++++++++++++++
 debian/copyright_hints          | 32 ++++++++++++++++++++++----------
 debian/gbp.conf                 |  1 -
 debian/rules                    | 12 ++++++++----
 debian/source/lintian-overrides |  3 +++
 5 files changed, 51 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index f3529c6,161a748..d45ce72
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,15 +1,34 @@@
++sugar-toolkit-gtk3 (0.105.2-2) UNRELEASED; urgency=medium
++
++  (0.104.1-9 changes re-applied)
++
++ -- Jonas Smedegaard <dr at jones.dk>  Thu, 02 Jul 2015 18:04:41 -0500
++
 +sugar-toolkit-gtk3 (0.105.2-1) experimental; urgency=medium
 +
 +  [ upstream ]
 +  * New release(s).
 +
 +  [ Jonas Smedegaard ]
 +  * Prepare for new major branch:
 +    + Switch packaging git branch.
 +    + Adapt watch file to track any branch.
 +  * Drop patch now included upstream, and unfuzz remaining patch.
 +
 + -- Jonas Smedegaard <dr at jones.dk>  Sun, 14 Jun 2015 15:29:45 -0500
 +
+ sugar-toolkit-gtk3 (0.104.1-9) unstable; urgency=medium
+ 
+   * Update package relations:
+     + Favor Webkit over Webkit2: Webkit needed by Jarabe and Browse too.
+     + Drop fallback-dependency on gir1.2-webkit2-3.0: Deprecated.
+   * Relax watch file to cover any compression suffix.
+   * Stop explicitly declare compression in git-buildpackage config.
+   * Add lintian override regarding debhelper 9.
+   * Fix rename locale aym→ay: ISO 639-1 favored over ISO 639-2.
+ 
+  -- Jonas Smedegaard <dr at jones.dk>  Thu, 02 Jul 2015 17:05:44 -0500
+ 
  sugar-toolkit-gtk3 (0.104.1-8) unstable; urgency=medium
  
    * Adapt packaging in maintainer mode when targeting experimental:
diff --cc debian/gbp.conf
index 5640b97,adb34a7..8cfd77e
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,7 -1,6 +1,6 @@@
  # Configuration file for git-buildpackage and friends
  
  [DEFAULT]
 -debian-branch = master-0.104
 +debian-branch = master
  pristine-tar = True
  sign-tags = True
- compression = xz

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