[Pkg-cli-libs-commits] [gtk-sharp2] 01/01: Imported Debian patch 2.12.40-1.1

[Mirco Bauer]

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

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

commit c3d458203398690e8da930af132bc5a1780288be
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Apr 2 18:33:48 2017 +0100

    Imported Debian patch 2.12.40-1.1
---
 debian/changelog                       | 18 ++++++++++++++++++
 debian/control                         | 12 ++++++++----
 debian/patches/no-void-cachetype.patch | 18 ++++++++++++++++++
 debian/patches/series                  |  1 +
 debian/rules                           |  4 ++--
 5 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 000ee87..1f4aa87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+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)
+
+ -- Simon McVittie <smcv at debian.org>  Sun, 02 Apr 2017 18:33:48 +0100
+
 gtk-sharp2 (2.12.40-1) unstable; urgency=medium
 
   * The "from Hong Kong's hackerspace DimSumLabs with love" release
diff --git a/debian/control b/debian/control
index fed2e62..388e995 100644
--- a/debian/control
+++ b/debian/control
@@ -22,10 +22,14 @@ Vcs-Browser: http://git.debian.org/?p=pkg-cli-libs/packages/gtk-sharp2.git
 Package: gtk-sharp2
 Architecture: all
 Depends: gtk-sharp2-examples (= ${source:Version}),
-         gtk-sharp2-gapi (= ${source:Version}),
-         libglade2.0-cil-dev (= ${source:Version}),
-         libglib2.0-cil-dev (= ${source:Version}),
-         libgtk2.0-cil-dev (= ${source:Version}),
+         gtk-sharp2-gapi (>= ${source:Version}),
+         gtk-sharp2-gapi (<< ${source:Version}.~),
+         libglade2.0-cil-dev (>= ${source:Version}),
+         libglade2.0-cil-dev (<< ${source:Version}.~),
+         libglib2.0-cil-dev (>= ${source:Version}),
+         libglib2.0-cil-dev (<< ${source:Version}.~),
+         libgtk2.0-cil-dev (>= ${source:Version}),
+         libgtk2.0-cil-dev (<< ${source:Version}.~),
          monodoc-gtk2.0-manual (= ${source:Version}),
          ${misc:Depends}
 Description: GTK# 2.10 suite, CLI bindings for GTK+
diff --git a/debian/patches/no-void-cachetype.patch b/debian/patches/no-void-cachetype.patch
new file mode 100644
index 0000000..49549d6
--- /dev/null
+++ b/debian/patches/no-void-cachetype.patch
@@ -0,0 +1,18 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: Don't generate return variable for void types
+Date: Mon, 27 Mar 2017 22:19:06 +0200
+
+Bug: https://bugzilla.xamarin.com/show_bug.cgi?id=52262
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=849932
+
+--- a/generator/Method.cs
++++ b/generator/Method.cs
+@@ -54,7 +54,7 @@
+ 
+ 			if (Name == "GetType") {
+ 				Name = "GetGType";
+-				cacheValue = !(container_type is StructBase);
++				cacheValue = !(container_type is StructBase) && !retval.IsVoid;
+ 				cacheName = "_gtype";
+ 			}
+ 		}
diff --git a/debian/patches/series b/debian/patches/series
index 1f27fb3..2f5ad56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_dllmaps
 02_pcfiles
 03_missing_gtk-sharp_dllmap_entry
+no-void-cachetype.patch
diff --git a/debian/rules b/debian/rules
index 1cf715e..3d7acfe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ binary-indep: build-indep install
 	dh_fixperms -i
 	dh_clifixperms -i
 	dh_clistrip -i
-	dh_cligacpolicy -i
+	umask 022 && dh_cligacpolicy -i
 	dh_makeclilibs -m $(API_VERSION)
 	dh_installcligac -i
 	dh_clideps -i -d
@@ -107,7 +107,7 @@ binary-arch: build-arch install
 	dh_fixperms -a
 	dh_clifixperms -a
 	dh_clistrip -a
-	dh_cligacpolicy -a
+	umask 022 && dh_cligacpolicy -a
 	dh_makeclilibs -m $(API_VERSION)
 	dh_installcligac -a
 	dh_clideps -a -d

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