r3026 - packages/opencpn/trunk/debian/patches

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2011-06-29 09:55:08 +0000 (Wed, 29 Jun 2011)
New Revision: 3026

Removed:
   packages/opencpn/trunk/debian/patches/fix-plugin-path.patch
Modified:
   packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch
   packages/opencpn/trunk/debian/patches/series
   packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
Log:
Drop plugin path patch (merged upstream), sync to 2.4.628


Deleted: packages/opencpn/trunk/debian/patches/fix-plugin-path.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/fix-plugin-path.patch	2011-06-28 13:53:18 UTC (rev 3025)
+++ packages/opencpn/trunk/debian/patches/fix-plugin-path.patch	2011-06-29 09:55:08 UTC (rev 3026)
@@ -1,17 +0,0 @@
-Description: Look for .so plugins in /usr/lib/opencpn-plugins/
- (lintian E: arch-dependent-file-in-usr-share)
-Author: Hamish B <hamish_b yahoo com>
-Index: opencpn/src/pluginmanager.cpp
-===================================================================
---- opencpn.orig/src/pluginmanager.cpp	2011-06-15 07:31:01.063910240 +1200
-+++ opencpn/src/pluginmanager.cpp	2011-06-15 08:31:00.678910033 +1200
-@@ -126,7 +126,8 @@
- 
- bool PlugInManager::LoadAllPlugIns(wxString &shared_data_prefix)
- {
--      m_plugin_location = shared_data_prefix + _T("plugins");
-+      //m_plugin_location = shared_data_prefix + _T("plugins");
-+      m_plugin_location = _T("/usr/lib/opencpn-plugins");
-       wxDir pi_dir(m_plugin_location);
- 
-       wxString msg(_("PlugInManager searching for PlugIns in location "));

Modified: packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch	2011-06-28 13:53:18 UTC (rev 3025)
+++ packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch	2011-06-29 09:55:08 UTC (rev 3026)
@@ -2,9 +2,9 @@
 Author: Hamish B <hamish_b yahoo com>
 Index: opencpn/src/about.cpp
 ===================================================================
---- opencpn.orig/src/about.cpp	2011-06-20 20:42:50.939910017 +1200
-+++ opencpn/src/about.cpp	2011-06-20 20:53:28.910938614 +1200
-@@ -298,8 +298,9 @@
+--- 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();

Modified: packages/opencpn/trunk/debian/patches/series
===================================================================
--- packages/opencpn/trunk/debian/patches/series	2011-06-28 13:53:18 UTC (rev 3025)
+++ packages/opencpn/trunk/debian/patches/series	2011-06-29 09:55:08 UTC (rev 3026)
@@ -1,4 +1,3 @@
-fix-plugin-path.patch
 use_xtide_coastline.patch
 ref_debian_gpl2.patch
 ref_debian_doc_dir.patch

Modified: packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch	2011-06-28 13:53:18 UTC (rev 3025)
+++ packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch	2011-06-29 09:55:08 UTC (rev 3026)
@@ -4,9 +4,9 @@
 Author: Hamish B <hamish_b yahoo com>
 Index: opencpn/src/chart1.cpp
 ===================================================================
---- opencpn.orig/src/chart1.cpp	2011-06-20 20:42:50.955910181 +1200
-+++ opencpn/src/chart1.cpp	2011-06-20 20:53:11.075910208 +1200
-@@ -2312,8 +2312,9 @@
+--- opencpn.orig/src/chart1.cpp	2011-06-29 21:34:10.275910232 +1200
++++ opencpn/src/chart1.cpp	2011-06-29 21:51:42.763171105 +1200
+@@ -2328,8 +2328,9 @@
  
  
  //      Establish the WorldVectorShoreline Dataset location
@@ -20,9 +20,9 @@
  //      Reload the config data, to pick up any missing data class configuration info
 Index: opencpn/src/wvschart.cpp
 ===================================================================
---- opencpn.orig/src/wvschart.cpp	2011-06-20 20:42:50.987910788 +1200
-+++ opencpn/src/wvschart.cpp	2011-06-20 20:53:11.111949910 +1200
-@@ -51,7 +51,8 @@
+--- opencpn.orig/src/wvschart.cpp	2011-06-29 21:34:10.323339524 +1200
++++ opencpn/src/wvschart.cpp	2011-06-29 21:51:42.795910230 +1200
+@@ -50,7 +50,8 @@
  {
          pwvs_home_dir = new wxString(wvs_chart_home);
          pwvs_file_name = new wxString(*pwvs_home_dir);