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

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2011-04-20 12:59:12 +0000 (Wed, 20 Apr 2011)
New Revision: 2981

Added:
   packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch
Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/patches/series
Log:
use system copy of gpl2.txt

Modified: packages/opencpn/trunk/debian/changelog
===================================================================
--- packages/opencpn/trunk/debian/changelog	2011-04-20 12:28:27 UTC (rev 2980)
+++ packages/opencpn/trunk/debian/changelog	2011-04-20 12:59:12 UTC (rev 2981)
@@ -6,9 +6,10 @@
   * 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
+  * Recommend xtide's WVS coastline instead of shipping a clone
+  * Use system's copy of the GPLv2
 
- -- Hamish B <hamish_b at yahoo.com>  Thu, 20 Apr 2011 17:20:04 +1200
+ -- Hamish B <hamish_b at yahoo.com>  Wed, 20 Apr 2011 17:56:57 +1200
 
 opencpn (2.2.918-1) unstable; urgency=low
 

Added: packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch	                        (rev 0)
+++ packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch	2011-04-20 12:59:12 UTC (rev 2981)
@@ -0,0 +1,17 @@
+Use system's copy of GPL2.txt
+Index: opencpn/src/about.cpp
+===================================================================
+--- opencpn.orig/src/about.cpp	2011-04-21 00:52:03.916597067 +1200
++++ opencpn/src/about.cpp	2011-04-21 00:55:06.228860456 +1200
+@@ -327,8 +327,9 @@
+ 
+   itemBoxSizer8->Add(pLicenseTextCtl, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 5);
+ 
+-  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);
+ 

Modified: packages/opencpn/trunk/debian/patches/series
===================================================================
--- packages/opencpn/trunk/debian/patches/series	2011-04-20 12:28:27 UTC (rev 2980)
+++ packages/opencpn/trunk/debian/patches/series	2011-04-20 12:59:12 UTC (rev 2981)
@@ -1,3 +1,4 @@
 fix-plugin-path.patch
 rm_embedded_zlib.patch
 use_xtide_coastline.patch
+ref_debian_gpl2.patch