Package: pgn2web Version: 0.4-1 Severity: normal Tags: patch User: freewx-ma...@lists.alioth.debian.org Usertags: wx3.0
Dear maintainer,
We're aiming to migrate the archive to using wxwidgets3.0 instead of
wxwidgets2.8.
I've rebuilt your package using the attached patch (I also converted
it to source format "3.0 (quilt)" and split out the upstream changes
from the debian diff).
The wx-related changes should be compatible with wxWidgets 2.8 too
in case you want to try to send them upstream (though I notice upstream
seems rather inactive).
The pgn2web GUI runs OK and the widgets in the dialog seem to function
correctly, though I don't have any PGN files to test it with.
I'm happy to NMU this change if you wish me to - just let me know.
Cheers,
Olly
diff -Nru pgn2web-0.4/cli.c pgn2web-0.4/cli.c --- pgn2web-0.4/cli.c 2014-04-02 09:56:13.000000000 +1300 +++ pgn2web-0.4/cli.c 2005-04-26 07:25:21.000000000 +1200 @@ -30,7 +30,7 @@ /* default installation path */ #ifndef INSTALL_PATH -#define INSTALL_PATH "/usr/share/pgn2web/" +#define INSTALL_PATH "/usr/local/pgn2web/" #endif char usage[] = "usage: pgn2web\n" diff -Nru pgn2web-0.4/debian/changelog pgn2web-0.4/debian/changelog --- pgn2web-0.4/debian/changelog 2014-04-02 09:56:13.000000000 +1300 +++ pgn2web-0.4/debian/changelog 2014-04-02 09:46:23.000000000 +1300 @@ -1,3 +1,11 @@ +pgn2web (0.4-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Update to source format "3.0 (quilt)". + * Update to use wxWidgets 3.0 (new patch wx3.0-compat.patch). + + -- Olly Betts <o...@survex.com> Wed, 02 Apr 2014 09:42:51 +1300 + pgn2web (0.4-1) unstable; urgency=low * Initial release (Closes: #565158) diff -Nru pgn2web-0.4/debian/control pgn2web-0.4/debian/control --- pgn2web-0.4/debian/control 2014-04-02 09:56:13.000000000 +1300 +++ pgn2web-0.4/debian/control 2013-11-23 04:56:38.000000000 +1300 @@ -2,7 +2,7 @@ Section: web Priority: extra Maintainer: Oliver Korff <o...@xynyx.de> -Build-Depends: debhelper (>= 7), libwxgtk2.8-dev, wx2.8-headers, libwxbase2.8-dev +Build-Depends: debhelper (>= 7), libwxgtk3.0-dev Standards-Version: 3.8.3 Homepage: http://sourceforge.net/projects/pgn2web/ diff -Nru pgn2web-0.4/debian/patches/install-location.patch pgn2web-0.4/debian/patches/install-location.patch --- pgn2web-0.4/debian/patches/install-location.patch 1970-01-01 12:00:00.000000000 +1200 +++ pgn2web-0.4/debian/patches/install-location.patch 2014-04-02 09:48:27.000000000 +1300 @@ -0,0 +1,46 @@ +Description: Fix install locations for Debian +Last-Update: 2014-04-02 + +--- pgn2web-0.4.orig/cli.c ++++ pgn2web-0.4/cli.c +@@ -30,7 +30,7 @@ + + /* default installation path */ + #ifndef INSTALL_PATH +-#define INSTALL_PATH "/usr/local/pgn2web/" ++#define INSTALL_PATH "/usr/share/pgn2web/" + #endif + + char usage[] = "usage: pgn2web\n" +--- pgn2web-0.4.orig/gui.h ++++ pgn2web-0.4/gui.h +@@ -17,7 +17,7 @@ const wxChar SEPERATOR = wxT('/'); + + // default installation path (*nix) + #ifndef INSTALL_PATH +-#define INSTALL_PATH "/usr/local/pgn2web/" ++#define INSTALL_PATH "/usr/share/pgn2web/" + #endif + + //define event ids +--- pgn2web-0.4.orig/makefile ++++ pgn2web-0.4/makefile +@@ -38,10 +38,10 @@ clean: + rm -f pgn2web p2wgui *.o *.do *~ *# *.html + + install: +- if [ ! -e /usr/local/pgn2web ]; then mkdir /usr/local/pgn2web; fi +- cp -r images /usr/local/pgn2web/ +- cp -r templates /usr/local/pgn2web/ +- cp pgn2web /usr/local/pgn2web/ +- cp p2wgui /usr/local/pgn2web/ +- ln -fs /usr/local/pgn2web/pgn2web /usr/bin/ +- ln -fs /usr/local/pgn2web/p2wgui /usr/bin/ +\ No newline at end of file ++ if [ ! -e $(DESTDIR)/usr/share/pgn2web ]; then mkdir $(DESTDIR)/usr/share/pgn2web; fi ++ cp -r images $(DESTDIR)/usr/share/pgn2web/ ++ cp -r templates $(DESTDIR)/usr/share/pgn2web/ ++ cp pgn2web $(DESTDIR)/usr/bin/ ++ cp p2wgui $(DESTDIR)/usr/bin/ ++# ln -fs /usr/share/pgn2web/pgn2web /usr/bin/ ++# ln -fs /usr/share/pgn2web/p2wgui /usr/bin/ diff -Nru pgn2web-0.4/debian/patches/series pgn2web-0.4/debian/patches/series --- pgn2web-0.4/debian/patches/series 1970-01-01 12:00:00.000000000 +1200 +++ pgn2web-0.4/debian/patches/series 2014-04-02 09:49:09.000000000 +1300 @@ -0,0 +1,2 @@ +install-location.patch +wx3.0-compat.patch diff -Nru pgn2web-0.4/debian/patches/wx3.0-compat.patch pgn2web-0.4/debian/patches/wx3.0-compat.patch --- pgn2web-0.4/debian/patches/wx3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200 +++ pgn2web-0.4/debian/patches/wx3.0-compat.patch 2014-04-02 09:48:28.000000000 +1300 @@ -0,0 +1,24 @@ +Description: Fixes for compatibility with wxWidgets 3.0 +Author: Olly Betts <o...@survex.com> +Last-Update: 2014-04-02 + +--- pgn2web-0.4.orig/gui.cpp ++++ pgn2web-0.4/gui.cpp +@@ -237,7 +237,7 @@ void p2wFrame::browsePGN(wxCommandEvent& + { + wxFileDialog *cDialog = new wxFileDialog(this, wxT("Select a PGN file..."), wxT(""), wxT(""), + wxT("PGN files(*.pgn;*.PGN)|*.pgn;*.PGN"), +- wxOPEN | wxFILE_MUST_EXIST); ++ wxFD_OPEN | wxFD_FILE_MUST_EXIST); + if(wxID_OK == cDialog->ShowModal()) { + pgnText->SetValue(cDialog->GetPath()); + } +@@ -247,7 +247,7 @@ void p2wFrame::browsePGN(wxCommandEvent& + void p2wFrame::browseHTML(wxCommandEvent& event) + { + wxFileDialog *cDialog = new wxFileDialog(this, wxT("Name HTML file(s)..."), wxT(""), wxT(""), +- wxT("HTML files(*.html)|*.html"), wxSAVE); ++ wxT("HTML files(*.html)|*.html"), wxFD_SAVE); + if(wxID_OK == cDialog->ShowModal()) { + htmlText->SetValue(cDialog->GetPath()); + } diff -Nru pgn2web-0.4/debian/source/format pgn2web-0.4/debian/source/format --- pgn2web-0.4/debian/source/format 1970-01-01 12:00:00.000000000 +1200 +++ pgn2web-0.4/debian/source/format 2014-04-02 09:45:40.000000000 +1300 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru pgn2web-0.4/gui.h pgn2web-0.4/gui.h --- pgn2web-0.4/gui.h 2014-04-02 09:56:13.000000000 +1300 +++ pgn2web-0.4/gui.h 2005-04-26 07:25:22.000000000 +1200 @@ -17,7 +17,7 @@ // default installation path (*nix) #ifndef INSTALL_PATH -#define INSTALL_PATH "/usr/share/pgn2web/" +#define INSTALL_PATH "/usr/local/pgn2web/" #endif //define event ids diff -Nru pgn2web-0.4/makefile pgn2web-0.4/makefile --- pgn2web-0.4/makefile 2014-04-02 09:56:13.000000000 +1300 +++ pgn2web-0.4/makefile 2005-03-31 09:44:53.000000000 +1200 @@ -38,10 +38,10 @@ rm -f pgn2web p2wgui *.o *.do *~ *# *.html install: - if [ ! -e $(DESTDIR)/usr/share/pgn2web ]; then mkdir $(DESTDIR)/usr/share/pgn2web; fi - cp -r images $(DESTDIR)/usr/share/pgn2web/ - cp -r templates $(DESTDIR)/usr/share/pgn2web/ - cp pgn2web $(DESTDIR)/usr/bin/ - cp p2wgui $(DESTDIR)/usr/bin/ -# ln -fs /usr/share/pgn2web/pgn2web /usr/bin/ -# ln -fs /usr/share/pgn2web/p2wgui /usr/bin/ + if [ ! -e /usr/local/pgn2web ]; then mkdir /usr/local/pgn2web; fi + cp -r images /usr/local/pgn2web/ + cp -r templates /usr/local/pgn2web/ + cp pgn2web /usr/local/pgn2web/ + cp p2wgui /usr/local/pgn2web/ + ln -fs /usr/local/pgn2web/pgn2web /usr/bin/ + ln -fs /usr/local/pgn2web/p2wgui /usr/bin/ \ No newline at end of file
signature.asc
Description: Digital signature
