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

hamish-guest at alioth.debian.org hamish-guest at alioth.debian.org
Sun May 8 06:23:52 UTC 2011


Author: hamish-guest
Date: 2011-05-08 06:23:48 +0000 (Sun, 08 May 2011)
New Revision: 2993

Added:
   packages/opencpn/trunk/debian/opencpn.manpages
Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/control
   packages/opencpn/trunk/debian/opencpn-data.docs
   packages/opencpn/trunk/debian/opencpn.1
   packages/opencpn/trunk/debian/opencpn.install
   packages/opencpn/trunk/debian/patches/fix-plugin-path.patch
   packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
   packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch
   packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
   packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
   packages/opencpn/trunk/debian/rules
   packages/opencpn/trunk/debian/watch
Log:
Packaged for upstream git beta version 2.4.506.
A number of packaging cleanups based on pabs's mentor review.


Modified: packages/opencpn/trunk/debian/changelog
===================================================================
--- packages/opencpn/trunk/debian/changelog	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/changelog	2011-05-08 06:23:48 UTC (rev 2993)
@@ -1,3 +1,10 @@
+opencpn (2.4.506-1) unstable; urgency=low
+
+  * Packaged for upstream git beta version 2.4.506
+  * A number of packaging cleanups based on pabs's mentor review
+
+ -- Hamish B <hamish_b at yahoo.com>  Sun, 08 May 2011 16:42:40 +1200
+
 opencpn (2.4.423-1) unstable; urgency=low
 
   * Packaged for upstream git beta version 2.4.423

Modified: packages/opencpn/trunk/debian/control
===================================================================
--- packages/opencpn/trunk/debian/control	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/control	2011-05-08 06:23:48 UTC (rev 2993)
@@ -13,8 +13,8 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgps19
 Recommends: gpsd, opencpn-data, opencpn-doc, xtide-coastline
 Suggests: gpsd-clients, xcalib
-Description: A concise GPS ChartPlotter/Navigator
- OpenCPN is a cross-platform ship-borne GUI chart plotter
+Description: GPS ChartPlotter/Navigator
+ OpenCPN is a concise ship-borne GUI chart plotter
  application supporting:
  .
      * GPS/GPDS Postition Input
@@ -28,16 +28,9 @@
 Depends: ${misc:Depends}
 Section: doc
 Suggests: opencpn
-Description: Documentation for OpenCPN, a concise GPS ChartPlotter/Navigator
- OpenCPN is a cross-platform ship-borne GUI chart plotter
- application supporting:
+Description: Documentation for OpenCPN, a GPS ChartPlotter/Navigator
+ OpenCPN is a concise ship-borne GUI chart plotter application.
  .   
-     * GPS/GPDS Postition Input
-     * BSB Raster Chart Display
-     * S57 Vector ENChart Display
-     * AIS Input Decoding
-     * Waypoint Autopilot Navigation
- .
  This package contains the HTML documentation for OpenCPN.
 
 Package: opencpn-data
@@ -45,14 +38,6 @@
 Depends: ${misc:Depends}
 Suggests: opencpn
 Description: Tidal harmonics and audio files for OpenCPN
- OpenCPN is a cross-platform ship-borne GUI chart plotter
- application supporting:
+ OpenCPN is a concise ship-borne GUI chart plotter application.
  .
-     * GPS/GPDS Postition Input
-     * BSB Raster Chart Display
-     * S57 Vector ENChart Display
-     * AIS Input Decoding
-     * Waypoint Autopilot Navigation
- .
  This package contains the tidal harmonics and audio files for OpenCPN.
-

Modified: packages/opencpn/trunk/debian/opencpn-data.docs
===================================================================
--- packages/opencpn/trunk/debian/opencpn-data.docs	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/opencpn-data.docs	2011-05-08 06:23:48 UTC (rev 2993)
@@ -1,2 +1,2 @@
-data/sounds/README_BELLS.txt
+data/sounds/README.bells
 debian/README.harmonics

Modified: packages/opencpn/trunk/debian/opencpn.1
===================================================================
--- packages/opencpn/trunk/debian/opencpn.1	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/opencpn.1	2011-05-08 06:23:48 UTC (rev 2993)
@@ -33,6 +33,8 @@
 .B \-\-verbose
 Generate verbose log messages
 .SH "SEE ALSO"
-None.
+If the opencpn-doc package is installed, see /usr/share/doc/opencpn-doc/doc/help_en_US.html
+.SH FILES
+A logfile called opencpn.log is created in the user's home directory.
 .SH AUTHORS
 David S Register <bdbcat at yahoo.com> and the OpenCPN Development Team.

Modified: packages/opencpn/trunk/debian/opencpn.install
===================================================================
--- packages/opencpn/trunk/debian/opencpn.install	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/opencpn.install	2011-05-08 06:23:48 UTC (rev 2993)
@@ -1 +1,2 @@
 usr
+src/bitmaps/opencpn.xpm usr/share/pixmaps

Added: packages/opencpn/trunk/debian/opencpn.manpages
===================================================================
--- packages/opencpn/trunk/debian/opencpn.manpages	                        (rev 0)
+++ packages/opencpn/trunk/debian/opencpn.manpages	2011-05-08 06:23:48 UTC (rev 2993)
@@ -0,0 +1 @@
+debian/opencpn.1

Modified: packages/opencpn/trunk/debian/patches/fix-plugin-path.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/fix-plugin-path.patch	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/patches/fix-plugin-path.patch	2011-05-08 06:23:48 UTC (rev 2993)
@@ -1,5 +1,6 @@
-Look for .so plugins in /usr/lib/opencpn-plugins/
-(lintian E: arch-dependent-file-in-usr-share)
+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-04-15 20:58:59.296628331 +1200

Modified: packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch	2011-05-08 06:23:48 UTC (rev 2993)
@@ -1,4 +1,5 @@
-point to Debian-package doc dir
+Description: point to Debian-package doc dir
+Author: Hamish B <hamish_b yahoo com>
 Index: opencpn/src/about.cpp
 ===================================================================
 --- opencpn.orig/src/about.cpp	2011-04-21 01:00:16.956585284 +1200

Modified: packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch	2011-05-08 06:23:48 UTC (rev 2993)
@@ -1,4 +1,5 @@
-Use system's copy of GPL2.txt
+Description: Use system's copy of GPL2.txt
+Author: Hamish B <hamish_b yahoo com>
 Index: opencpn/src/about.cpp
 ===================================================================
 --- opencpn.orig/src/about.cpp	2011-04-25 09:18:19.000000000 +1200

Modified: packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch	2011-05-08 06:23:48 UTC (rev 2993)
@@ -1,4 +1,7 @@
-Use system's zlib, bzip2 instead of embedded copy.
+Description: Use system's zlib, bzip2 instead of embedded copy.
+Origin: Pavel on the OpenCPN forum
+ http://www.cruisersforum.com/forums/f134/opencpn-build-on-debian-35977-8.html#post667326
+Author: Hamish B <hamish_b yahoo com>
 Index: opencpn/plugins/grib_pi/CMakeLists.txt
 ===================================================================
 --- opencpn.orig/plugins/grib_pi/CMakeLists.txt	2011-04-15 23:21:38.285860737 +1200

Modified: packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch	2011-05-08 06:23:48 UTC (rev 2993)
@@ -1,6 +1,7 @@
-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.
+Description: 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.
+Author: Hamish B <hamish_b yahoo com>
 Index: opencpn/src/chart1.cpp
 ===================================================================
 --- opencpn.orig/src/chart1.cpp	2011-04-21 00:09:08.208588848 +1200

Modified: packages/opencpn/trunk/debian/rules
===================================================================
--- packages/opencpn/trunk/debian/rules	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/rules	2011-05-08 06:23:48 UTC (rev 2993)
@@ -1,10 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -14,9 +8,6 @@
 	dh  $@
 
 override_dh_install:
-	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/tmp/usr/share/opencpn/plugins/* \
 		$(CURDIR)/debian/opencpn/usr/lib/opencpn-plugins/
@@ -32,13 +23,6 @@
 	rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/sounds
 	rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/tcdata
 
-override_dh_installdocs:
-	dh_installdocs
-	mv $(CURDIR)/debian/opencpn-data/usr/share/doc/opencpn-data/README_BELLS.txt \
-		$(CURDIR)/debian/opencpn-data/usr/share/doc/opencpn-data/README.bells
-	rm $(CURDIR)/debian/opencpn-data/usr/share/opencpn/sounds/README_BELLS.txt
-	#harmonics readme already installed to the opencpn-data/docs dir
-	rm $(CURDIR)/debian/opencpn-doc/usr/share/doc/opencpn-doc/doc/README.harmonics
-
-override_dh_installman:
-	dh_installman debian/opencpn.1
+	#READMEs already installed to the opencpn-data/docs dir
+	rm $(CURDIR)/debian/opencpn-data/usr/share/opencpn/sounds/README.bells
+	rm $(CURDIR)/debian/opencpn-data/usr/share/opencpn/tcdata/README.harmonics

Modified: packages/opencpn/trunk/debian/watch
===================================================================
--- packages/opencpn/trunk/debian/watch	2011-05-06 13:23:56 UTC (rev 2992)
+++ packages/opencpn/trunk/debian/watch	2011-05-08 06:23:48 UTC (rev 2993)
@@ -1,3 +1,2 @@
 version=3
-
-http://sf.net/opencpn/opencpn-(.*)\.tar\.gz
\ No newline at end of file
+http://sf.net/opencpn/OpenCPN-([\d\.]+)-Source\.tar\.gz




More information about the Pkg-grass-devel mailing list