[swt-gtk] 01/03: Merge branch 'master' into master-4.3

[Jakub Adam]

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

xhaakon-guest pushed a commit to branch master-4.3
in repository swt-gtk.

commit 36adf6695164b0daff403f778694352a932ebb9b
Merge: b58bd28 95b80c4
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Dec 15 15:59:19 2013 +0100

    Merge branch 'master' into master-4.3
    
    Conflicts:
    	debian/changelog
    	debian/libswt-gtk-3-java.links
    	debian/libswt-gtk-3-java.lintian-overrides

 debian/NEWS.Debian                                 | 22 --------
 debian/changelog                                   | 35 ++++++++++++-
 debian/control                                     | 60 +++++++++-------------
 debian/gbp.conf                                    |  1 +
 debian/libswt-cairo-gtk-3-jni.lintian-overrides    |  1 +
 debian/libswt-glx-gtk-3-jni.lintian-overrides      |  1 +
 debian/libswt-gtk-3-jni.lintian-overrides          |  2 +
 debian/libswt-webkit-gtk-3-jni.lintian-overrides   |  1 +
 .../common/fix-glib-2.35-compatibility.patch       | 45 ++++++++++++++++
 .../fix-libwebkitgtk-1.11.91-compatibility.diff    | 32 ++++++++++++
 10 files changed, 142 insertions(+), 58 deletions(-)

diff --cc debian/changelog
index f4ec97c,fda20ab..a558fb7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,37 +1,43 @@@
 +swt-gtk (4.2.0-1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
-   * Ensure CFLAGS from d/rules are really used.
 +
 + -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 07 Aug 2012 12:57:59 +0200
 +
+ swt-gtk (3.8.2-3) unstable; urgency=low
+ 
+   * Fix FTBFS with glib 2.35 (Closes: #710649).
+ 
+  -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 26 Jun 2013 14:49:25 +0200
+ 
+ swt-gtk (3.8.2-2) unstable; urgency=low
+ 
+   * Team upload.
+   * Upload to unstable.
+ 
+  -- tony mancill <tmancill at debian.org>  Tue, 14 May 2013 22:07:29 -0700
+ 
+ swt-gtk (3.8.2-1) experimental; urgency=low
+ 
+   * New upstream release.
+   * Add fix for compatibility with libwebkitgtk-1.0-0 1.11.91-1
+     (Closes: #704516).
+   * Updated arch64.diff patch for new upstream release.
+   * Reconsidered package description (Closes: #681417).
+   * Bump Standards-Version to 3.9.4.
+   * Use xz compression for orig tarball.
+   * Override hardening-no-fortify-functions false positives.
+   * Removed obsolete d/NEWS.Debian file.
+ 
+  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 04 Apr 2013 17:40:20 +0200
+ 
+ swt-gtk (3.8.0~rc4-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * Ensure CFLAGS from d/rules are really used.
+ 
+  -- Jakub Adam <jakub.adam at ktknet.cz>  Fri, 29 Jun 2012 10:53:16 +0200
+ 
  swt-gtk (3.8.0~rc2-3) unstable; urgency=low
  
    * Upload to unstable.

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