tags 741391 + pending
thanks
Dear maintainer,
I've prepared an NMU for usbprog (versioned as 0.2.0-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Cheers,
Olly
diff -Nru usbprog-0.2.0/debian/changelog usbprog-0.2.0/debian/changelog
--- usbprog-0.2.0/debian/changelog 2012-01-03 06:53:52.000000000 +1300
+++ usbprog-0.2.0/debian/changelog 2014-06-06 12:45:28.000000000 +1200
@@ -1,3 +1,10 @@
+usbprog (0.2.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to build with wxwidgets3.0. (Closes: #741391)
+
+ -- Olly Betts <o...@survex.com> Fri, 06 Jun 2014 12:45:14 +1200
+
usbprog (0.2.0-2) unstable; urgency=low
* Standards-Version: 3.9.2 (no changes required).
diff -Nru usbprog-0.2.0/debian/control usbprog-0.2.0/debian/control
--- usbprog-0.2.0/debian/control 2012-01-03 06:49:38.000000000 +1300
+++ usbprog-0.2.0/debian/control 2014-03-12 13:37:18.000000000 +1300
@@ -2,7 +2,7 @@
Section: embedded
Priority: extra
Maintainer: Uwe Hermann <u...@debian.org>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), autotools-dev, libusb-dev, libxml2-dev, libcurl4-gnutls-dev, libreadline-dev, libwxgtk2.8-dev, wx-common
+Build-Depends: cdbs, debhelper (>= 7.0.50~), autotools-dev, libusb-dev, libxml2-dev, libcurl4-gnutls-dev, libreadline-dev, libwxgtk3.0-dev
Standards-Version: 3.9.2
Homepage: http://developer.berlios.de/projects/usbprog/
diff -Nru usbprog-0.2.0/debian/patches/series usbprog-0.2.0/debian/patches/series
--- usbprog-0.2.0/debian/patches/series 1970-01-01 12:00:00.000000000 +1200
+++ usbprog-0.2.0/debian/patches/series 2014-03-12 14:25:51.000000000 +1300
@@ -0,0 +1 @@
+wx3.0-compat.patch
diff -Nru usbprog-0.2.0/debian/patches/wx3.0-compat.patch usbprog-0.2.0/debian/patches/wx3.0-compat.patch
--- usbprog-0.2.0/debian/patches/wx3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ usbprog-0.2.0/debian/patches/wx3.0-compat.patch 2014-03-12 14:26:29.000000000 +1300
@@ -0,0 +1,25 @@
+Description: Fix to build with wxWidgets 3.0
+ This patch should also work with wxWidgets 2.8.
+Author: Olly Betts <o...@survex.com>
+Last-Update: 2014-03-12
+
+--- usbprog-0.2.0.orig/gui/usbprogFrm.cc
++++ usbprog-0.2.0/gui/usbprogFrm.cc
+@@ -296,7 +296,7 @@ void usbprogFrm::CreateGUIControls()
+
+ // file dialog
+ m_fileDialog = new wxFileDialog(m_panel, wxT("Choose a file"),
+- wxT(""), wxT(""), wxT("*.bin"), wxOPEN);
++ wxT(""), wxT(""), wxT("*.bin"), wxFD_OPEN);
+
+ m_topBox->Add(topSizer, wxEXPAND, wxALL, 10);
+
+@@ -670,7 +670,7 @@ void usbprogFrm::enableDisableDebug(wxCo
+ dbg->setFileHandle(NULL);
+ } else {
+ wxFileDialog fdg(m_panel, wxT("Choose a file"),
+- wxT(""), wxT(""), wxT("*.log"), wxSAVE);
++ wxT(""), wxT(""), wxT("*.log"), wxFD_SAVE);
+ if (fdg.ShowModal() != wxID_OK)
+ dbg->setFileHandle(stderr);
+ else {
