r46893 - in /packages/wxAstroCapture/trunk/debian: README.source changelog control copyright patches/series patches/wx3-olly.patch patches/wx3.0.patch rules
moeller at users.alioth.debian.org
moeller at users.alioth.debian.org
Mon Sep 1 15:05:00 UTC 2014
Author: moeller
Date: Mon Sep 1 15:05:00 2014
New Revision: 46893
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46893
Log:
Fixed wxWidget 3.0 dependency of wxAstroCapture
Added:
packages/wxAstroCapture/trunk/debian/patches/wx3-olly.patch
Modified:
packages/wxAstroCapture/trunk/debian/README.source
packages/wxAstroCapture/trunk/debian/changelog
packages/wxAstroCapture/trunk/debian/control
packages/wxAstroCapture/trunk/debian/copyright
packages/wxAstroCapture/trunk/debian/patches/series
packages/wxAstroCapture/trunk/debian/patches/wx3.0.patch
packages/wxAstroCapture/trunk/debian/rules
Modified: packages/wxAstroCapture/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/wxAstroCapture/trunk/debian/README.source?rev=46893&op=diff
==============================================================================
--- packages/wxAstroCapture/trunk/debian/README.source (original)
+++ packages/wxAstroCapture/trunk/debian/README.source Mon Sep 1 15:05:00 2014
@@ -8,7 +8,8 @@
prior to redistribution.
The doc folder offers many .PDF files with unclear origin and the TimeFont
-has a copyright by Adobe - to keep things simple, that doc folder is removed.
+has a copyright by Adobe - to keep things simple, that doc folder was
+removed as a whole.
-- Steffen Moeller <moeller at debian.org> Mon, 03 Mar 2014 21:55:57 +0100
Modified: packages/wxAstroCapture/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/wxAstroCapture/trunk/debian/changelog?rev=46893&op=diff
==============================================================================
--- packages/wxAstroCapture/trunk/debian/changelog (original)
+++ packages/wxAstroCapture/trunk/debian/changelog Mon Sep 1 15:05:00 2014
@@ -1,3 +1,11 @@
+wxastrocapture (1.8.1+git20140821+dfsg-1) unstable; urgency=low
+
+ * debian/rules - get-orig-source target
+ [ Olly Betts ]
+ * Update to use wxWidgets 3.0 (Closes: #755558).
+
+ -- Steffen Moeller <moeller at debian.org> Mon, 01 Sep 2014 16:01:42 +0200
+
wxastrocapture (1.8.1+git20140303+dfsg-2) unstable; urgency=low
* Reupload - Thanks got to Thorsten Alteholz for his scrutiny
Modified: packages/wxAstroCapture/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/wxAstroCapture/trunk/debian/control?rev=46893&op=diff
==============================================================================
--- packages/wxAstroCapture/trunk/debian/control (original)
+++ packages/wxAstroCapture/trunk/debian/control Mon Sep 1 15:05:00 2014
@@ -5,8 +5,7 @@
Uploaders: Steffen Moeller <moeller at debian.org>
Build-Depends: debhelper (>= 9.0.0), cbp2make,
libusb-dev, libv4l-dev,
- libwxgtk2.8-dev
-#, libwxgtk2.8-dbg # dependency affects dpkg-shlibdeps
+ libwxgtk3.0-dev
Standards-Version: 3.9.5
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/wxAstroCapture/
Vcs-Svn: svn://svn.debian.org/debian-science/packages/wxAstroCapture/trunk/
Modified: packages/wxAstroCapture/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/wxAstroCapture/trunk/debian/copyright?rev=46893&op=diff
==============================================================================
--- packages/wxAstroCapture/trunk/debian/copyright (original)
+++ packages/wxAstroCapture/trunk/debian/copyright Mon Sep 1 15:05:00 2014
@@ -64,7 +64,7 @@
the GNU Lesser General Public License as published by the
Free Software Foundation; either version 3 of the License,
or (at your option) any later version.
-
+ .
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Modified: packages/wxAstroCapture/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/wxAstroCapture/trunk/debian/patches/series?rev=46893&op=diff
==============================================================================
--- packages/wxAstroCapture/trunk/debian/patches/series (original)
+++ packages/wxAstroCapture/trunk/debian/patches/series Mon Sep 1 15:05:00 2014
@@ -1,3 +1,5 @@
avoidUpx.patch
no_minus_s_to_gcc.patch
+#wx3.0-compat.patch
wx3.0.patch
+wx3-olly.patch
Added: packages/wxAstroCapture/trunk/debian/patches/wx3-olly.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wxAstroCapture/trunk/debian/patches/wx3-olly.patch?rev=46893&op=file
==============================================================================
--- packages/wxAstroCapture/trunk/debian/patches/wx3-olly.patch (added)
+++ packages/wxAstroCapture/trunk/debian/patches/wx3-olly.patch Mon Sep 1 15:05:00 2014
@@ -0,0 +1,127 @@
+Index: wxAstroCapture-1.8.1/wxGuidingConfig.cpp
+===================================================================
+--- wxAstroCapture-1.8.1.orig/wxGuidingConfig.cpp
++++ wxAstroCapture-1.8.1/wxGuidingConfig.cpp
+@@ -67,7 +67,7 @@ bool wxGuidingConfig::saveGuidingOptions
+ wxConfigPath path(config,wxT("Guiding"));
+ config->Write(_T("ReverseRA"),reverseRA);
+ config->Write(_T("ReverseDEC"),reverseDEC);
+- config->Write(_T("DECguiding"),dec);
++ config->Write(_T("DECguiding"),(int)dec);
+
+ m_cached_reverseRA = reverseRA;
+ m_cached_reverseDEC = reverseDEC;
+Index: wxAstroCapture-1.8.1/wxIO/wxGuiderPort.cpp
+===================================================================
+--- wxAstroCapture-1.8.1.orig/wxIO/wxGuiderPort.cpp
++++ wxAstroCapture-1.8.1/wxIO/wxGuiderPort.cpp
+@@ -347,8 +347,8 @@ bool wxGuiderPort::SaveToConfigGuidePort
+ config->Write(_T("GXRA_neg"),this->GXRA_neg());
+ config->Write(_T("GXDEC_neg"),this->GXDEC_neg());
+ config->Write(_T("GXinvertedLogic"), this->InvertedLogic());
+- config->Write(_T("GXhandshake"), this->SerialHandshake());
+- config->Write(_T("GXbaudrate"), this->SerialBaudrate());
++ config->Write(_T("GXhandshake"), (int) this->SerialHandshake());
++ config->Write(_T("GXbaudrate"), (int) this->SerialBaudrate());
+
+ return true;
+ }
+Index: wxAstroCapture-1.8.1/wxScopeServer_Demo/wxScopeServer.cbp
+===================================================================
+--- wxAstroCapture-1.8.1.orig/wxScopeServer_Demo/wxScopeServer.cbp
++++ wxAstroCapture-1.8.1/wxScopeServer_Demo/wxScopeServer.cbp
+@@ -246,13 +246,13 @@ Linux: gcc (GCC) 4.1.2
+ <Compiler>
+ <Add option="-Wall" />
+ <Add option="-g" />
+- <Add option="`wx-config --version=2.8 --toolkit=gtk2 --debug --cxxflags`" />
++ <Add option="`wx-config --version=3.0 --toolkit=gtk2 --debug --cxxflags`" />
+ <Add option="-DNOPCH" />
+ <Add option="-D__WXDEBUG__" />
+ <Add option="-D_DEBUG" />
+ </Compiler>
+ <Linker>
+- <Add option="`wx-config --version=2.8 --toolkit=gtk2 --debug --libs`" />
++ <Add option="`wx-config --version=3.0 --toolkit=gtk2 --debug --libs`" />
+ </Linker>
+ </Target>
+ <Target title="UX_Release">
+@@ -263,11 +263,11 @@ Linux: gcc (GCC) 4.1.2
+ <Compiler>
+ <Add option="-O2" />
+ <Add option="-W" />
+- <Add option="`wx-config --version=2.8 --toolkit=gtk2 --cxxflags`" />
++ <Add option="`wx-config --version=3.0 --toolkit=gtk2 --cxxflags`" />
+ <Add option="-DNOPCH" />
+ </Compiler>
+ <Linker>
+- <Add option="`wx-config --version=2.8 --toolkit=gtk2 --libs`" />
++ <Add option="`wx-config --version=3.0 --toolkit=gtk2 --libs`" />
+ </Linker>
+ </Target>
+ </Build>
+Index: wxAstroCapture-1.8.1/wxWebcam/uxcapture.cpp
+===================================================================
+--- wxAstroCapture-1.8.1.orig/wxWebcam/uxcapture.cpp
++++ wxAstroCapture-1.8.1/wxWebcam/uxcapture.cpp
+@@ -108,7 +108,7 @@ bool CUXcapture::ControlDevice(long cfIn
+ m_pDsCapFilterItem = new CV4LcapFilterItem( cFilter.GetCapFilter(cfIndex));
+
+ // open the device to control
+- _V_ ::fprintf(stderr, "CUXcapture::ControlDevice() - trying to open(v4l2dev) %S\n", m_pDsCapFilterItem->DevPath().c_str());
++ _V_ ::fprintf(stderr, "CUXcapture::ControlDevice() - trying to open(v4l2dev) %ls\n", (const wchar_t*) m_pDsCapFilterItem->DevPath().c_str());
+ m_device = ::open(m_pDsCapFilterItem->DevPath().fn_str(),O_RDWR /*required*/ | O_NONBLOCK,0);
+
+ if(-1 == m_device) {
+Index: wxAstroCapture-1.8.1/wxWebcam/v4l2capfilter.cpp
+===================================================================
+--- wxAstroCapture-1.8.1.orig/wxWebcam/v4l2capfilter.cpp
++++ wxAstroCapture-1.8.1/wxWebcam/v4l2capfilter.cpp
+@@ -142,7 +142,7 @@ bool CV4LcapFilter::EnumerateCapFilter()
+ close(device);
+ continue;
+ }
+- _V_ ::fprintf(stderr, "CV4LcapFilter::EnumerateCapFilter: Probing %ls\n", m_actualDevPath.c_str());
++ _V_ ::fprintf(stderr, "CV4LcapFilter::EnumerateCapFilter: Probing %ls\n", (const wchar_t*) m_actualDevPath.c_str());
+ EnumPixFormat(device);
+
+ close(device);
+@@ -191,7 +191,7 @@ void CV4LcapFilter::AddSupport(int v4l2_
+ }
+ }
+ if (!found) {
+- ::fprintf(stderr, "CV4LcapFilter::AddSupport: %ls\n", item->FName().c_str());
++ ::fprintf(stderr, "CV4LcapFilter::AddSupport: %ls\n", (const wchar_t*) item->FName().c_str());
+ m_pFilters[m_numFilter] = item;
+ // add an index to the filter
+ m_pFilters[m_numFilter]->put_FIndex(m_numFilter);
+Index: wxAstroCapture-1.8.1/wxcustom/wxStatusBarEx.cpp
+===================================================================
+--- wxAstroCapture-1.8.1.orig/wxcustom/wxStatusBarEx.cpp
++++ wxAstroCapture-1.8.1/wxcustom/wxStatusBarEx.cpp
+@@ -34,8 +34,10 @@ void wxStatusBarEx::OnPaint(wxPaintEvent
+ /// when using red theme
+ dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+
+- for (int i = 0; i < m_nFields; i ++)
+- DrawField(dc, i);
++ int textHeight = dc.GetCharHeight();
++ int nFields = GetFieldsCount();
++ for (int i = 0; i < nFields; i ++)
++ DrawField(dc, i, textHeight);
+ }
+
+ #endif
+Index: wxAstroCapture-1.8.1/wxthings/spinctld.cpp
+===================================================================
+--- wxAstroCapture-1.8.1.orig/wxthings/spinctld.cpp
++++ wxAstroCapture-1.8.1/wxthings/spinctld.cpp
+@@ -320,7 +320,7 @@ void wxSpinCtrlDbl::OnTextEnter( wxComma
+ void wxSpinCtrlDbl::OnText( wxCommandEvent &event )
+ {
+ // always reflect the value to m_value
+- if(m_textCtrl->IsModified()) {
++ if(m_textCtrl && m_textCtrl->IsModified()) {
+ wxString value = m_textCtrl->GetValue();
+ value.ToDouble( &m_value );
+ DoSendEvent();
Modified: packages/wxAstroCapture/trunk/debian/patches/wx3.0.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wxAstroCapture/trunk/debian/patches/wx3.0.patch?rev=46893&op=diff
==============================================================================
--- packages/wxAstroCapture/trunk/debian/patches/wx3.0.patch (original)
+++ packages/wxAstroCapture/trunk/debian/patches/wx3.0.patch Mon Sep 1 15:05:00 2014
@@ -40,28 +40,6 @@
<Add library="usb" />
</Linker>
<!--
-Index: wxastrocapture-1.8.1+git20140303+dfsg/wxWebcam/v4l2capfilter.cpp
-===================================================================
---- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxWebcam/v4l2capfilter.cpp
-+++ wxastrocapture-1.8.1+git20140303+dfsg/wxWebcam/v4l2capfilter.cpp
-@@ -142,7 +142,7 @@
- close(device);
- continue;
- }
-- _V_ ::fprintf(stderr, "CV4LcapFilter::EnumerateCapFilter: Probing %ls\n", m_actualDevPath.c_str());
-+ //fixme: _V_ ::fprintf(stderr, "CV4LcapFilter::EnumerateCapFilter: Probing %ls\n", m_actualDevPath.c_str());
- EnumPixFormat(device);
-
- close(device);
-@@ -191,7 +191,7 @@
- }
- }
- if (!found) {
-- ::fprintf(stderr, "CV4LcapFilter::AddSupport: %ls\n", item->FName().c_str());
-+ //fixme ::fprintf(stderr, "CV4LcapFilter::AddSupport: %ls\n", item->FName().c_str());
- m_pFilters[m_numFilter] = item;
- // add an index to the filter
- m_pFilters[m_numFilter]->put_FIndex(m_numFilter);
Index: wxastrocapture-1.8.1+git20140303+dfsg/wxWebcam/ArtDrvSim.cpp
===================================================================
--- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxWebcam/ArtDrvSim.cpp
@@ -114,44 +92,15 @@
if (simName.IsOk()) if (simName.FileExists()) return true;
simName.Assign(wxT("."), wxT(ART11002_FILE), wxT("raw"));
if (simName.IsOk()) if (simName.FileExists()) return true;
-Index: wxastrocapture-1.8.1+git20140303+dfsg/wxWebcam/uxcapture.cpp
-===================================================================
---- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxWebcam/uxcapture.cpp
-+++ wxastrocapture-1.8.1+git20140303+dfsg/wxWebcam/uxcapture.cpp
-@@ -108,7 +108,7 @@
- m_pDsCapFilterItem = new CV4LcapFilterItem( cFilter.GetCapFilter(cfIndex));
-
- // open the device to control
-- _V_ ::fprintf(stderr, "CUXcapture::ControlDevice() - trying to open(v4l2dev) %S\n", m_pDsCapFilterItem->DevPath().c_str());
-+ // fixme: _V_ ::fprintf(stderr, "CUXcapture::ControlDevice() - trying to open(v4l2dev) %S\n", m_pDsCapFilterItem->DevPath().c_str());
- m_device = ::open(m_pDsCapFilterItem->DevPath().fn_str(),O_RDWR /*required*/ | O_NONBLOCK,0);
-
- if(-1 == m_device) {
-Index: wxastrocapture-1.8.1+git20140303+dfsg/wxcustom/wxStatusBarEx.cpp
-===================================================================
---- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxcustom/wxStatusBarEx.cpp
-+++ wxastrocapture-1.8.1+git20140303+dfsg/wxcustom/wxStatusBarEx.cpp
-@@ -34,8 +34,10 @@
- /// when using red theme
- dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
-
-+ /* Fixme: m_nFields is gone
- for (int i = 0; i < m_nFields; i ++)
- DrawField(dc, i);
-+ */
- }
-
- #endif
Index: wxastrocapture-1.8.1+git20140303+dfsg/wxthings/spinctld.cpp
===================================================================
--- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxthings/spinctld.cpp
+++ wxastrocapture-1.8.1+git20140303+dfsg/wxthings/spinctld.cpp
-@@ -353,14 +353,16 @@
+@@ -353,14 +353,14 @@
DoSendEvent();
break;
}
- case WXK_PRIOR : // pg-up
-+ //fixme: no longer available case WXK_PRIOR : // pg-up
+ case WXK_PAGEUP : // pg-up
{
if (m_textCtrl && m_textCtrl->IsModified()) SyncSpinToText(false);
@@ -160,7 +109,6 @@
break;
}
- case WXK_NEXT : // pg-down
-+ //fixme: no longer available case WXK_NEXT : // pg-down
+ case WXK_PAGEDOWN : // pg-down
{
if (m_textCtrl && m_textCtrl->IsModified()) SyncSpinToText(false);
@@ -179,31 +127,3 @@
wxString appname = m_config.GetAppName();
userDataDir.Replace(wxT("wxastrocapture"),appname);
if(!::wxDirExists(userDataDir)) {
-Index: wxastrocapture-1.8.1+git20140303+dfsg/wxGuidingConfig.cpp
-===================================================================
---- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxGuidingConfig.cpp
-+++ wxastrocapture-1.8.1+git20140303+dfsg/wxGuidingConfig.cpp
-@@ -67,7 +67,7 @@
- wxConfigPath path(config,wxT("Guiding"));
- config->Write(_T("ReverseRA"),reverseRA);
- config->Write(_T("ReverseDEC"),reverseDEC);
-- config->Write(_T("DECguiding"),dec);
-+ //fixme: config->Write(_T("DECguiding"),dec);
-
- m_cached_reverseRA = reverseRA;
- m_cached_reverseDEC = reverseDEC;
-Index: wxastrocapture-1.8.1+git20140303+dfsg/wxIO/wxGuiderPort.cpp
-===================================================================
---- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxIO/wxGuiderPort.cpp
-+++ wxastrocapture-1.8.1+git20140303+dfsg/wxIO/wxGuiderPort.cpp
-@@ -347,8 +347,8 @@
- config->Write(_T("GXRA_neg"),this->GXRA_neg());
- config->Write(_T("GXDEC_neg"),this->GXDEC_neg());
- config->Write(_T("GXinvertedLogic"), this->InvertedLogic());
-- config->Write(_T("GXhandshake"), this->SerialHandshake());
-- config->Write(_T("GXbaudrate"), this->SerialBaudrate());
-+ //fixme: config->Write(_T("GXhandshake"), this->SerialHandshake());
-+ //fixme: config->Write(_T("GXbaudrate"), this->SerialBaudrate());
-
- return true;
- }
Modified: packages/wxAstroCapture/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/wxAstroCapture/trunk/debian/rules?rev=46893&op=diff
==============================================================================
--- packages/wxAstroCapture/trunk/debian/rules (original)
+++ packages/wxAstroCapture/trunk/debian/rules Mon Sep 1 15:05:00 2014
@@ -3,6 +3,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS=hardening=-pie,+fortify
+export DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
%:
dh $@
@@ -12,7 +16,16 @@
#cbp2make -in wxWebcamDB.cbp -unix -out Makefile -targets UX_Debug
override_dh_auto_build:
- $(MAKE) CFLAGS=-g
+ # Compile with NDEBUG defined to handle assertion failures quietly line
+ # wx2.8 does by default.
+ $(MAKE) CFLAGS='-g -DNDEBUG'
override_dh_strip:
dh_strip --dbg-package=wxastrocapture-dbg
+
+VERSION=1.8.1
+get-orig-source:
+ #git clone https://github.com/wxAstro/wxAstroCapture.git wxAstroCapture-$(VERSION)
+ tar --exclude bin --exclude doc --exclude .git -cJvf ../wxAstroCapture_$(VERSION)+git$(shell date +"%Y%m%d")+dfsg.tar.xz wxAstroCapture-$(VERSION)
+ rm -rf ../wxAstroCapture-$(VERSION)
+ mv wxAstroCapture-$(VERSION) ..
More information about the debian-science-commits
mailing list