Control: tags 849932 + patch
Control: tags 849932 + pending
Dear maintainer,
I've prepared an NMU for gtk-sharp2 (versioned as 2.12.40-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer or cancel the upload.
Regards,
S
diffstat for gtk-sharp2-2.12.40 gtk-sharp2-2.12.40
changelog | 18 ++++++++++++++++++
control | 12 ++++++++----
patches/no-void-cachetype.patch | 18 ++++++++++++++++++
patches/series | 1 +
rules | 4 ++--
5 files changed, 47 insertions(+), 6 deletions(-)
diff -Nru gtk-sharp2-2.12.40/debian/changelog gtk-sharp2-2.12.40/debian/changelog
--- gtk-sharp2-2.12.40/debian/changelog 2016-11-15 13:04:31.000000000 +0000
+++ gtk-sharp2-2.12.40/debian/changelog 2017-04-02 18:33:48.000000000 +0100
@@ -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 <[email protected]> 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 -Nru gtk-sharp2-2.12.40/debian/control gtk-sharp2-2.12.40/debian/control
--- gtk-sharp2-2.12.40/debian/control 2016-11-15 13:04:31.000000000 +0000
+++ gtk-sharp2-2.12.40/debian/control 2017-04-02 18:33:48.000000000 +0100
@@ -22,10 +22,14 @@
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 -Nru gtk-sharp2-2.12.40/debian/patches/no-void-cachetype.patch gtk-sharp2-2.12.40/debian/patches/no-void-cachetype.patch
--- gtk-sharp2-2.12.40/debian/patches/no-void-cachetype.patch 1970-01-01 01:00:00.000000000 +0100
+++ gtk-sharp2-2.12.40/debian/patches/no-void-cachetype.patch 2017-04-02 18:33:48.000000000 +0100
@@ -0,0 +1,18 @@
+From: Andreas Henriksson <[email protected]>
+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 -Nru gtk-sharp2-2.12.40/debian/patches/series gtk-sharp2-2.12.40/debian/patches/series
--- gtk-sharp2-2.12.40/debian/patches/series 2016-11-15 13:04:31.000000000 +0000
+++ gtk-sharp2-2.12.40/debian/patches/series 2017-04-02 18:33:48.000000000 +0100
@@ -1,3 +1,4 @@
01_dllmaps
02_pcfiles
03_missing_gtk-sharp_dllmap_entry
+no-void-cachetype.patch
diff -Nru gtk-sharp2-2.12.40/debian/rules gtk-sharp2-2.12.40/debian/rules
--- gtk-sharp2-2.12.40/debian/rules 2016-11-15 13:04:31.000000000 +0000
+++ gtk-sharp2-2.12.40/debian/rules 2017-04-02 18:33:48.000000000 +0100
@@ -83,7 +83,7 @@
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 @@
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
