r2980 - in packages/opencpn/trunk/debian: . patches

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2011-04-20 12:28:27 +0000 (Wed, 20 Apr 2011)
New Revision: 2980

Added:
   packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/control
   packages/opencpn/trunk/debian/patches/series
   packages/opencpn/trunk/debian/rules
Log:
Use xtide's WVS coastline instead of shipping a clone

Modified: packages/opencpn/trunk/debian/changelog
===================================================================
--- packages/opencpn/trunk/debian/changelog	2011-04-16 02:18:29 UTC (rev 2979)
+++ packages/opencpn/trunk/debian/changelog	2011-04-20 12:28:27 UTC (rev 2980)
@@ -6,8 +6,9 @@
   * Suggest xcalib to lower contrast for night vision
   * Install plugins .so to /usr/lib/opencpn-plugins/
   * Use system's zlib, bzip2 instead of embedded copy
+  * Use xtide's WVS coastline instead of shipping a clone
 
- -- Hamish B <hamish_b at yahoo.com>  Fri, 15 Apr 2011 15:35:56 +1200
+ -- Hamish B <hamish_b at yahoo.com>  Thu, 20 Apr 2011 17:20:04 +1200
 
 opencpn (2.2.918-1) unstable; urgency=low
 

Modified: packages/opencpn/trunk/debian/control
===================================================================
--- packages/opencpn/trunk/debian/control	2011-04-16 02:18:29 UTC (rev 2979)
+++ packages/opencpn/trunk/debian/control	2011-04-20 12:28:27 UTC (rev 2980)
@@ -11,7 +11,7 @@
 Package: opencpn
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgps19
-Recommends: gpsd
+Recommends: gpsd, xtide-coastline
 Suggests: gpsd-clients, xcalib
 Description: A concise GPS ChartPlotter/Navigator
  OpenCPN is a cross-platform ship-borne GUI chart plotter

Modified: packages/opencpn/trunk/debian/patches/series
===================================================================
--- packages/opencpn/trunk/debian/patches/series	2011-04-16 02:18:29 UTC (rev 2979)
+++ packages/opencpn/trunk/debian/patches/series	2011-04-20 12:28:27 UTC (rev 2980)
@@ -1,2 +1,3 @@
 fix-plugin-path.patch
 rm_embedded_zlib.patch
+use_xtide_coastline.patch

Added: packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch	                        (rev 0)
+++ packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch	2011-04-20 12:28:27 UTC (rev 2980)
@@ -0,0 +1,33 @@
+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.
+Index: opencpn/src/chart1.cpp
+===================================================================
+--- opencpn.orig/src/chart1.cpp	2011-04-21 00:09:08.208588848 +1200
++++ opencpn/src/chart1.cpp	2011-04-21 00:11:15.816860473 +1200
+@@ -1401,8 +1401,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-04-21 00:12:26.016601391 +1200
++++ opencpn/src/wvschart.cpp	2011-04-21 00:13:13.188610696 +1200
+@@ -52,7 +52,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++)

Modified: packages/opencpn/trunk/debian/rules
===================================================================
--- packages/opencpn/trunk/debian/rules	2011-04-16 02:18:29 UTC (rev 2979)
+++ packages/opencpn/trunk/debian/rules	2011-04-20 12:28:27 UTC (rev 2980)
@@ -21,6 +21,9 @@
 	mv -f $(CURDIR)/debian/opencpn/usr/share/opencpn/plugins/ \
 		$(CURDIR)/debian/opencpn/usr/lib/opencpn-plugins/
 	
+	# WVS supplied by the xtide-coastline package
+	rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/wvsdata/
+	
 	dh_install
 	
 	rm $(CURDIR)/debian/opencpn/usr/share/opencpn/license.txt