[Pkg-cli-libs-commits] [gtk-sharp2] 05/05: Merge branch 'master' into trusty-backports

[Mirco Bauer]

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

meebey pushed a commit to branch trusty-backports
in repository gtk-sharp2.

commit 455e789729dc7a30b227aa0ab4f8da6dd1002961
Merge: 080f14a 3e3bf70
Author: Mirco Bauer <meebey at debian.org>
Date:   Tue May 9 20:16:27 2017 +0800

    Merge branch 'master' into trusty-backports
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                         | 34 ++++++++++++++---
 debian/control                           | 12 ++++--
 debian/patches/04_fix_treeview_model_ref | 63 ++++++++++++++++++++++++++++++++
 debian/patches/no-void-cachetype.patch   | 18 +++++++++
 debian/patches/series                    |  2 +
 debian/rules                             |  4 +-
 6 files changed, 122 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index ca68bd7,e38b6a8..4dce3b8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,31 +1,38 @@@
- gtk-sharp2 (2.12.40-1~trusty+2) trusty; urgency=medium
++gtk-sharp2 (2.12.40-2~trusty+1) trusty; urgency=medium
 +
 +  * [1d7dea3] fix configure .NET 4.6 support detection
++  * Rebuild for trusty-ppa.
 +
-  -- Mirco Bauer <meebey at debian.org>  Mon, 09 Jan 2017 20:27:38 +0800
++ -- Mirco Bauer <meebey at debian.org>  Tue, 09 May 2017 20:08:22 +0800
 +
- gtk-sharp2 (2.12.40-1~trusty+1) trusty; urgency=low
+ gtk-sharp2 (2.12.40-2) unstable; urgency=medium
  
-   * Rebuild for trusty-ppa.
+   * [bf035d9] fix Gtk.TreeView.get/set_Model() throwing NullReferenceException.
+     This fix is a cherry-picked commit 4ac71507fffce997207215ac3f8b38471ce60a14
+     from upstream's git repository.
+     The fix is already included in a newer upstream version (GTK# 2.12.41), but
+     for getting a freeze exception I have only backported the fix that affects
+     the Debian release. (Closes: #860450)
+ 
+  -- Mirco Bauer <meebey at debian.org>  Mon, 17 Apr 2017 14:55:40 +0800
+ 
+ gtk-sharp2 (2.12.40-1.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+ 
+   [ Andreas Henriksson ]
+   * debian/patches/no-void-cachetype.patch: Do not generate invalid
+     syntax when certain methods return void (Closes: #849932)
+ 
+   [ Simon McVittie ]
+   * Add a longer changelog entry and some patch metadata for the fix
+     above
+   * Run dh_cligacpolicy with umask 022 to avoid installing some files
+     with 0664, 0775 permissions (Lintian warning)
+   * Relax gtk-sharp2 dependencies so they can be satisfied by a binNMU
+     (Lintian error)
  
-  -- Mirco Bauer <meebey at debian.org>  Mon, 09 Jan 2017 13:16:37 +0800
+  -- Simon McVittie <smcv at debian.org>  Sun, 02 Apr 2017 18:33:48 +0100
  
  gtk-sharp2 (2.12.40-1) unstable; urgency=medium
  
diff --cc debian/patches/series
index 86b8390,3370ccf..4a7801f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,5 +1,6 @@@
  01_dllmaps
  02_pcfiles
  03_missing_gtk-sharp_dllmap_entry
 +04_fix_configure_net46_detection
+ 04_fix_treeview_model_ref
+ no-void-cachetype.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/gtk-sharp2.git