Bug#782381: pu: package motif/2.3.4-8

[Graham Inggs <graham@nerve.org.za>]

Hi SRMs

Please find debdiff against motif 2.3.4-6 attached.
This is the same as version 2.3.4-8 that has been in unstable since 
2015-04-17 and testing since 2015-04-27.

For what it is worth, the same changes have been in Ubuntu Vivid since 
2015-04-15 as 2.3.4-7ubuntu1.

Regards
Graham

diff -Nru motif-2.3.4/debian/changelog motif-2.3.4/debian/changelog
--- motif-2.3.4/debian/changelog	2014-10-13 09:27:43.000000000 +0200
+++ motif-2.3.4/debian/changelog	2015-05-25 16:08:19.000000000 +0200
@@ -1,3 +1,11 @@
+motif (2.3.4-6+deb8u1) jessie-proposed-updates; urgency=medium
+
+  [ Michael Gilbert ]
+  * Disable buggy fix for upstream bug #1565 (Closes: #781995).
+  * Remove symbol that was intended to be private (Closes: #782678).
+
+ -- Graham Inggs <graham@nerve.org.za>  Mon, 25 May 2015 15:32:21 +0200
+
 motif (2.3.4-6) unstable; urgency=medium
 
   * Bump standards-version to 3.9.6 (no changes).
diff -Nru motif-2.3.4/debian/libxm4.symbols motif-2.3.4/debian/libxm4.symbols
--- motif-2.3.4/debian/libxm4.symbols	2014-10-07 15:57:54.000000000 +0200
+++ motif-2.3.4/debian/libxm4.symbols	2015-05-26 12:50:55.000000000 +0200
@@ -257,7 +257,6 @@
  XmFontListInitFontContext@Base 2.3.4
  XmFontListNextEntry@Base 2.3.4
  XmFontListRemoveEntry@Base 2.3.4
- XmForceGrabKeyboard@Base 2.3.4-5~
  XmGetAtomName@Base 2.3.4
  XmGetColorCalculation@Base 2.3.4
  XmGetColors@Base 2.3.4
diff -Nru motif-2.3.4/debian/patches/22-disable-1565.patch motif-2.3.4/debian/patches/22-disable-1565.patch
--- motif-2.3.4/debian/patches/22-disable-1565.patch	1970-01-01 02:00:00.000000000 +0200
+++ motif-2.3.4/debian/patches/22-disable-1565.patch	2015-04-17 09:29:41.000000000 +0200
@@ -0,0 +1,14 @@
+Description: Fix for upstream 1565 causes segfaults in motif applications, so disable it
+Author: Graham Inggs <graham@nerve.org.za>
+Bug-Debian: https://bugs.debian.org/781995
+
+--- a/lib/Xm/XmI.h
++++ b/lib/Xm/XmI.h
+@@ -299,7 +299,6 @@ extern Pixel _XmAssignInsensitiveColor(W
+ #define FIX_1501
+ #define FIX_1521
+ #define FIX_1505
+-#define FIX_1565
+ 
+ #endif /* _XmI_h */
+ /* DON'T ADD ANYTHING AFTER THIS #endif */
diff -Nru motif-2.3.4/debian/patches/series motif-2.3.4/debian/patches/series
--- motif-2.3.4/debian/patches/series	2014-10-13 09:27:43.000000000 +0200
+++ motif-2.3.4/debian/patches/series	2015-04-17 09:29:41.000000000 +0200
@@ -19,3 +19,4 @@
 19-fix-type-inconsistencies.patch
 20-fix-1612.patch
 21-fix-1636.patch
+22-disable-1565.patch