Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • debian-gis-team/opencpn
1 result
Show changes
usr
src/bitmaps/opencpn.xpm usr/share/pixmaps
debian/opencpn.1
Description: Don't clobber CFLAGS set by main debian/rules file (allows hardening flags to pass through)
Author: Hamish Bowman <hamish_b yahoo com>
Index: opencpn/plugins/grib_pi/CMakeLists.txt
===================================================================
--- opencpn/plugins/grib_pi/CMakeLists.txt 2011-08-02 23:30:34.000000000 +1200
+++ opencpn/plugins/grib_pi/CMakeLists.txt 2012-06-16 15:28:25.621929917 +1200
@@ -32,7 +32,7 @@
ADD_DEFINITIONS( "-Wall -O3 -fexceptions -fvisibility=hidden" )
IF(NOT APPLE)
- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic")
ELSE(NOT APPLE)
SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup")
ENDIF(NOT APPLE)
Index: opencpn/plugins/dashboard_pi/CMakeLists.txt
===================================================================
--- opencpn/plugins/dashboard_pi/CMakeLists.txt 2011-08-02 23:30:34.000000000 +1200
+++ opencpn/plugins/dashboard_pi/CMakeLists.txt 2012-06-16 15:27:48.533933730 +1200
@@ -33,7 +33,7 @@
ADD_DEFINITIONS( "-Wall -O3 -fexceptions -fvisibility=hidden" )
IF(NOT APPLE)
- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic")
ELSE(NOT APPLE)
SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup")
ENDIF(NOT APPLE)
Index: opencpn/plugins/demo_pi_sample/CMakeLists.txt
===================================================================
--- opencpn/plugins/demo_pi_sample/CMakeLists.txt 2011-08-02 23:30:34.000000000 +1200
+++ opencpn/plugins/demo_pi_sample/CMakeLists.txt 2012-06-16 15:30:12.885859634 +1200
@@ -43,7 +43,7 @@
ADD_DEFINITIONS( "-Wall -g -fexceptions -fvisibility=hidden" )
IF(NOT APPLE)
- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic")
ELSE(NOT APPLE)
SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup")
ENDIF(NOT APPLE)
This diff is collapsed.
Description: point to Debian-package doc dir
Author: Hamish B <hamish_b yahoo com>
Index: opencpn/src/about.cpp
===================================================================
--- opencpn.orig/src/about.cpp 2011-08-02 22:59:00.202915243 +1200
+++ opencpn/src/about.cpp 2011-08-02 22:59:00.210927964 +1200
@@ -452,7 +452,8 @@
wxString def_lang_canonical = wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT)->CanonicalName;
wxString help_locn = _T("doc/help_");
- help_locn.Prepend(*m_pDataLocn);
+// help_locn.Prepend(*m_pDataLocn);
+ help_locn.Prepend(_T("/usr/share/doc/opencpn-doc/"));
wxString help_try = help_locn;
help_try += def_lang_canonical;
Description: Use system's copy of GPL2.txt
Author: Hamish B <hamish_b yahoo com>
Index: opencpn/src/about.cpp
===================================================================
--- opencpn.orig/src/about.cpp 2011-06-29 21:34:10.223946190 +1200
+++ opencpn/src/about.cpp 2011-06-29 21:52:23.823174370 +1200
@@ -299,8 +299,9 @@
pLicenseTextCtl->SetDefaultStyle(ta);
pLicenseTextCtl->Clear();
- wxString license_loc(*m_pDataLocn);
- license_loc.Append(_T("license.txt"));
+ //wxString license_loc(*m_pDataLocn);
+ //license_loc.Append(_T("license.txt"));
+ wxString license_loc(_T("/usr/share/common-licenses/GPL-2"));
wxTextFile license_file(license_loc);
use_xtide_coastline.patch
ref_debian_gpl2.patch
ref_debian_doc_dir.patch
use_pkg_tinyxml.patch
backport_libgps20_support.patch
allow_harden_plugins.patch
Description: Use system's copy of the TinyXML library
Author: Hamish B <hamish_b yahoo com>
Index: opencpn/include/gpxdocument.h
===================================================================
--- opencpn.orig/include/gpxdocument.h 2011-08-02 23:09:19.967165256 +1200
+++ opencpn/include/gpxdocument.h 2011-08-02 23:09:48.359953077 +1200
@@ -29,7 +29,9 @@
#include <wx/wx.h>
#include <tinyxml.h>
+#ifndef TIXML_USE_STL
#include <tinystr.h>
+#endif
#include <stdio.h>
const wxString GpxxColorNames[] = { _("Black"), _("DarkRed"), _("DarkGreen"), _("DarkYellow"), _("DarkBlue"), _("DarkMagenta"), _("DarkCyan"), _("LightGray"), _("DarkGray"), _("Red"), _("Green"), _("Yellow"), _("Blue"), _("Magenta"), _("Cyan"), _("White") };//The last color defined by Garmin is transparent - we ignore it
Description: Depend on WVS coastline from Debian's xtide package instead
of shipping a clone of it. If that is not installed the result is not
fatal, just a warning in the log file.
Author: Hamish B <hamish_b yahoo com>
Index: opencpn/src/chart1.cpp
===================================================================
--- opencpn.orig/src/chart1.cpp 2011-08-02 22:27:50.202928736 +1200
+++ opencpn/src/chart1.cpp 2011-08-02 22:28:33.191166883 +1200
@@ -2384,8 +2384,9 @@
// Establish the WorldVectorShoreline Dataset location
- pWVS_Locn = new wxString(_T("wvsdata"));
- pWVS_Locn->Prepend(g_SData_Locn);
+// pWVS_Locn = new wxString(_T("wvsdata"));
+// pWVS_Locn->Prepend(g_SData_Locn);
+ pWVS_Locn = new wxString(_T("/usr/share/xtide-wvs"));
pWVS_Locn->Append(wxFileName::GetPathSeparator());
// Reload the config data, to pick up any missing data class configuration info
Index: opencpn/src/wvschart.cpp
===================================================================
--- opencpn.orig/src/wvschart.cpp 2011-08-02 22:27:50.206918980 +1200
+++ opencpn/src/wvschart.cpp 2011-08-02 22:28:33.195176364 +1200
@@ -50,7 +50,8 @@
{
pwvs_home_dir = new wxString(wvs_chart_home);
pwvs_file_name = new wxString(*pwvs_home_dir);
- pwvs_file_name->Append(_T("wvs43.dat"));
+// pwvs_file_name->Append(_T("wvs43.dat"));
+ pwvs_file_name->Append(_T("wvs1.dat"));
for(int i=0 ; i < 360 ; i++)
{
for(int j=0 ; j < 180; j++)
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
# Optimization and debugging flags are added in CMakeLists.txt. To support
# DEB_BUILD_OPTIONS's noopt perhaps that should be patched away and that
# logic be made to happen here?
# Specifically, -O3's function inlining is desired.
CFLAGS=-Wall
CXXFLAGS=-Wall -O3
# comment out the above and uncomment the following to enable hardening
#include /usr/share/hardening-includes/hardening.make
#DEB_CFLAGS_MAINT_APPEND=-O3
#CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
#CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
#CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
#LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
#CFLAGS+=$(HARDENING_CFLAGS)
#CXXFLAGS+=$(HARDENING_CXXFLAGS)
#LDFLAGS+=$(HARDENING_LDFLAGS)
#CXXFLAGS+=-fPIC
#export DEB_CFLAGS_MAINT_APPEND CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
%:
dh $@ --parallel
override_dh_auto_configure:
# Remove embedded stuff which will go unused
rm -rf $(CURDIR)/plugins/grib_pi/src/zlib-1.2.3/
rm -rf $(CURDIR)/plugins/grib_pi/src/bzip2/
rm -f $(CURDIR)/include/tinyxml.h
rm -f $(CURDIR)/include/tinystr.h
rm -f $(CURDIR)/src/tinyxml*.cpp
rm -f $(CURDIR)/src/tinystr.cpp
dh_auto_configure
override_dh_install:
# WVS supplied by the xtide-coastline package
rm -rf $(CURDIR)/debian/tmp/usr/share/opencpn/wvsdata/
dh_install
rm $(CURDIR)/debian/opencpn/usr/share/opencpn/license.txt
#moved into subordinate packages:
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/doc
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/sounds
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/tcdata
rm -rf $(CURDIR)/debian/opencpn/usr/lib
#READMEs already installed to the opencpn-data/docs dir
rm $(CURDIR)/debian/opencpn-data/usr/share/opencpn/sounds/README.bells
rm $(CURDIR)/debian/opencpn-data/usr/share/opencpn/tcdata/README.harmonics
3.0 (quilt)
version=3
opts=dversionmangle=s/\+dfsg// \
http://sf.net/opencpn/OpenCPN-([\d\.]+)-Source\.tar\.gz