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

hamish-guest at alioth.debian.org hamish-guest at alioth.debian.org
Mon Apr 25 00:33:26 UTC 2011


Author: hamish-guest
Date: 2011-04-25 00:33:24 +0000 (Mon, 25 Apr 2011)
New Revision: 2984

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/copyright
   packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch
   packages/opencpn/trunk/debian/rules
Log:
updated for 2.4.423, copyright notes

Modified: packages/opencpn/trunk/debian/changelog
===================================================================
--- packages/opencpn/trunk/debian/changelog	2011-04-22 00:34:31 UTC (rev 2983)
+++ packages/opencpn/trunk/debian/changelog	2011-04-25 00:33:24 UTC (rev 2984)
@@ -1,6 +1,13 @@
+opencpn (2.4.423-1) unstable; urgency=low
+
+  * Packaged for upstream git beta version 2.4.423
+  * Add some copyright notes
+
+ -- Hamish B <hamish_b at yahoo.com>  Mon, 25 Apr 2011 12:18:38 +1200
+
 opencpn (2.4.412-1) unstable; urgency=low
 
-  * Packaged for upstream git patch version 2.4.412
+  * Packaged for upstream git beta version 2.4.412
   * Move to new DebianGIS email address
   * Recommend gpsd, suggest gpsd-clients
   * Suggest xcalib to lower contrast for night vision

Modified: packages/opencpn/trunk/debian/copyright
===================================================================
--- packages/opencpn/trunk/debian/copyright	2011-04-22 00:34:31 UTC (rev 2983)
+++ packages/opencpn/trunk/debian/copyright	2011-04-25 00:33:24 UTC (rev 2984)
@@ -1,25 +1,43 @@
 This work was packaged for Debian by:
 
     Anton Martchukov <anton at martchukov.com> on Sat, 26 Jun 2010 02:17:46 +0400
+    with help from the DebianGIS team.
 
 It was downloaded from http://sourceforge.net/projects/opencpn/
 
 Upstream Author(s):
 
-    dsr <bdbcat at yahoo.com>
+    David S Register <bdbcat at yahoo.com> - OpenCPN Lead Developer
+    Other contributing authors are listed in src/about.cpp AuthorText[].
 
 Copyright:
 
-    Copyright (C) 2008-2010 dsr <bdbcat at yahoo.com>
+    Copyright (C) 2008-2011 David S Register <bdbcat at yahoo.com>
 
 License:
 
     You are free to distribute this software under the terms of
     the GNU General Public License version 2.
     
-On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL-2'.
+    On Debian systems, the complete text of the GNU General Public
+    License can be found in the file `/usr/share/common-licenses/GPL-2'.
 
+  from src/about.c:
+    For Developer Reference, the included source code
+    elements are licensed as follows:
+
+      wxWidgets           LGPL
+      s52cnsy&s52plib     GPL
+      seriallib           GPL
+      tcmgr               GPL
+      mygdal              BSD, compatible with GPL
+      nmea0183            Owner License, compatible with GPL
+      triangles           Public Domain see tri.c, compatible with GPL
+      wvschart            Public Domain see wvschart.cpp, compatible with GPL
+
+
 The Debian packaging is:
 
-    Copyright (C) 2010 Anton Martchukov <anton at martchukov.com>
+    Copyright (C) 2010-2011 Anton Martchukov <anton at martchukov.com>,
+    and the DebianGIS team.
+

Modified: packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch	2011-04-22 00:34:31 UTC (rev 2983)
+++ packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch	2011-04-25 00:33:24 UTC (rev 2984)
@@ -1,17 +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 @@
+--- opencpn.orig/src/about.cpp	2011-04-25 09:18:19.000000000 +1200
++++ opencpn/src/about.cpp	2011-04-25 09:37:24.193610483 +1200
+@@ -295,8 +295,9 @@
  
-   itemBoxSizer8->Add(pLicenseTextCtl, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 5);
+       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"));
  
--  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);
  
-   wxTextFile license_file(license_loc);
- 

Modified: packages/opencpn/trunk/debian/rules
===================================================================
--- packages/opencpn/trunk/debian/rules	2011-04-22 00:34:31 UTC (rev 2983)
+++ packages/opencpn/trunk/debian/rules	2011-04-25 00:33:24 UTC (rev 2984)
@@ -27,7 +27,6 @@
 	dh_install
 	
 	rm $(CURDIR)/debian/opencpn/usr/share/opencpn/license.txt
-	# why remove doc/ ?
 	rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/doc
 
 




More information about the Pkg-grass-devel mailing list