Commit 88ca1d6e authored by Graham Inggs's avatar Graham Inggs

Acknowledge NMU from Olly Betts

parent d95e539b
......@@ -4,6 +4,17 @@ qutemol (0.4.1~cvs20081111-4) UNRELEASED; urgency=low
-- Michael Banck <mbanck@debian.org> Sun, 06 Oct 2013 18:50:04 +0200
qutemol (0.4.1~cvs20081111-3.1) unstable; urgency=medium
* Non-maintainer upload.
* Update to use wxWidgets 3.0 (Closes: #749861):
+ New patch: debian/patches/36_wx3.0_compat.dpatch
* debian/patches/20_main.cpp.dpatch: Update to actually set the icon from
the XPM data correctly (wx3.0 gives a warning dialog for this rather
than quietly failing to load the file "sample_xpm").
-- Olly Betts <olly@survex.com> Sat, 30 Aug 2014 14:52:32 +0000
qutemol (0.4.1~cvs20081111-3) unstable; urgency=low
* debian/upstream: New file.
......
......@@ -3,7 +3,7 @@ Section: science
Priority: optional
Maintainer: Debichem Team <debichem-devel@lists.alioth.debian.org>
Uploaders: Morten Kjeldgaard <mok0@ubuntu.com>, Michael Banck <mbanck@debian.org>
Build-Depends: debhelper (>= 5), cdbs, dpatch, libwxgtk2.8-dev, libglew1.5-dev,
Build-Depends: debhelper (>= 5), cdbs, dpatch, libwxgtk3.0-dev, libglew1.5-dev,
libgif-dev, libpng12-dev
Standards-Version: 3.9.2
Homepage: http://qutemol.sourceforge.net/
......
......@@ -33,3 +33,4 @@
33_format-security.dpatch
34_geometry_tab_sliders.dpatch
35_gifsave_honor_umask.dpatch
36_wx3.0_compat.dpatch
......@@ -110,7 +110,7 @@
+#if WIN32
+ SetIcon(wxIcon(_T("sample"),wxBITMAP_TYPE_ICO_RESOURCE,32,32));
+#else
+ SetIcon(wxIcon(_T("sample_xpm"),wxBITMAP_TYPE_XPM,32,32));
+ SetIcon(wxIcon(sample_xpm));
#endif
+
resize_mode=NATURAL;
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## wx3.0_compact.dpatch by Olly Betts <olly@survex.com>
## These changes should maintain compatibility with wxwidgets2.8.
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
@DPATCH@
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -421,15 +421,15 @@
static const wxCmdLineEntryDesc cmdLineDesc[] =
{
{
- wxCMD_LINE_PARAM,_T(""),_T(""),_T("filename.pdb:(molecule to be drawn)"),
+ wxCMD_LINE_PARAM,wxT_2(""),wxT_2(""),wxT_2("filename.pdb:(molecule to be drawn)"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_OPTION,_T("a"),_T(""),_T("filename.art: optional Atom Render Table"),
+ wxCMD_LINE_OPTION,wxT_2("a"),wxT_2(""),wxT_2("filename.art: optional Atom Render Table"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
- wxCMD_LINE_SWITCH,_T("v"),_T(""),_T("don't start, show version name"),
+ wxCMD_LINE_SWITCH,wxT_2("v"),wxT_2(""),wxT_2("don't start, show version name"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{ wxCMD_LINE_NONE }
@@ -836,7 +836,7 @@
wxString(), // def path
wxString(),
FILETYPES,
- wxSAVE | /*wxCHANGE_DIR |*/ wxOVERWRITE_PROMPT
+ wxFD_SAVE | /*wxFD_CHANGE_DIR |*/ wxFD_OVERWRITE_PROMPT
);
static int lastFilterIndex=-1;
@@ -1004,7 +1004,7 @@
wxString(), // def path
wxString(),
FILETYPES,
- wxOPEN | wxFILE_MUST_EXIST/*| wxCHANGE_DIR*/,
+ wxFD_OPEN | wxFD_FILE_MUST_EXIST/*| wxFD_CHANGE_DIR*/,
wxDefaultPosition);
if (openFileDialog->ShowModal() == wxID_OK) {
......@@ -4,7 +4,9 @@
INCDIRS = -Ivcg -Isrc -I.
#OPTFLAGS = -Os -Wall -g
CXXFLAGS = -DPKGDATADIR='\"/usr/share/qutemol\"' $(INCDIRS) $(OPTFLAGS) `wx-config --cppflags`
# Define NDEBUG to quietly ignore WXDEBUG assertion failures (as happens by
# default under wx2.8).
CXXFLAGS = -DPKGDATADIR='\"/usr/share/qutemol\"' $(INCDIRS) $(OPTFLAGS) `wx-config --cppflags` -DNDEBUG
include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/makefile.mk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment