[Pkg-erlang-commits] r1567 - in erlang/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2013-11-22 16:06:18 +0000 (Fri, 22 Nov 2013)
New Revision: 1567

Added:
   erlang/trunk/debian/patches/wx3.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/control
   erlang/trunk/debian/patches/series
   erlang/trunk/debian/rules
Log:
[erlang]
  * Switched to wxWidgets 3.0 from 2.8 for erlang-wx application.
  * Fixed segfault on adding items to a wxListBox widget (reproducible with
    wxWidgets 3.0).
  * Added new erlang-dbg package with symbol files for libraries and
    binaries in the other packages (except erlang-base-hipe).


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2013-11-22 16:05:52 UTC (rev 1566)
+++ erlang/trunk/debian/changelog	2013-11-22 16:06:18 UTC (rev 1567)
@@ -1,8 +1,12 @@
-erlang (1:16.b.2-dfsg-2) UNRELEASED; urgency=low
+erlang (1:16.b.2-dfsg-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Switched to wxWidgets 3.0 from 2.8 for erlang-wx application.
+  * Fixed segfault on adding items to a wxListBox widget (reproducible with
+    wxWidgets 3.0).
+  * Added new erlang-dbg package with symbol files for libraries and
+    binaries in the other packages (except erlang-base-hipe).
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 20 Sep 2013 18:18:18 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 21 Nov 2013 14:51:50 +0400
 
 erlang (1:16.b.2-dfsg-1) unstable; urgency=low
 

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2013-11-22 16:05:52 UTC (rev 1566)
+++ erlang/trunk/debian/control	2013-11-22 16:06:18 UTC (rev 1567)
@@ -6,11 +6,11 @@
 Standards-Version: 3.9.4
 Build-Depends: debhelper (>= 8.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4,
  libncurses5-dev, autotools-dev, unixodbc-dev, bison, flex, ed,
- libwxgtk2.8-dev, dctrl-tools, xsltproc,
+ libwxgtk3.0-dev, dctrl-tools, xsltproc,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  libsctp-dev [linux-any]
 Build-Depends-Indep: fop, default-jdk | sun-java6-jdk
-Build-Conflicts: autoconf2.13, libwxgtk2.4-dev, libwxgtk2.6-dev
+Build-Conflicts: autoconf2.13, libwxgtk2.4-dev, libwxgtk2.6-dev, libwxgtk2.8-dev
 Homepage: http://www.erlang.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-erlang/erlang/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-erlang/erlang/trunk/
@@ -571,6 +571,18 @@
  libraries.
 
 
+Package: erlang-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: erlang-base (= ${binary:Version}), ${misc:Depends}
+Suggests: erlang, erlang-manpages, erlang-doc
+Description: Erlang/OTP symbol files
+ The files containing debug symbols for binaries and libraries in Erlang
+ to help in debugging applications build with them. You will not normally
+ need to install this package.
+
+
 Package: erlang-src
 Architecture: all
 Depends: erlang-base (>= ${binary:Version}) | erlang-base-hipe (>= ${binary:Version}), erlang-base (<< ${binary:Version}.0) | erlang-base-hipe (<< ${binary:Version}.0), ${misc:Depends}

Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series	2013-11-22 16:05:52 UTC (rev 1566)
+++ erlang/trunk/debian/patches/series	2013-11-22 16:06:18 UTC (rev 1567)
@@ -8,3 +8,4 @@
 java.patch
 hppa.patch
 powerpc.patch
+wx3.patch

Added: erlang/trunk/debian/patches/wx3.patch
===================================================================
--- erlang/trunk/debian/patches/wx3.patch	                        (rev 0)
+++ erlang/trunk/debian/patches/wx3.patch	2013-11-22 16:06:18 UTC (rev 1567)
@@ -0,0 +1,18 @@
+Author: Sergei Golovan
+Description: Patch removes the second argument from wxItemContainer::Set call
+ effectively replacing wxClientData_Void type by wxClientData_None. This fixes
+ setting items list with wxWidgets 3.0.
+Last-Modified: Thu, 21 Nov 2013 11:42:23 +0400
+Forwarded: yes
+
+--- erlang-16.b.2-dfsg.orig/lib/wx/c_src/gen/wxe_funcs.cpp
++++ erlang-16.b.2-dfsg/lib/wx/c_src/gen/wxe_funcs.cpp
+@@ -15137,7 +15137,7 @@
+  }
+  bp += (8-((0+ itemsASz) & 7 )) & 7;
+  if(!This) throw wxe_badarg(0);
+- This->Set(items,(void **) NULL);
++ This->Set(items);
+  break;
+ }
+ case wxListBox_HitTest: { // wxListBox::HitTest

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2013-11-22 16:05:52 UTC (rev 1566)
+++ erlang/trunk/debian/rules	2013-11-22 16:06:18 UTC (rev 1567)
@@ -444,7 +444,7 @@
 	dh_installman -a -Nerlang-base-hipe
 	dh_installmenu -a -Nerlang-base-hipe
 	dh_link -a -Nerlang-base-hipe
-	dh_strip -a -Nerlang-base-hipe
+	dh_strip -a -Nerlang-base-hipe --dbg-package=erlang-dbg
 	dh_compress -a -Nerlang-base-hipe
 	dh_fixperms -a -Nerlang-base-hipe
 	dh_makeshlibs -a -Nerlang-base-hipe