--- Begin Message ---
Package: ebook2cwgui
Version: 0.1.2-1
Severity: normal
Tags: patch
Dear maintainer,
We're aiming to migrate the archive to using wxwidgets3.0 instead of
wxwidgets2.8.
I've built and done some testing of your package and it seems to work
as well as the package currently in unstable (the initial window size is
too small to show all the controls in both cases).
I used the attached patch - I think the wxStandardPaths fix will also
work with wx2.8, but I haven't actually tested that.
I'm happy to NMU this change if you wish me to - just let me know.
Cheers,
Olly
diff -Nru ebook2cwgui-0.1.2/debian/changelog ebook2cwgui-0.1.2/debian/changelog
--- ebook2cwgui-0.1.2/debian/changelog 2013-02-28 23:04:22.000000000 +1300
+++ ebook2cwgui-0.1.2/debian/changelog 2014-03-13 12:22:25.000000000 +1300
@@ -1,3 +1,10 @@
+ebook2cwgui (0.1.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update to build with wxwidgets 3.0.
+
+ -- Olly Betts <olly@survex.com> Thu, 13 Mar 2014 12:22:05 +1300
+
ebook2cwgui (0.1.2-1) unstable; urgency=low
* Initial release (Closes: #700496)
diff -Nru ebook2cwgui-0.1.2/debian/control ebook2cwgui-0.1.2/debian/control
--- ebook2cwgui-0.1.2/debian/control 2013-02-14 04:09:10.000000000 +1300
+++ ebook2cwgui-0.1.2/debian/control 2014-03-13 12:21:55.000000000 +1300
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Uploaders: Christoph Feenders <debian@echti.de>, Kamal Mostafa <kamal@whence.com>
-Build-Depends: debhelper (>= 9), libgcc1, libstdc++6, libwxbase2.8-dev, libwxgtk2.8-dev
+Build-Depends: debhelper (>= 9), libgcc1, libstdc++6, libwxgtk3.0-dev
Standards-Version: 3.9.4
Homepage: http://fkurz.net/ham/ebook2cw.html#gui
#Vcs-Git: git://git.debian.org/collab-maint/ebook2cwgui.git
diff -Nru ebook2cwgui-0.1.2/debian/patches/series ebook2cwgui-0.1.2/debian/patches/series
--- ebook2cwgui-0.1.2/debian/patches/series 2013-02-28 23:00:40.000000000 +1300
+++ ebook2cwgui-0.1.2/debian/patches/series 2014-03-13 12:32:08.000000000 +1300
@@ -2,3 +2,4 @@
makefile-respect-CXX-and-flags.patch
makefile-install-icon.patch
makefile-install-desktop-file.patch
+wx3.0-compat.patch
diff -Nru ebook2cwgui-0.1.2/debian/patches/wx3.0-compat.patch ebook2cwgui-0.1.2/debian/patches/wx3.0-compat.patch
--- ebook2cwgui-0.1.2/debian/patches/wx3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ ebook2cwgui-0.1.2/debian/patches/wx3.0-compat.patch 2014-03-13 12:32:40.000000000 +1300
@@ -0,0 +1,16 @@
+Description: Fix to build with wxWidgets 3.0
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-03-13
+
+--- ebook2cwgui-0.1.2.orig/ebook2cwgui.cpp
++++ ebook2cwgui-0.1.2/ebook2cwgui.cpp
+@@ -679,8 +679,7 @@ wxString Ebook2cw::FindConfigFile () {
+ /* Otherwise where it "should" be; create if not there */
+
+ wxString dir;
+- wxStandardPaths stdPaths;
+- dir = stdPaths.GetUserConfigDir();
++ dir = wxStandardPaths::Get().GetUserConfigDir();
+
+ #ifdef __WXMSW__
+ if (!wxDirExists(dir + wxT("\\ebook2cw"))) {
--- End Message ---
--- Begin Message ---
Source: ebook2cwgui
Source-Version: 0.1.2-1.1
We believe that the bug you reported is fixed in the latest version of
ebook2cwgui, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 741490@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Olly Betts <olly@survex.com> (supplier of updated ebook2cwgui package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Thu, 13 Mar 2014 12:22:05 +1300
Source: ebook2cwgui
Binary: ebook2cwgui
Architecture: source amd64
Version: 0.1.2-1.1
Distribution: unstable
Urgency: low
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Changed-By: Olly Betts <olly@survex.com>
Closes: 741490
Description:
ebook2cwgui - GUI for ebook2cw
Changes:
ebook2cwgui (0.1.2-1.1) unstable; urgency=low
.
* Non-maintainer upload.
* Update to build with wxwidgets 3.0.
Checksums-Sha1:
8cc628a3ae1bda0d93e1087bb7458762857d89d5 1870 ebook2cwgui_0.1.2-1.1.dsc
273493326d20cda5b34c9782b8fa568f2009a52f 3232 ebook2cwgui_0.1.2-1.1.debian.tar.xz
833cb2c31e88a9aa42d2b0680821c6eafe8baac2 48000 ebook2cwgui_0.1.2-1.1_amd64.deb
Checksums-Sha256:
62470fc1f943e17795d90069c3996acc11e82d47d696b219f3940ad8ebc441c3 1870 ebook2cwgui_0.1.2-1.1.dsc
34f76603d6e8d29536c589d51fd92c1bd9be92be8d8857aafc8f72a22f562699 3232 ebook2cwgui_0.1.2-1.1.debian.tar.xz
87cdd50ae132456fec75521b89c0e91d1dcf61044bdcc31b0785e8fd0c2cf67e 48000 ebook2cwgui_0.1.2-1.1_amd64.deb
Files:
bd44667d81c19eacbab2199802c92a3b 1870 hamradio optional ebook2cwgui_0.1.2-1.1.dsc
add09cb6bb492edf5c6bdb2f1d7fce8d 3232 hamradio optional ebook2cwgui_0.1.2-1.1.debian.tar.xz
4e1e81258e16cedae3a5f7788e6f086b 48000 hamradio optional ebook2cwgui_0.1.2-1.1_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBAgAGBQJTKuSFAAoJEBgUewc7rSsH92oP/1bhwOcKWzfqvTNZ+70vkK3J
iXM/fqyTMYsFpGtn8g5QEDCy6bLqFjpNOw1CcgI4/2UmokcsU4fhlXWuzIxn5uWT
0RePw3BEFDPnohy56ZPU/S4xCzUMRi179B7qEYd/DbbC3U71xkn0WOJtv0T+qhAM
OIBo9439DVIBgfnZYSg0pSc+Kay2a9+GDPiWUkRLOqr0Hz5sE7HWAvG0nXD3/UqE
BOqBaRPuW2KMbmD1JGBJr5nyjNiH243LxW4dIOudCKLwES34tzi4RrnwWN0qWm1J
8IXRmHBS825wF6hHvmO39CEdPzS2K4TQ0kuFsorTjikGWQkmtHYqmu8NNsjK5PC6
2Xqa06mQr3A9mGW3S90TEX1qi1tSWywAHnzkc8jkLUeOzNTlJXrmzlT2YnHHYUzx
aglc4YPMlGkgX/bPZV+RHQ2VjQZ1B9P0c1Rcy/+2r5AmUKgzOFD0hNI3VsjdGPvF
M1/mamcZthhZKVXqOg7nLvVPbZq3FJHaZOoJTDUuI/sMAvM2c+nFzkk6oeRkHrEC
bH8vBcmbngfRbH80k+zuOAjvfS31cq8GJc7RTIwuT8T/qQhWg+kzSMILFPIJIoKZ
bf0pziD7BbBOL4B/tdz+gXl9oVWzfR1X4KoVA0DJnX7b5jH6/gucWHMfVGEXMi6U
CfihoeLCKHegv8STwMPf
=Tenq
-----END PGP SIGNATURE-----
--- End Message ---