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

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2011-04-15 10:07:31 +0000 (Fri, 15 Apr 2011)
New Revision: 2977

Added:
   packages/opencpn/trunk/debian/patches/fix-plugin-path.patch
   packages/opencpn/trunk/debian/patches/series
Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/rules
Log:
more plugin path patching

Modified: packages/opencpn/trunk/debian/changelog
===================================================================
--- packages/opencpn/trunk/debian/changelog	2011-04-15 08:14:38 UTC (rev 2976)
+++ packages/opencpn/trunk/debian/changelog	2011-04-15 10:07:31 UTC (rev 2977)
@@ -4,8 +4,9 @@
   * Move to new DebianGIS email address
   * Recommend gpsd, suggest gpsd-clients
   * Suggest xcalib to lower contrast for night vision
+  * Install plugins .so to /usr/lib/opencpn-plugins/
 
- -- Hamish B <hamish_b at yahoo.com>  Fri, 15 Apr 2011 15:12:36 +1200
+ -- Hamish B <hamish_b at yahoo.com>  Fri, 15 Apr 2011 15:35:56 +1200
 
 opencpn (2.2.918-1) unstable; urgency=low
 

Added: packages/opencpn/trunk/debian/patches/fix-plugin-path.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/fix-plugin-path.patch	                        (rev 0)
+++ packages/opencpn/trunk/debian/patches/fix-plugin-path.patch	2011-04-15 10:07:31 UTC (rev 2977)
@@ -0,0 +1,16 @@
+Look for .so plugins in /usr/lib/opencpn-plugins/
+(lintian E: arch-dependent-file-in-usr-share)
+Index: opencpn/src/pluginmanager.cpp
+===================================================================
+--- opencpn.orig/src/pluginmanager.cpp	2011-04-15 20:58:59.296628331 +1200
++++ opencpn/src/pluginmanager.cpp	2011-04-15 20:59:16.701862358 +1200
+@@ -106,7 +106,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 "));

Added: packages/opencpn/trunk/debian/patches/series
===================================================================
--- packages/opencpn/trunk/debian/patches/series	                        (rev 0)
+++ packages/opencpn/trunk/debian/patches/series	2011-04-15 10:07:31 UTC (rev 2977)
@@ -0,0 +1 @@
+fix-plugin-path.patch

Modified: packages/opencpn/trunk/debian/rules
===================================================================
--- packages/opencpn/trunk/debian/rules	2011-04-15 08:14:38 UTC (rev 2976)
+++ packages/opencpn/trunk/debian/rules	2011-04-15 10:07:31 UTC (rev 2977)
@@ -17,6 +17,10 @@
 	mkdir -p $(CURDIR)/debian/opencpn/usr/share/pixmaps
 	cp $(CURDIR)/src/bitmaps/opencpn.xpm $(CURDIR)/debian/opencpn/usr/share/pixmaps/
 	
+	mkdir -p $(CURDIR)/debian/opencpn/usr/lib
+	mv -f $(CURDIR)/debian/opencpn/usr/share/opencpn/plugins/ \
+		$(CURDIR)/debian/opencpn/usr/lib/opencpn-plugins/
+	
 	dh_install
 	
 	rm $(CURDIR)/debian/opencpn/usr/share/opencpn/license.txt