from:"hamish\-guest"

[DebianGIS-dev] r1224 - packages/grass/trunk/debian

2007-10-18 Thread hamish-guest

Author: hamish-guest
Date: 2007-10-18 09:49:40 + (Thu, 18 Oct 2007)
New Revision: 1224

Modified:
   packages/grass/trunk/debian/control
Log:
Build-depends changes:
* remove libgl1-mesa-swx11-dev as --with-glw is no longer used.
* libglu1-mesa-dev replaces libglu1-xorg-dev which replaced xlibmesa-glu-dev.
   keep libglu1-xorg-dev around for sarge backports


Modified: packages/grass/trunk/debian/control
===
--- packages/grass/trunk/debian/control 2007-10-17 15:04:04 UTC (rev 1223)
+++ packages/grass/trunk/debian/control 2007-10-18 09:49:40 UTC (rev 1224)
@@ -4,7 +4,7 @@
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine [EMAIL PROTECTED], Steve Halasz [EMAIL 
PROTECTED]
 Build-depends: flex, bison, libreadline5-dev | libreadline-dev, 
libncurses5-dev, lesstif2-dev, debhelper (= 5), dpatch, 
- libtiff4-dev, tcl8.4-dev, tk8.4-dev, fftw3-dev, libxmu-dev, 
libgl1-mesa-swx11-dev, libglu1-xorg-dev | xlibmesa-glu-dev, 
+ libtiff4-dev, tcl8.4-dev, tk8.4-dev, fftw3-dev, libxmu-dev, libglu1-mesa-dev 
| libglu1-xorg-dev, 
  libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (=1.4.0) | 
libgdal1-1.3.2-dev, proj (= 4.4.7), libjpeg62-dev, 
  libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, 
libmysqlclient15-dev, graphviz, libsqlite3-dev 
 Standards-Version: 3.7.2


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r1498 - packages/grass/trunk/debian

2008-04-04 Thread hamish-guest

Author: hamish-guest
Date: 2008-04-04 23:13:20 + (Fri, 04 Apr 2008)
New Revision: 1498

Modified:
   packages/grass/trunk/debian/watch
Log:
primary homepage moved to grass.osgeo.org

Modified: packages/grass/trunk/debian/watch
===
--- packages/grass/trunk/debian/watch   2008-04-03 18:48:19 UTC (rev 1497)
+++ packages/grass/trunk/debian/watch   2008-04-04 23:13:20 UTC (rev 1498)
@@ -1,2 +1,2 @@
 version=2
-http://grass.itc.it/grass62/source/grass-([\d\.]*).tar.gz debian uupdate
+http://grass.osgeo.org/grass62/source/grass-([\d\.]*).tar.gz debian uupdate


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r1499 - packages/grass/trunk/debian

2008-04-04 Thread hamish-guest

Author: hamish-guest
Date: 2008-04-04 23:19:04 + (Fri, 04 Apr 2008)
New Revision: 1499

Modified:
   packages/grass/trunk/debian/control
Log:
primary homepage moved to grass.osgeo.org

Modified: packages/grass/trunk/debian/control
===
--- packages/grass/trunk/debian/control 2008-04-04 23:13:20 UTC (rev 1498)
+++ packages/grass/trunk/debian/control 2008-04-04 23:19:04 UTC (rev 1499)
@@ -8,7 +8,7 @@
  libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (=1.4.0) | 
libgdal1-1.3.2-dev, proj (= 4.4.7), libjpeg62-dev, 
  libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, 
libmysqlclient15-dev, graphviz, libsqlite3-dev 
 Standards-Version: 3.7.3
-Homepage: http://grass.itc.it/
+Homepage: http://grass.osgeo.org/
 
 Package: grass
 Section: science


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r1788 - packages/grass/branches

2008-10-30 Thread hamish-guest

Author: hamish-guest
Date: 2008-10-30 15:06:36 + (Thu, 30 Oct 2008)
New Revision: 1788

Added:
   packages/grass/branches/6.4/
Log:
new branch for 6.4

Copied: packages/grass/branches/6.4 (from rev 1787, packages/grass/branches/6.3)


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r1789 - in packages/grass/branches/6.4/debian: . patches

2008-10-30 Thread hamish-guest

Author: hamish-guest
Date: 2008-10-30 15:56:06 + (Thu, 30 Oct 2008)
New Revision: 1789

Added:
   packages/grass/branches/6.4/debian/grass64.1
Removed:
   packages/grass/branches/6.4/debian/grass63.1
Modified:
   packages/grass/branches/6.4/debian/copyright
   packages/grass/branches/6.4/debian/files
   packages/grass/branches/6.4/debian/fixscripts.sh
   packages/grass/branches/6.4/debian/grass-preview-dev.dirs
   packages/grass/branches/6.4/debian/grass-preview-dev.install
   packages/grass/branches/6.4/debian/grass-preview-doc.install
   packages/grass/branches/6.4/debian/grass-preview.dirs
   packages/grass/branches/6.4/debian/grass-preview.install
   packages/grass/branches/6.4/debian/grass-preview.postinst
   packages/grass/branches/6.4/debian/grass-preview.postrm
   packages/grass/branches/6.4/debian/patches/www-browser.dpatch
   packages/grass/branches/6.4/debian/rules
   packages/grass/branches/6.4/debian/watch
Log:
update 6.3 to 6.4, new URL/address in copyright

Modified: packages/grass/branches/6.4/debian/copyright
===
--- packages/grass/branches/6.4/debian/copyright2008-10-30 15:06:36 UTC 
(rev 1788)
+++ packages/grass/branches/6.4/debian/copyright2008-10-30 15:56:06 UTC 
(rev 1789)
@@ -1,13 +1,13 @@
 This package was debianized by Markus Neteler [EMAIL PROTECTED] on
 Mon, 10 Nov 2003 17:59:04 +0100.
 
-It was downloaded from http://grass.itc.it
+It was downloaded from http://grass.osgeo.org
 
 The upstream contributors are listed in the AUTHORS file.
 
 The Geographic Resources Analysis and Support System (GRASS)
-Geographic Information System (GIS) is Copyright by the
-GRASS Development Team headquartered at ITC-irst, in Trento, Italy.
+Geographic Information System (GIS) is Copyright by members
+of the GRASS Development Team.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -32,13 +32,11 @@
 GRASS Development Team at the following address:
 
  GRASS Development Team
- ITC-Irst
  c/o M. Neteler
- SSI/MPA
- Via Sommarive, 18
- 38050 Trento (Povo)
+ Fondazione Mach - Centre for Alpine Ecology
+ 38100 Viote del Monte Bondone (Trento)
  Italy
- [EMAIL PROTECTED]
+ neteler AT cealp.it
 
-Internet:  http://grass.itc.it
-   http://grass.ibiblio.org
+Internet:  http://grass.osgeo.org
+   http://www.grass-gis.org

Modified: packages/grass/branches/6.4/debian/files
===
--- packages/grass/branches/6.4/debian/files2008-10-30 15:06:36 UTC (rev 
1788)
+++ packages/grass/branches/6.4/debian/files2008-10-30 15:56:06 UTC (rev 
1789)
@@ -1,3 +1,3 @@
-grass-preview-doc_6.3.0-1_all.deb science optional
-grass-preview_6.3.0-1_i386.deb science optional
-grass-preview-dev_6.3.0-1_i386.deb devel optional
+grass-preview-doc_6.4~20081031-1_all.deb science optional
+grass-preview_6.4~20081031-1_i386.deb science optional
+grass-preview-dev_6.4~20081031-1_i386.deb devel optional

Modified: packages/grass/branches/6.4/debian/fixscripts.sh
===
--- packages/grass/branches/6.4/debian/fixscripts.sh2008-10-30 15:06:36 UTC 
(rev 1788)
+++ packages/grass/branches/6.4/debian/fixscripts.sh2008-10-30 15:56:06 UTC 
(rev 1789)
@@ -8,7 +8,7 @@
 # make these scripts executable
 for x in etc/water/seg
 do
-chmod +x $CURDIR/debian/tmp/usr/lib/grass63/$x
+chmod +x $CURDIR/debian/tmp/usr/lib/grass64/$x
 done
 
 # silence bogus lintian complaint about interpreter-not-absolute
@@ -18,15 +18,15 @@
 script_file_tools \
 nviz2.2_script
 do
-  f=$CURDIR/debian/tmp/usr/lib/grass63/etc/nviz2.2/scripts/$x
-  sed 's.!nviz.!/usr/lib/grass63/bin/nviz.' $f foo  cat foo $f
+  f=$CURDIR/debian/tmp/usr/lib/grass64/etc/nviz2.2/scripts/$x
+  sed 's.!nviz.!/usr/lib/grass64/bin/nviz.' $f foo  cat foo $f
 done
 
 for x in panel_label.tcl \
 panel_scale.tcl
 do
-  f=$CURDIR/debian/tmp/usr/lib/grass63/etc/nviz2.2/scripts/$x
-  sed 's%!../glnviz.new/nvwish%!/usr/lib/grass63/etc/nviz2.2/glnviz/nvwish%' 
$f foo  cat foo $f
+  f=$CURDIR/debian/tmp/usr/lib/grass64/etc/nviz2.2/scripts/$x
+  sed 's%!../glnviz.new/nvwish%!/usr/lib/grass64/etc/nviz2.2/glnviz/nvwish%' 
$f foo  cat foo $f
 done
 rm foo
 
@@ -34,7 +34,7 @@
 # add shebang to scripts that need it
 for x in etc/copy
 do
-  f=$CURDIR/debian/tmp/usr/lib/grass63/$x
+  f=$CURDIR/debian/tmp/usr/lib/grass64/$x
   cp $f foo; echo #!/bin/sh $f; cat foo $f
 done
 rm foo
@@ -98,5 +98,5 @@
 etc/nviz2.2/scripts/wirecolorPopup.tcl \
 etc/nviz2.2/scripts/fileBrowser.tcl
 do
-chmod -x $CURDIR/debian/tmp/usr/lib/grass63/$x
+chmod -x $CURDIR/debian/tmp/usr/lib/grass64/$x
 done

Modified: packages/grass/branches/6.4/debian/grass-preview-dev.dirs
===
--- packages/grass/branches/6.4/debian

[DebianGIS-dev] r1792 - packages/grass/branches/6.4/debian

2008-10-30 Thread hamish-guest

Author: hamish-guest
Date: 2008-10-31 04:30:09 + (Fri, 31 Oct 2008)
New Revision: 1792

Modified:
   packages/grass/branches/6.4/debian/changelog
Log:
bump version number

Modified: packages/grass/branches/6.4/debian/changelog
===
--- packages/grass/branches/6.4/debian/changelog2008-10-31 04:26:21 UTC 
(rev 1791)
+++ packages/grass/branches/6.4/debian/changelog2008-10-31 04:30:09 UTC 
(rev 1792)
@@ -1,3 +1,14 @@
+grass-preview (6.4~20081031-1) experimental; urgency=low
+
+  -- THIS IS A NOT FOR RELEASE BRANCH OF THE MAIN DEVELOPMENT TREE --
+
+  * Update patches and names from 6.3 to 6.4svn
+  * Update project URL and home address
+  * Enable Cairo rendering support
+  * Python support for new wx vdigit module (still need build-deps??)
+
+ -- Hamish Bowman hamish-guest alioth.debian org  Fri, 31 Oct 2008 17:20:04 
+1300
+
 grass-preview (6.3.0-1) experimental; urgency=low
 
   * Changing source package name to grass-preview.


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r1804 - packages/grass/branches/6.4/debian/patches

2008-12-04 Thread hamish-guest

Author: hamish-guest
Date: 2008-12-04 13:28:50 + (Thu, 04 Dec 2008)
New Revision: 1804

Modified:
   packages/grass/branches/6.4/debian/patches/pager.dpatch
   packages/grass/branches/6.4/debian/patches/xterm.dpatch
Log:
patch descriptions

Modified: packages/grass/branches/6.4/debian/patches/pager.dpatch
===
--- packages/grass/branches/6.4/debian/patches/pager.dpatch 2008-11-26 
16:54:38 UTC (rev 1803)
+++ packages/grass/branches/6.4/debian/patches/pager.dpatch 2008-12-04 
13:28:50 UTC (rev 1804)
@@ -2,7 +2,16 @@
 ## pager.dpatch by Francesco Paolo Lovergine [EMAIL PROTECTED]
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: As per debian wishes, choose the pager based on what 'pager' is
+## DP: set to rather than the default of 'more'.
+## DP: Problem with this patch: the default pager is usually 'less', which
+## DP: is rather inappropriate for use with g.list where output is usally
+## DP: less than 25 lines and it is useful to have the text remain on the
+## DP: terminal after the pager is finished. IMO (HB) this is a diservice
+## DP: to the user, who would be better served keeping the default as
+## DP: 'more', or if that is unacceptable to debian, then use 'cat' and
+## DP: have no pager turned on by default.
+## DP: Note this in README.Debian??
 
 @DPATCH@
 diff -urNad grass-6.3~20070922~/lib/init/init.sh 
grass-6.3~20070922/lib/init/init.sh

Modified: packages/grass/branches/6.4/debian/patches/xterm.dpatch
===
--- packages/grass/branches/6.4/debian/patches/xterm.dpatch 2008-11-26 
16:54:38 UTC (rev 1803)
+++ packages/grass/branches/6.4/debian/patches/xterm.dpatch 2008-12-04 
13:28:50 UTC (rev 1804)
@@ -2,7 +2,7 @@
 ## xterm.dpatch by Francesco Paolo Lovergine [EMAIL PROTECTED]
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: prefer to let alternatives chose the xterm used
 
 @DPATCH@
 diff -urNad grass-preview-6.3.0~/lib/init/grass-xterm-wrapper 
grass-preview-6.3.0/lib/init/grass-xterm-wrapper


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r2158 - packages/grass/trunk/debian

2009-04-16 Thread hamish-guest

Author: hamish-guest
Date: 2009-04-16 07:57:38 + (Thu, 16 Apr 2009)
New Revision: 2158

Modified:
   packages/grass/trunk/debian/changelog
   packages/grass/trunk/debian/control
   packages/grass/trunk/debian/control.in
Log:
suggest gpsbabel for v.in.gpsbabel and v.out.gpsbabel

Modified: packages/grass/trunk/debian/changelog
===
--- packages/grass/trunk/debian/changelog   2009-04-15 20:25:38 UTC (rev 
2157)
+++ packages/grass/trunk/debian/changelog   2009-04-16 07:57:38 UTC (rev 
2158)
@@ -5,6 +5,7 @@
   * Added Suggests: python-opengl and python-wxgtk2.8 for the new wx interface.
   * Changed again debian/watch file.
   * Moved to versioned defaults (build-)deps for python.
+  * Added Suggests: gpsbabel for v.in.gpsbabel and v.out.gpsbabel.
 
  -- Francesco Paolo Lovergine fran...@debian.org  Wed, 15 Apr 2009 16:25:53 
+0200
 

Modified: packages/grass/trunk/debian/control
===
--- packages/grass/trunk/debian/control 2009-04-15 20:25:38 UTC (rev 2157)
+++ packages/grass/trunk/debian/control 2009-04-16 07:57:38 UTC (rev 2158)
@@ -17,8 +17,8 @@
 Section: science
 Architecture: any
 Depends: ${shlibs:Depends}, xterm | x-terminal-emulator
-Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpstrans, gnuplot, 
grass-doc, xml2, wget | curl,
- python-opengl, python-wxgtk2.8
+Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
+ gnuplot, grass-doc, xml2, wget | curl, python-opengl, python-wxgtk2.8
 Recommends: python (= 2.5), python-numpy
 Provides: grass64
 Description: Geographic Resources Analysis Support System 

Modified: packages/grass/trunk/debian/control.in
===
--- packages/grass/trunk/debian/control.in  2009-04-15 20:25:38 UTC (rev 
2157)
+++ packages/grass/trunk/debian/control.in  2009-04-16 07:57:38 UTC (rev 
2158)
@@ -17,8 +17,8 @@
 Section: science
 Architecture: any
 Depends: ${shlibs:Depends}, xterm | x-terminal-emulator
-Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpstrans, gnuplot, 
grass-doc, xml2, wget | curl,
- python-opengl, python-wxgtk2.8
+Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
+ gnuplot, grass-doc, xml2, wget | curl, python-opengl, python-wxgtk2.8
 Recommends: python (= 2.5), python-numpy
 Provides: gr...@version@
 Description: Geographic Resources Analysis Support System 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r2187 - packages/grass/trunk/debian

2009-05-01 Thread hamish-guest

Author: hamish-guest
Date: 2009-05-02 00:44:21 + (Sat, 02 May 2009)
New Revision: 2187

Modified:
   packages/grass/trunk/debian/rules
Log:
correctly point to wx-config(2.8). should fix bug #526200

Modified: packages/grass/trunk/debian/rules
===
--- packages/grass/trunk/debian/rules   2009-04-29 18:19:37 UTC (rev 2186)
+++ packages/grass/trunk/debian/rules   2009-05-02 00:44:21 UTC (rev 2187)
@@ -62,8 +62,7 @@
 --with-postgres-includes=$(shell pg_config --includedir) \
 --with-mysql-includes=$(shell mysql_config --include|sed 
-e 's/-I//') \
--with-proj-share=/usr/share/proj \
-   --with-wx=/usr/lib/wx/config/gtk2-unicode-release-2.8 \
-   --with-wxwidgets \
+   
--with-wxwidgets=/usr/lib/wx/config/gtk2-unicode-release-2.8 \
--with-python=/usr/bin/python-config \
--with-cairo
 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r2273 - packages/grass/trunk/debian

2009-06-10 Thread hamish-guest

Author: hamish-guest
Date: 2009-06-10 09:54:29 + (Wed, 10 Jun 2009)
New Revision: 2273

Modified:
   packages/grass/trunk/debian/control
Log:
rm dupe suggest for grass-doc

Modified: packages/grass/trunk/debian/control
===
--- packages/grass/trunk/debian/control 2009-06-10 09:35:37 UTC (rev 2272)
+++ packages/grass/trunk/debian/control 2009-06-10 09:54:29 UTC (rev 2273)
@@ -19,7 +19,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, xterm | x-terminal-emulator
 Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
- gnuplot, grass-doc, xml2, wget | curl, python-opengl, python-wxgtk2.8
+ gnuplot, xml2, wget | curl, python-opengl, python-wxgtk2.8
 Recommends: python (= 2.5), python-numpy, ghostscript
 Provides: grass64
 Description: Geographic Resources Analysis Support System 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r2275 - packages/grass/trunk/debian

2009-06-11 Thread hamish-guest

Author: hamish-guest
Date: 2009-06-11 09:08:21 + (Thu, 11 Jun 2009)
New Revision: 2275

Added:
   packages/grass/trunk/debian/grass.menu
Log:
add menu item (will use saved GUI mode). not sure
if .ico needs to be /usr/share/gpsdrive/pixmaps/grass.xpm
or about setting dh_installmenu in rules and update-menus in postinst.


Added: packages/grass/trunk/debian/grass.menu
===
--- packages/grass/trunk/debian/grass.menu  (rev 0)
+++ packages/grass/trunk/debian/grass.menu  2009-06-11 09:08:21 UTC (rev 
2275)
@@ -0,0 +1,5 @@
+?package(grass):needs=text\
+  section=Applications/Science/Geoscience\
+  title=GRASS GIS\
+  command=/usr/bin/grass\
+  icon=/usr/lib/grass64/etc/gui/icons/grass.ico


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r2279 - packages/grass/trunk/debian

2009-06-12 Thread hamish-guest

Author: hamish-guest
Date: 2009-06-12 10:20:30 + (Fri, 12 Jun 2009)
New Revision: 2279

Modified:
   packages/grass/trunk/debian/grass.menu
Log:
use VERSION macro

Modified: packages/grass/trunk/debian/grass.menu
===
--- packages/grass/trunk/debian/grass.menu  2009-06-11 20:20:16 UTC (rev 
2278)
+++ packages/grass/trunk/debian/grass.menu  2009-06-12 10:20:30 UTC (rev 
2279)
@@ -2,4 +2,4 @@
   section=Applications/Science/Geoscience\
   title=GRASS GIS\
   command=/usr/bin/grass\
-  icon=/usr/lib/grass64/etc/gui/icons/grass.ico
+  icon=/usr/lib/gr...@version@/etc/gui/icons/grass.ico


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r2400 - packages/grass/trunk/debian

2009-08-28 Thread hamish-guest

Author: hamish-guest
Date: 2009-08-28 06:51:56 + (Fri, 28 Aug 2009)
New Revision: 2400

Added:
   packages/grass/trunk/debian/grass.desktop
Log:
Experimental prototype for ~/Desktop/ icon control file.
New grass-48x48.png icon will arrive with the next GRASS 6.4 RC,
  (can be found in the grass_source/gui/icons/ dir)
so for now this file is unused. Eventually it'll have to be
installed in ? /usr/share/applications/ ?


Added: packages/grass/trunk/debian/grass.desktop
===
--- packages/grass/trunk/debian/grass.desktop   (rev 0)
+++ packages/grass/trunk/debian/grass.desktop   2009-08-28 06:51:56 UTC (rev 
2400)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=GRASS GIS
+Comment=
+Categories=Application;Education;Geography;
+Exec=/usr/bin/grass
+Icon=/usr/share/icons/grass-48x48.png
+Terminal=true


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r2401 - in packages: . mbsystem

2009-08-29 Thread hamish-guest

Author: hamish-guest
Date: 2009-08-29 14:32:17 + (Sat, 29 Aug 2009)
New Revision: 2401

Added:
   packages/mbsystem/
   packages/mbsystem/TODO
   packages/mbsystem/control
Log:
initial packaging for MB-System

Added: packages/mbsystem/TODO
===
--- packages/mbsystem/TODO  (rev 0)
+++ packages/mbsystem/TODO  2009-08-29 14:32:17 UTC (rev 2401)
@@ -0,0 +1,6 @@
+TODO: adapt these beginnings of a Debian build script into full packaging 
rules:
+
+https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
+
+
+

Added: packages/mbsystem/control
===
--- packages/mbsystem/control   (rev 0)
+++ packages/mbsystem/control   2009-08-29 14:32:17 UTC (rev 2401)
@@ -0,0 +1,20 @@
+Source: mbsystem
+Section: science
+Priority: optional
+Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Uploaders: 
+Build-depends: libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev, 
libgl1-mesa-dev
+Standards-Version: 
+Homepage: http://www.ldeo.columbia.edu/res/pi/MB-System/
+
+Package: mbsystem
+Section: science
+Architecture: any
+Depends: ${shlibs:Depends}, gmt, lesstif2, libnetcdf4, libgl1-mesa-glx, 
libglu1-mesa
+Suggests: ghostscript, xv
+Recommends: 
+Description: Processing tools for multibeam and sidescan sonar data
+ MB-System is an open source software package for the processing and
+ display of bathymetry and backscatter imagery data derived from
+ multibeam, interferometry, and sidescan sonars. It interacts with GMT
+ (The Generic Mapping Tools) and other GIS applications.


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r2402 - in packages/mbsystem: . patches

2009-08-29 Thread hamish-guest

Author: hamish-guest
Date: 2009-08-29 15:25:56 + (Sat, 29 Aug 2009)
New Revision: 2402

Added:
   packages/mbsystem/changelog
   packages/mbsystem/copyright
   packages/mbsystem/patches/
   packages/mbsystem/patches/00list
   packages/mbsystem/patches/install_makefiles.dpatch
   packages/mbsystem/patches/mbps_c_gmt431.dpatch
   packages/mbsystem/watch
Log:
a few more initial files

Added: packages/mbsystem/changelog
===
--- packages/mbsystem/changelog (rev 0)
+++ packages/mbsystem/changelog 2009-08-29 15:25:56 UTC (rev 2402)
@@ -0,0 +1,5 @@
+mbsystem (5.1.2beta11-0) UNRELEASED; urgency=low
+
+  * Initial packaging
+
+ -- Hamish Bowman hamish_b yahoo com  Sat, 29 Aug 2009 14:24:12 +1200

Added: packages/mbsystem/copyright
===
--- packages/mbsystem/copyright (rev 0)
+++ packages/mbsystem/copyright 2009-08-29 15:25:56 UTC (rev 2402)
@@ -0,0 +1,4 @@
+GPL 2
+
+http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html
+

Added: packages/mbsystem/patches/00list
===
--- packages/mbsystem/patches/00list(rev 0)
+++ packages/mbsystem/patches/00list2009-08-29 15:25:56 UTC (rev 2402)
@@ -0,0 +1,2 @@
+install_makefiles
+mbps_c_gmt431

Added: packages/mbsystem/patches/install_makefiles.dpatch
===
--- packages/mbsystem/patches/install_makefiles.dpatch  
(rev 0)
+++ packages/mbsystem/patches/install_makefiles.dpatch  2009-08-29 15:25:56 UTC 
(rev 2402)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## install_makefiles.dpatch by Hamish Bowman hamish_b yahoo com
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Makefile adjustments suitable for Debian
+
+...@dpatch@
+--- install_makefiles.ORIG  2009-08-27 23:53:46.0 +1200
 install_makefiles   2009-08-28 00:01:00.0 +1200
+@@ -97,21 +97,21 @@
+ #
+ # Required parameters:
+ $MBSYSTEM_HOME = /usr/share/mbsystem;
+-$OS = DARWIN;
++$OS = LINUX;
+ $CFLAGS = -g -I/usr/X11R6/include;
+-$LFLAGS = -Wl -lm -bind_at_load 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/LibGL.dylib;
+-$NETCDFLIBDIR = /sw/lib;
+-$NETCDFINCDIR = /sw/include;
+-$GMTLIBDIR = /usr/local/gmt/lib;
+-$GMTINCDIR = /usr/local/gmt/include;
++$LFLAGS = -Wl -lm;
++$NETCDFLIBDIR = /usr/lib;
++$NETCDFINCDIR = /usr/include;
++$GMTLIBDIR = /usr/lib;
++$GMTINCDIR = /usr/include/gmt;
+ $LEVITUS = $MBSYSTEM_HOME/share/LevitusAnnual82.dat;
+ $PROJECTIONS = $MBSYSTEM_HOME/share/Projections.dat;
+ #
+ # Required paramters for graphical tools
+ #   - graphical tools will not be built if these
+ # are commented out
+-$MOTIFINCDIR = /sw/include;
+-$MOTIFLIBS = -L/sw/lib -L/usr/X11R6/lib -lXm -lXt -lX11;
++$MOTIFINCDIR = /usr/include;
++$MOTIFLIBS = -L/usr/lib -L/usr/X11R6/lib -lXm -lXt -lX11;
+ #
+ # Required paramter for visualization tools
+ #   - visualization tools will not be built if this

Added: packages/mbsystem/patches/mbps_c_gmt431.dpatch
===
--- packages/mbsystem/patches/mbps_c_gmt431.dpatch  
(rev 0)
+++ packages/mbsystem/patches/mbps_c_gmt431.dpatch  2009-08-29 15:25:56 UTC 
(rev 2402)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## mbps_c_gmt431.dpatch by Hamish Bowman hamish_b yahoo com
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: allow to work with GMT older than version 4.5.0
+
+...@dpatch@
+--- src/utilities/mbps.c.ORIG   2009-08-28 00:21:17.0 +1200
 src/utilities/mbps.c2009-08-28 00:22:54.0 +1200
+@@ -842,10 +842,17 @@
+}
+
+/* initialize the Postscript plotting */
++#ifdef GMT_MINOR_VERSION
+ps_plotinit_hires(NULL,0,orient,x_off,y_off,1.0,1.0,1,300,1,
+gmtdefs.paper_width, gmtdefs.page_rgb, 
+gmtdefs.encoding.name, 
+GMT_epsinfo (argv[0]));
++#else
++   ps_plotinit(NULL,0,orient,x_off,y_off,1.0,1.0,1,300,1,
++   gmtdefs.paper_width, gmtdefs.page_rgb, 
++   gmtdefs.encoding.name, 
++   GMT_epsinfo (argv[0]));
++#endif
+GMT_echo_command (argc, argv);
+
+/* now loop over the data in the appropriate order

Added: packages/mbsystem/watch
===
--- packages/mbsystem/watch (rev 0)
+++ packages/mbsystem/watch 2009-08-29 15:25:56 UTC (rev 2402)
@@ -0,0 +1,5 @@
+version=
+ftp://ftp.ldeo.columbia.edu/pub/MB-System/mbsystem-( ??? ).tar.gz
+#
+# e.g. ftp

[DebianGIS-dev] r2403 - in packages/mbsystem: . trunk trunk/debian trunk/debian/patches

2009-08-29 Thread hamish-guest

Author: hamish-guest
Date: 2009-08-29 15:28:47 + (Sat, 29 Aug 2009)
New Revision: 2403

Added:
   packages/mbsystem/trunk/
   packages/mbsystem/trunk/debian/
   packages/mbsystem/trunk/debian/TODO
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/control
   packages/mbsystem/trunk/debian/copyright
   packages/mbsystem/trunk/debian/patches/
   packages/mbsystem/trunk/debian/watch
Removed:
   packages/mbsystem/TODO
   packages/mbsystem/changelog
   packages/mbsystem/control
   packages/mbsystem/copyright
   packages/mbsystem/patches/
   packages/mbsystem/watch
Log:
proper dir structure

Deleted: packages/mbsystem/TODO
===
--- packages/mbsystem/TODO  2009-08-29 15:25:56 UTC (rev 2402)
+++ packages/mbsystem/TODO  2009-08-29 15:28:47 UTC (rev 2403)
@@ -1,6 +0,0 @@
-TODO: adapt these beginnings of a Debian build script into full packaging 
rules:
-
-https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
-
-
-

Deleted: packages/mbsystem/changelog
===
--- packages/mbsystem/changelog 2009-08-29 15:25:56 UTC (rev 2402)
+++ packages/mbsystem/changelog 2009-08-29 15:28:47 UTC (rev 2403)
@@ -1,5 +0,0 @@
-mbsystem (5.1.2beta11-0) UNRELEASED; urgency=low
-
-  * Initial packaging
-
- -- Hamish Bowman hamish_b yahoo com  Sat, 29 Aug 2009 14:24:12 +1200

Deleted: packages/mbsystem/control
===
--- packages/mbsystem/control   2009-08-29 15:25:56 UTC (rev 2402)
+++ packages/mbsystem/control   2009-08-29 15:28:47 UTC (rev 2403)
@@ -1,20 +0,0 @@
-Source: mbsystem
-Section: science
-Priority: optional
-Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: 
-Build-depends: libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev, 
libgl1-mesa-dev
-Standards-Version: 
-Homepage: http://www.ldeo.columbia.edu/res/pi/MB-System/
-
-Package: mbsystem
-Section: science
-Architecture: any
-Depends: ${shlibs:Depends}, gmt, lesstif2, libnetcdf4, libgl1-mesa-glx, 
libglu1-mesa
-Suggests: ghostscript, xv
-Recommends: 
-Description: Processing tools for multibeam and sidescan sonar data
- MB-System is an open source software package for the processing and
- display of bathymetry and backscatter imagery data derived from
- multibeam, interferometry, and sidescan sonars. It interacts with GMT
- (The Generic Mapping Tools) and other GIS applications.

Deleted: packages/mbsystem/copyright
===
--- packages/mbsystem/copyright 2009-08-29 15:25:56 UTC (rev 2402)
+++ packages/mbsystem/copyright 2009-08-29 15:28:47 UTC (rev 2403)
@@ -1,4 +0,0 @@
-GPL 2
-
-http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html
-

Copied: packages/mbsystem/trunk/debian/TODO (from rev 2401, 
packages/mbsystem/TODO)
===
--- packages/mbsystem/trunk/debian/TODO (rev 0)
+++ packages/mbsystem/trunk/debian/TODO 2009-08-29 15:28:47 UTC (rev 2403)
@@ -0,0 +1,6 @@
+TODO: adapt these beginnings of a Debian build script into full packaging 
rules:
+
+https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
+
+
+


Property changes on: packages/mbsystem/trunk/debian/TODO
___
Added: svn:mergeinfo
   + 

Copied: packages/mbsystem/trunk/debian/changelog (from rev 2402, 
packages/mbsystem/changelog)
===
--- packages/mbsystem/trunk/debian/changelog(rev 0)
+++ packages/mbsystem/trunk/debian/changelog2009-08-29 15:28:47 UTC (rev 
2403)
@@ -0,0 +1,5 @@
+mbsystem (5.1.2beta11-0) UNRELEASED; urgency=low
+
+  * Initial packaging
+
+ -- Hamish Bowman hamish_b yahoo com  Sat, 29 Aug 2009 14:24:12 +1200


Property changes on: packages/mbsystem/trunk/debian/changelog
___
Added: svn:mergeinfo
   + 

Copied: packages/mbsystem/trunk/debian/control (from rev 2401, 
packages/mbsystem/control)
===
--- packages/mbsystem/trunk/debian/control  (rev 0)
+++ packages/mbsystem/trunk/debian/control  2009-08-29 15:28:47 UTC (rev 
2403)
@@ -0,0 +1,20 @@
+Source: mbsystem
+Section: science
+Priority: optional
+Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Uploaders: 
+Build-depends: libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev, 
libgl1-mesa-dev
+Standards-Version: 
+Homepage: http://www.ldeo.columbia.edu/res/pi/MB-System/
+
+Package: mbsystem
+Section: science
+Architecture: any
+Depends: ${shlibs:Depends}, gmt, lesstif2, libnetcdf4, libgl1-mesa-glx, 
libglu1-mesa
+Suggests: ghostscript, xv

[DebianGIS-dev] r2696 - in packages: . opencpn opencpn/trunk

2010-02-07 Thread hamish-guest

Author: hamish-guest
Date: 2010-02-07 22:45:56 + (Sun, 07 Feb 2010)
New Revision: 2696

Added:
   packages/opencpn/
   packages/opencpn/branches/
   packages/opencpn/tags/
   packages/opencpn/trunk/
   packages/opencpn/trunk/debian/
Log:
www.opencpn.org, debianization by Anton Martchukov


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r2700 - packages/grass/trunk/debian

2010-02-13 Thread hamish-guest

Author: hamish-guest
Date: 2010-02-13 09:56:29 + (Sat, 13 Feb 2010)
New Revision: 2700

Modified:
   packages/grass/trunk/debian/changelog
   packages/grass/trunk/debian/control
   packages/grass/trunk/debian/control.in
Log:
suggest netpbm used by NVIZ max ppm export

Modified: packages/grass/trunk/debian/changelog
===
--- packages/grass/trunk/debian/changelog   2010-02-09 18:52:36 UTC (rev 
2699)
+++ packages/grass/trunk/debian/changelog   2010-02-13 09:56:29 UTC (rev 
2700)
@@ -1,3 +1,9 @@
+grass (6.4.0~rc5+40109-2) unstable; urgency=low
+
+  * Suggest NetPBM used by NVIZ max. PPM export
+
+ -- Hamish Bowman hamis...@yahoo.com  Sat, 13 Feb 2010 15:52:43 +1300
+
 grass (6.4.0~rc5+40109-1) unstable; urgency=low
 
   * New upstream snapshot taken from 6.4 branch. 

Modified: packages/grass/trunk/debian/control
===
--- packages/grass/trunk/debian/control 2010-02-09 18:52:36 UTC (rev 2699)
+++ packages/grass/trunk/debian/control 2010-02-13 09:56:29 UTC (rev 2700)
@@ -19,7 +19,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, xterm | x-terminal-emulator, ${misc:Depends}
 Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
- gnuplot, xml2, wget | curl, python-opengl, python-wxgtk2.8
+ gnuplot, xml2, wget | curl, python-opengl, python-wxgtk2.8, netpbm
 Recommends: python (= 2.5), python-numpy, ghostscript
 Provides: grass640-5+40109
 Description: Geographic Resources Analysis Support System 

Modified: packages/grass/trunk/debian/control.in
===
--- packages/grass/trunk/debian/control.in  2010-02-09 18:52:36 UTC (rev 
2699)
+++ packages/grass/trunk/debian/control.in  2010-02-13 09:56:29 UTC (rev 
2700)
@@ -19,7 +19,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, xterm | x-terminal-emulator, ${misc:Depends}
 Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
- gnuplot, xml2, wget | curl, python-opengl, python-wxgtk2.8
+ gnuplot, xml2, wget | curl, python-opengl, python-wxgtk2.8, netpbm
 Recommends: python (= 2.5), python-numpy, ghostscript
 Provides: gr...@abi@
 Description: Geographic Resources Analysis Support System 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r2921 - packages/opencpn/trunk/debian

2010-09-07 Thread hamish-guest

Author: hamish-guest
Date: 2010-09-08 00:25:21 + (Wed, 08 Sep 2010)
New Revision: 2921

Modified:
   packages/opencpn/trunk/debian/control
   packages/opencpn/trunk/debian/rules
Log:
need dpatch; don't need imagemagick

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2010-09-05 06:27:42 UTC (rev 
2920)
+++ packages/opencpn/trunk/debian/control   2010-09-08 00:25:21 UTC (rev 
2921)
@@ -3,7 +3,9 @@
 Priority: optional
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Anton Martchukov an...@martchukov.com
-Build-Depends: debhelper (= 7.0.50~), cmake, libglu-dev, libwxbase2.8-dev, 
libwxgtk2.8-dev, libgtk2.0-dev, imagemagick, zlib1g-dev, libbz2-dev, libgps-dev
+Build-Depends: debhelper (= 7.0.50~), dpatch, cmake, libglu-dev,
+   libwxbase2.8-dev, libwxgtk2.8-dev, libgtk2.0-dev, zlib1g-dev,
+   libbz2-dev, libgps-dev
 Standards-Version: 3.8.4
 Homepage: http://www.opencpn.org/
 
@@ -12,8 +14,8 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgps19
 Suggests: gpsd
 Description: a concise ChartPlotter/Navigator
- opencpn is a cross-platform ship-borne GUI ChartPlotter
- application supporting
+ OpenCPN is a cross-platform ship-borne GUI chart plotter
+ application supporting:
  .
  * GPS/GPDS Postition Input
  * BSB Raster Chart Display

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2010-09-05 06:27:42 UTC (rev 2920)
+++ packages/opencpn/trunk/debian/rules 2010-09-08 00:25:21 UTC (rev 2921)
@@ -9,18 +9,21 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
+
 %:
dh  $@
 
 override_dh_install:
mkdir -p $(CURDIR)/debian/opencpn/usr/share/pixmaps
-   convert $(CURDIR)/data/opencpn.png -resize 32x32 
$(CURDIR)/debian/opencpn/usr/share/pixmaps/opencpn.xpm
+   cp $(CURDIR)/src/bitmaps/opencpn.xpm 
$(CURDIR)/debian/opencpn/usr/share/pixmaps/

dh_install

rm $(CURDIR)/debian/opencpn/usr/share/opencpn/license.txt
+   # why remove doc/ ?
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/doc
 
 
 override_dh_installman:
-   dh_installman debian/opencpn.1
\ No newline at end of file
+   dh_installman debian/opencpn.1


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[DebianGIS-dev] r2933 - packages/opencpn/trunk/debian

2010-09-22 Thread hamish-guest

Author: hamish-guest
Date: 2010-09-22 08:48:47 + (Wed, 22 Sep 2010)
New Revision: 2933

Modified:
   packages/opencpn/trunk/debian/control
   packages/opencpn/trunk/debian/rules
Log:
back out dpatch attempt

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2010-09-21 14:54:37 UTC (rev 
2932)
+++ packages/opencpn/trunk/debian/control   2010-09-22 08:48:47 UTC (rev 
2933)
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Anton Martchukov an...@martchukov.com
-Build-Depends: debhelper (= 7.0.50~), dpatch, cmake, libglu-dev,
-   libwxbase2.8-dev, libwxgtk2.8-dev, libgtk2.0-dev, zlib1g-dev,
-   libbz2-dev, libgps-dev
+Build-Depends: debhelper (= 7.0.50~), cmake, libglu-dev, libwxbase2.8-dev,
+   libwxgtk2.8-dev, libgtk2.0-dev, zlib1g-dev, libbz2-dev, libgps-dev
 Standards-Version: 3.8.4
 Homepage: http://www.opencpn.org/
 

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2010-09-21 14:54:37 UTC (rev 2932)
+++ packages/opencpn/trunk/debian/rules 2010-09-22 08:48:47 UTC (rev 2933)
@@ -9,7 +9,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
 
 %:
dh  $@


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

r2975 - packages/opencpn/trunk/debian

2011-04-15 Thread hamish-guest

Author: hamish-guest
Date: 2011-04-15 08:09:24 + (Fri, 15 Apr 2011)
New Revision: 2975

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/control
Log:
update for upstream version git~2.4.412

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-03-24 15:53:12 UTC (rev 
2974)
+++ packages/opencpn/trunk/debian/changelog 2011-04-15 08:09:24 UTC (rev 
2975)
@@ -1,3 +1,11 @@
+opencpn (2.4.412-1) unstable; urgency=low
+
+  * Packaged for upstream git patch version 2.4.412
+  * Move to new DebianGIS email address
+  * Recommend gpsd, suggest gpsd-clients
+
+ -- Hamish B hamis...@yahoo.com  Fri, 15 Apr 2011 14:53:55 +1200
+
 opencpn (2.2.918-1) unstable; urgency=low
 
   * Packaged for upstream git patch version 2.2.918

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2011-03-24 15:53:12 UTC (rev 
2974)
+++ packages/opencpn/trunk/debian/control   2011-04-15 08:09:24 UTC (rev 
2975)
@@ -1,7 +1,7 @@
 Source: opencpn
 Section: utils
 Priority: optional
-Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Maintainer: Debian GIS Project debian-...@lists.debian.org
 Uploaders: Anton Martchukov an...@martchukov.com
 Build-Depends: debhelper (= 7.0.50~), cmake, libglu-dev, libwxbase2.8-dev,
libwxgtk2.8-dev, libgtk2.0-dev, zlib1g-dev, libbz2-dev, libgps-dev
@@ -11,8 +11,9 @@
 Package: opencpn
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgps19
-Suggests: gpsd
-Description: a concise ChartPlotter/Navigator
+Recommends: gpsd
+Suggests: gpsd-clients
+Description: A concise GPS ChartPlotter/Navigator
  OpenCPN is a cross-platform ship-borne GUI chart plotter
  application supporting:
  .


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

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

2011-04-15 Thread hamish-guest

Author: hamish-guest
Date: 2011-04-15 10:07:31 + (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 hamis...@yahoo.com  Fri, 15 Apr 2011 15:12:36 +1200
+ -- Hamish B hamis...@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/series2011-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


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

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

2011-04-15 Thread hamish-guest

Author: hamish-guest
Date: 2011-04-15 15:44:56 + (Fri, 15 Apr 2011)
New Revision: 2978

Added:
   packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/patches/series
Log:
Use system's zlib, bzip2 instead of embedded copy

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-04-15 10:07:31 UTC (rev 
2977)
+++ packages/opencpn/trunk/debian/changelog 2011-04-15 15:44:56 UTC (rev 
2978)
@@ -1,10 +1,11 @@
-opencpn (2.4.412-1) unstable; urgency=low
+opencpn (2.4.0~412-1) unstable; urgency=low
 
   * Packaged for upstream git patch version 2.4.412
   * 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/
+  * Use system's zlib, bzip2 instead of embedded copy
 
  -- Hamish B hamis...@yahoo.com  Fri, 15 Apr 2011 15:35:56 +1200
 

Added: packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
===
--- packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
(rev 0)
+++ packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
2011-04-15 15:44:56 UTC (rev 2978)
@@ -0,0 +1,63 @@
+Use system's zlib, bzip2 instead of embedded copy.
+Index: opencpn/plugins/grib_pi/CMakeLists.txt
+===
+--- opencpn.orig/plugins/grib_pi/CMakeLists.txt2011-04-15 
23:21:38.285860737 +1200
 opencpn/plugins/grib_pi/CMakeLists.txt 2011-04-16 03:22:20.561110795 
+1200
+@@ -78,7 +78,12 @@
+ src/GribReader.cpp 
+ src/GribRecord.cpp  
+ src/zuFile.cpp 
+-src/IsoLine.cpp 
++src/IsoLine.cpp
++)
++ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_GRIB})
++
++IF(!UNIX)
++SET(SRC_BZIP
+ src/bzip2/bzlib.c 
+ src/bzip2/blocksort.c 
+ src/bzip2/compress.c 
+@@ -86,11 +91,12 @@
+ src/bzip2/decompress.c 
+ src/bzip2/huffman.c 
+ src/bzip2/randtable.c
+-  )
+-ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_GRIB})
++)
++ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_BZIP})
+ 
+-INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/zlib-1.2.3)
+-INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/bzip2)
++INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/zlib-1.2.3)
++INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/bzip2)
++ENDIF(!UNIX)
+ 
+ IF(WIN32)
+   SET(OPENCPN_IMPORT_LIB ../../${CMAKE_CFG_INTDIR}/${PARENT})
+Index: opencpn/CMakeLists.txt
+===
+--- opencpn.orig/CMakeLists.txt2011-04-16 02:55:53.636598695 +1200
 opencpn/CMakeLists.txt 2011-04-16 03:21:52.989110463 +1200
+@@ -111,6 +111,13 @@
+ 
+ FIND_PACKAGE(Gettext REQUIRED)
+ 
++IF(UNIX)
++FIND_PACKAGE(BZip2 REQUIRED)
++INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
++FIND_PACKAGE(ZLIB REQUIRED)
++INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
++ENDIF(UNIX)
++
+ # For convenience we define the sources as a variable. You can add 
+ # header files and cpp/c files and CMake will sort them out
+ 
+@@ -500,6 +507,8 @@
+ TARGET_LINK_LIBRARIES(${PACKAGE_NAME}
+   ${OPENGL_LIBRARIES}
+   ${GETTEXT_LIBRARY}
++  ${BZIP2_LIBRARIES}
++  ${ZLIB_LIBRARY}
+ )
+ ENDIF(UNIX)
+ 

Modified: packages/opencpn/trunk/debian/patches/series
===
--- packages/opencpn/trunk/debian/patches/series2011-04-15 10:07:31 UTC 
(rev 2977)
+++ packages/opencpn/trunk/debian/patches/series2011-04-15 15:44:56 UTC 
(rev 2978)
@@ -1 +1,2 @@
 fix-plugin-path.patch
+rm_embedded_zlib.patch


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

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

2011-04-15 Thread hamish-guest

Author: hamish-guest
Date: 2011-04-16 02:18:29 + (Sat, 16 Apr 2011)
New Revision: 2979

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
Log:
tweaks as per comments from upstream

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-04-15 15:44:56 UTC (rev 
2978)
+++ packages/opencpn/trunk/debian/changelog 2011-04-16 02:18:29 UTC (rev 
2979)
@@ -1,4 +1,4 @@
-opencpn (2.4.0~412-1) unstable; urgency=low
+opencpn (2.4.412-1) unstable; urgency=low
 
   * Packaged for upstream git patch version 2.4.412
   * Move to new DebianGIS email address

Modified: packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
===
--- packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
2011-04-15 15:44:56 UTC (rev 2978)
+++ packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
2011-04-16 02:18:29 UTC (rev 2979)
@@ -12,7 +12,7 @@
 +)
 +ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_GRIB})
 +
-+IF(!UNIX)
++IF(NOT UNIX)
 +SET(SRC_BZIP
  src/bzip2/bzlib.c 
  src/bzip2/blocksort.c 
@@ -30,7 +30,7 @@
 -INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/bzip2)
 +INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/zlib-1.2.3)
 +INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/bzip2)
-+ENDIF(!UNIX)
++ENDIF(NOT UNIX)
  
  IF(WIN32)
SET(OPENCPN_IMPORT_LIB ../../${CMAKE_CFG_INTDIR}/${PARENT})


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

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

2011-04-20 Thread hamish-guest

Author: hamish-guest
Date: 2011-04-20 12:28:27 + (Wed, 20 Apr 2011)
New Revision: 2980

Added:
   packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/control
   packages/opencpn/trunk/debian/patches/series
   packages/opencpn/trunk/debian/rules
Log:
Use xtide's WVS coastline instead of shipping a clone

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-04-16 02:18:29 UTC (rev 
2979)
+++ packages/opencpn/trunk/debian/changelog 2011-04-20 12:28:27 UTC (rev 
2980)
@@ -6,8 +6,9 @@
   * 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
 
- -- Hamish B hamis...@yahoo.com  Fri, 15 Apr 2011 15:35:56 +1200
+ -- Hamish B hamis...@yahoo.com  Thu, 20 Apr 2011 17:20:04 +1200
 
 opencpn (2.2.918-1) unstable; urgency=low
 

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2011-04-16 02:18:29 UTC (rev 
2979)
+++ packages/opencpn/trunk/debian/control   2011-04-20 12:28:27 UTC (rev 
2980)
@@ -11,7 +11,7 @@
 Package: opencpn
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgps19
-Recommends: gpsd
+Recommends: gpsd, xtide-coastline
 Suggests: gpsd-clients, xcalib
 Description: A concise GPS ChartPlotter/Navigator
  OpenCPN is a cross-platform ship-borne GUI chart plotter

Modified: packages/opencpn/trunk/debian/patches/series
===
--- packages/opencpn/trunk/debian/patches/series2011-04-16 02:18:29 UTC 
(rev 2979)
+++ packages/opencpn/trunk/debian/patches/series2011-04-20 12:28:27 UTC 
(rev 2980)
@@ -1,2 +1,3 @@
 fix-plugin-path.patch
 rm_embedded_zlib.patch
+use_xtide_coastline.patch

Added: packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
===
--- packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch 
(rev 0)
+++ packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch 
2011-04-20 12:28:27 UTC (rev 2980)
@@ -0,0 +1,33 @@
+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.
+Index: opencpn/src/chart1.cpp
+===
+--- opencpn.orig/src/chart1.cpp2011-04-21 00:09:08.208588848 +1200
 opencpn/src/chart1.cpp 2011-04-21 00:11:15.816860473 +1200
+@@ -1401,8 +1401,9 @@
+ 
+ 
+ //  Establish the WorldVectorShoreline Dataset location
+-pWVS_Locn = new wxString(_T(wvsdata));
+-pWVS_Locn-Prepend(g_SData_Locn);
++//  pWVS_Locn = new wxString(_T(wvsdata));
++//  pWVS_Locn-Prepend(g_SData_Locn);
++pWVS_Locn = new wxString(_T(/usr/share/xtide-wvs));
+ pWVS_Locn-Append(wxFileName::GetPathSeparator());
+ 
+ //  Reload the config data, to pick up any missing data class 
configuration info
+Index: opencpn/src/wvschart.cpp
+===
+--- opencpn.orig/src/wvschart.cpp  2011-04-21 00:12:26.016601391 +1200
 opencpn/src/wvschart.cpp   2011-04-21 00:13:13.188610696 +1200
+@@ -52,7 +52,8 @@
+ {
+ pwvs_home_dir = new wxString(wvs_chart_home);
+ pwvs_file_name = new wxString(*pwvs_home_dir);
+-pwvs_file_name-Append(_T(wvs43.dat));
++//  pwvs_file_name-Append(_T(wvs43.dat));
++pwvs_file_name-Append(_T(wvs1.dat));
+ for(int i=0 ; i  360 ; i++)
+ {
+ for(int j=0 ; j  180; j++)

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2011-04-16 02:18:29 UTC (rev 2979)
+++ packages/opencpn/trunk/debian/rules 2011-04-20 12:28:27 UTC (rev 2980)
@@ -21,6 +21,9 @@
mv -f $(CURDIR)/debian/opencpn/usr/share/opencpn/plugins/ \
$(CURDIR)/debian/opencpn/usr/lib/opencpn-plugins/

+   # WVS supplied by the xtide-coastline package
+   rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/wvsdata/
+   
dh_install

rm $(CURDIR)/debian/opencpn/usr/share/opencpn/license.txt


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

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

2011-04-20 Thread hamish-guest

Author: hamish-guest
Date: 2011-04-20 12:59:12 + (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 hamis...@yahoo.com  Thu, 20 Apr 2011 17:20:04 +1200
+ -- Hamish B hamis...@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/series2011-04-20 12:28:27 UTC 
(rev 2980)
+++ packages/opencpn/trunk/debian/patches/series2011-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


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

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

2011-04-20 Thread hamish-guest

Author: hamish-guest
Date: 2011-04-20 13:04:58 + (Wed, 20 Apr 2011)
New Revision: 2982

Added:
   packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/patches/series
Log:
Point to packaged doc directory

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-04-20 12:59:12 UTC (rev 
2981)
+++ packages/opencpn/trunk/debian/changelog 2011-04-20 13:04:58 UTC (rev 
2982)
@@ -8,6 +8,7 @@
   * Use system's zlib, bzip2 instead of embedded copy
   * Recommend xtide's WVS coastline instead of shipping a clone
   * Use system's copy of the GPLv2
+  * Point to packaged doc directory
 
  -- Hamish B hamis...@yahoo.com  Wed, 20 Apr 2011 17:56:57 +1200
 

Added: packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
===
--- packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch  
(rev 0)
+++ packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch  
2011-04-20 13:04:58 UTC (rev 2982)
@@ -0,0 +1,15 @@
+point to Debian-package doc dir
+Index: opencpn/src/about.cpp
+===
+--- opencpn.orig/src/about.cpp 2011-04-21 01:00:16.956585284 +1200
 opencpn/src/about.cpp  2011-04-21 01:01:57.900856458 +1200
+@@ -397,7 +397,8 @@
+ wxString def_lang_canonical = 
wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT)-CanonicalName;
+ 
+ wxString help_locn = _T(doc/help_);
+-help_locn.Prepend(*m_pDataLocn);
++//  help_locn.Prepend(*m_pDataLocn);
++  help_locn.Prepend(_T(/usr/share/doc/opencpn/));
+ 
+ wxString help_try = help_locn;
+ help_try += def_lang_canonical;

Modified: packages/opencpn/trunk/debian/patches/series
===
--- packages/opencpn/trunk/debian/patches/series2011-04-20 12:59:12 UTC 
(rev 2981)
+++ packages/opencpn/trunk/debian/patches/series2011-04-20 13:04:58 UTC 
(rev 2982)
@@ -2,3 +2,4 @@
 rm_embedded_zlib.patch
 use_xtide_coastline.patch
 ref_debian_gpl2.patch
+ref_debian_doc_dir.patch


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

r2983 - packages/opencpn/trunk/debian

2011-04-21 Thread hamish-guest

Author: hamish-guest
Date: 2011-04-22 00:34:31 + (Fri, 22 Apr 2011)
New Revision: 2983

Added:
   packages/opencpn/trunk/debian/README.harmonics
Log:
notes on harmonics data

Added: packages/opencpn/trunk/debian/README.harmonics
===
--- packages/opencpn/trunk/debian/README.harmonics  
(rev 0)
+++ packages/opencpn/trunk/debian/README.harmonics  2011-04-22 00:34:31 UTC 
(rev 2983)
@@ -0,0 +1,20 @@
+The opencpn-data package currently ships the ASCII version of xtide's
+tidal harmonics tables, while the xtide-data package ships a binary-
+blob version.
+
+
+On 21 Apr 2011, Dave (bdbcat) wrote:
+
+Comment on xtide data:
+The harmonic data currently shipping in sourceforge git have been 
+tweaked (by me and others) to work nicely in the US, especially 
+fixing current direction reporting. We are also soon adding 
+Scandinavian tide staion support. Using a generic xtide harmonic 
+file will be less useful for many users. I think we need to continue 
+to package our own harmonic files.
+...
+Related point: I tested some code to incorporate the newer binary 
+xtide data sets. This could be made to work, but I have no immediate 
+motivation to pursue.
+
+


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

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

2011-04-24 Thread hamish-guest

Author: hamish-guest
Date: 2011-04-25 00:33:24 + (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 hamis...@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 an...@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 bdb...@yahoo.com
+David S Register bdb...@yahoo.com - OpenCPN Lead Developer
+Other contributing authors are listed in src/about.cpp AuthorText[].
 
 Copyright:
 
-Copyright (C) 2008-2010 dsr bdb...@yahoo.com
+Copyright (C) 2008-2011 David S Register bdb...@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
+  s52cnsys52plib GPL
+  seriallib   GPL
+  tcmgr   GPL
+  mygdal  BSD, compatible with GPL
+  nmea0183Owner License, compatible with GPL
+  triangles   Public Domain see tri.c, compatible with GPL
+  wvschartPublic Domain see wvschart.cpp, compatible with GPL
+
+
 The Debian packaging is:
 
-Copyright (C) 2010 Anton Martchukov an...@martchukov.com
+Copyright (C) 2010-2011 Anton Martchukov an...@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.0 +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

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

2011-04-24 Thread hamish-guest

Author: hamish-guest
Date: 2011-04-25 03:42:43 + (Mon, 25 Apr 2011)
New Revision: 2985

Added:
   packages/opencpn/trunk/debian/opencpn-data.dirs
   packages/opencpn/trunk/debian/opencpn-data.docs
   packages/opencpn/trunk/debian/opencpn-data.install
   packages/opencpn/trunk/debian/opencpn-doc.dirs
   packages/opencpn/trunk/debian/opencpn-doc.docs
   packages/opencpn/trunk/debian/opencpn-doc.install
   packages/opencpn/trunk/debian/opencpn.dirs
   packages/opencpn/trunk/debian/opencpn.docs
   packages/opencpn/trunk/debian/opencpn.install
Removed:
   packages/opencpn/trunk/debian/docs
Modified:
   packages/opencpn/trunk/debian/README.harmonics
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/control
   packages/opencpn/trunk/debian/opencpn.1
   packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
   packages/opencpn/trunk/debian/rules
Log:
Split off opencpn-data and opencpn-doc packages

Modified: packages/opencpn/trunk/debian/README.harmonics
===
--- packages/opencpn/trunk/debian/README.harmonics  2011-04-25 00:33:24 UTC 
(rev 2984)
+++ packages/opencpn/trunk/debian/README.harmonics  2011-04-25 03:42:43 UTC 
(rev 2985)
@@ -3,6 +3,14 @@
 blob version.
 
 
+The tide and current harmonic data contained herein are derived from the
+corresponding XTIDE harmonic data. The file data have been tweaked to
+work nicely in the US, especially fixing current direction reporting. We
+have also added additional global tide stations, and corrected calculation/
+display units where sensible. A generic XTIDE harmonic file set will be
+functional, but less useful than the harmonic data packaged with OpenCPN.
+
+
 On 21 Apr 2011, Dave (bdbcat) wrote:
 
 Comment on xtide data:

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-04-25 00:33:24 UTC (rev 
2984)
+++ packages/opencpn/trunk/debian/changelog 2011-04-25 03:42:43 UTC (rev 
2985)
@@ -2,6 +2,7 @@
 
   * Packaged for upstream git beta version 2.4.423
   * Add some copyright notes
+  * Split off opencpn-data and opencpn-doc packages
 
  -- Hamish B hamis...@yahoo.com  Mon, 25 Apr 2011 12:18:38 +1200
 

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2011-04-25 00:33:24 UTC (rev 
2984)
+++ packages/opencpn/trunk/debian/control   2011-04-25 03:42:43 UTC (rev 
2985)
@@ -11,7 +11,7 @@
 Package: opencpn
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgps19
-Recommends: gpsd, xtide-coastline
+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
@@ -22,3 +22,37 @@
  * S57 Vector ENChart Display
  * AIS Input Decoding
  * Waypoint Autopilot Navigation
+
+Package: opencpn-doc
+Architecture: all
+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:
+ .   
+ * 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
+Architecture: all
+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:
+ .
+ * 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.
+

Deleted: packages/opencpn/trunk/debian/docs
===
--- packages/opencpn/trunk/debian/docs  2011-04-25 00:33:24 UTC (rev 2984)
+++ packages/opencpn/trunk/debian/docs  2011-04-25 03:42:43 UTC (rev 2985)
@@ -1,2 +0,0 @@
-README
-data/doc

Added: packages/opencpn/trunk/debian/opencpn-data.dirs
===
--- packages/opencpn/trunk/debian/opencpn-data.dirs 
(rev 0)
+++ packages/opencpn/trunk/debian/opencpn-data.dirs 2011-04-25 03:42:43 UTC 
(rev 2985)
@@ -0,0 +1,3 @@
+usr/share/opencpn/sounds
+usr/share/opencpn/tcdata
+usr/share/doc/opencpn-data

Added: packages/opencpn/trunk/debian/opencpn-data.docs
===
--- packages/opencpn/trunk/debian/opencpn-data.docs 
(rev 0)
+++ packages/opencpn/trunk/debian/opencpn

r2986 - packages/opencpn/trunk/debian

2011-04-29 Thread hamish-guest

Author: hamish-guest
Date: 2011-04-30 02:25:10 + (Sat, 30 Apr 2011)
New Revision: 2986

Modified:
   packages/opencpn/trunk/debian/rules
Log:
clean up install of READMEs

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2011-04-25 03:42:43 UTC (rev 2985)
+++ packages/opencpn/trunk/debian/rules 2011-04-30 02:25:10 UTC (rev 2986)
@@ -31,10 +31,14 @@
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/doc
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/sounds
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/tcdata
-   # fixme: the main docs install just recopies in this README a moment 
later..
+
+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
-   rm 
$(CURDIR)/debian/opencpn-data/usr/share/opencpn/sounds/README_BELLS.txt
 
-
 override_dh_installman:
dh_installman debian/opencpn.1


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

r2987 - packages/opencpn/trunk/debian

2011-05-02 Thread hamish-guest

Author: hamish-guest
Date: 2011-05-02 12:50:38 + (Mon, 02 May 2011)
New Revision: 2987

Modified:
   packages/opencpn/trunk/debian/menu
Log:
linewrap

Modified: packages/opencpn/trunk/debian/menu
===
--- packages/opencpn/trunk/debian/menu  2011-04-30 02:25:10 UTC (rev 2986)
+++ packages/opencpn/trunk/debian/menu  2011-05-02 12:50:38 UTC (rev 2987)
@@ -1,3 +1,5 @@
-?package(opencpn):needs=X11 section=Applications/Science/Geoscience\
-  title=OpenCPN command=/usr/bin/opencpn\
+?package(opencpn):needs=X11\
+  section=Applications/Science/Geoscience\
+  title=OpenCPN\
+  command=/usr/bin/opencpn\
   icon=/usr/share/pixmaps/opencpn.xpm


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

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

2011-05-08 Thread hamish-guest

Author: hamish-guest
Date: 2011-05-08 06:23:48 + (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 hamis...@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 bdb...@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

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

2011-05-26 Thread hamish-guest

Author: hamish-guest
Date: 2011-05-26 08:53:03 + (Thu, 26 May 2011)
New Revision: 3001

Removed:
   packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
   packages/opencpn/trunk/debian/patches/series
   packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
Log:
Packaged for upstream git beta version 2.4.523

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-05-24 13:10:54 UTC (rev 
3000)
+++ packages/opencpn/trunk/debian/changelog 2011-05-26 08:53:03 UTC (rev 
3001)
@@ -1,3 +1,10 @@
+opencpn (2.4.523-1) unstable; urgency=low
+
+  * Packaged for upstream git beta version 2.4.523
+  * Zlib patch merged upstream
+
+ -- Hamish B hamis...@yahoo.com  Tue, 24 May 2011 20:09:18 +1200
+
 opencpn (2.4.506-1) unstable; urgency=low
 
   * Packaged for upstream git beta version 2.4.506

Modified: packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
===
--- packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch  
2011-05-24 13:10:54 UTC (rev 3000)
+++ packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch  
2011-05-26 08:53:03 UTC (rev 3001)
@@ -2,9 +2,9 @@
 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
-+++ opencpn/src/about.cpp  2011-04-21 01:01:57.900856458 +1200
-@@ -397,7 +397,8 @@
+--- opencpn.orig/src/about.cpp 2011-05-24 20:03:38.014938255 +1200
 opencpn/src/about.cpp  2011-05-24 20:03:45.214915189 +1200
+@@ -449,7 +449,8 @@
  wxString def_lang_canonical = 
wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT)-CanonicalName;
  
  wxString help_locn = _T(doc/help_);

Deleted: packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
===
--- packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
2011-05-24 13:10:54 UTC (rev 3000)
+++ packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch
2011-05-26 08:53:03 UTC (rev 3001)
@@ -1,66 +0,0 @@
-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.txt2011-04-15 
23:21:38.285860737 +1200
-+++ opencpn/plugins/grib_pi/CMakeLists.txt 2011-04-16 03:22:20.561110795 
+1200
-@@ -78,7 +78,12 @@
- src/GribReader.cpp 
- src/GribRecord.cpp  
- src/zuFile.cpp 
--src/IsoLine.cpp 
-+src/IsoLine.cpp
-+)
-+ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_GRIB})
-+
-+IF(NOT UNIX)
-+SET(SRC_BZIP
- src/bzip2/bzlib.c 
- src/bzip2/blocksort.c 
- src/bzip2/compress.c 
-@@ -86,11 +91,12 @@
- src/bzip2/decompress.c 
- src/bzip2/huffman.c 
- src/bzip2/randtable.c
--  )
--ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_GRIB})
-+)
-+ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_BZIP})
- 
--INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/zlib-1.2.3)
--INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/bzip2)
-+INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/zlib-1.2.3)
-+INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/bzip2)
-+ENDIF(NOT UNIX)
- 
- IF(WIN32)
-   SET(OPENCPN_IMPORT_LIB ../../${CMAKE_CFG_INTDIR}/${PARENT})
-Index: opencpn/CMakeLists.txt
-===
 opencpn.orig/CMakeLists.txt2011-04-16 02:55:53.636598695 +1200
-+++ opencpn/CMakeLists.txt 2011-04-16 03:21:52.989110463 +1200
-@@ -111,6 +111,13 @@
- 
- FIND_PACKAGE(Gettext REQUIRED)
- 
-+IF(UNIX)
-+FIND_PACKAGE(BZip2 REQUIRED)
-+INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
-+FIND_PACKAGE(ZLIB REQUIRED)
-+INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-+ENDIF(UNIX)
-+
- # For convenience we define the sources as a variable. You can add 
- # header files and cpp/c files and CMake will sort them out
- 
-@@ -500,6 +507,8 @@
- TARGET_LINK_LIBRARIES(${PACKAGE_NAME}
-   ${OPENGL_LIBRARIES}
-   ${GETTEXT_LIBRARY}
-+  ${BZIP2_LIBRARIES}
-+  ${ZLIB_LIBRARY}
- )
- ENDIF(UNIX)
- 

Modified: packages/opencpn/trunk/debian/patches/series
===
--- packages/opencpn/trunk/debian/patches/series2011-05-24 13:10:54 UTC 
(rev 3000)
+++ packages/opencpn/trunk/debian/patches/series2011-05-26 08

r3002 - scripts

2011-05-27 Thread hamish-guest

Author: hamish-guest
Date: 2011-05-27 09:05:19 + (Fri, 27 May 2011)
New Revision: 3002

Modified:
   scripts/dgis-packages.inc
Log:
+opencpn ITP #538067

Modified: scripts/dgis-packages.inc
===
--- scripts/dgis-packages.inc   2011-05-26 08:53:03 UTC (rev 3001)
+++ scripts/dgis-packages.inc   2011-05-27 09:05:19 UTC (rev 3002)
@@ -98,6 +98,7 @@
 'netcdf-perl' = 
{url='http://starship.python.net/crew/hinsen/scientific.html'},
 'nitro' = {url='http://nitro-nitf.sourceforge.net/wikka.php?wakka=HomePage'},
 'ogdi-dfsg' = {url='http://ogdi.sourceforge.net/',wnpp='413842'},
+'opencpn' = {url='http://www.opencpn.org/',wnpp='538067'},
 'opencv' = {url='http://sourceforge.net/projects/opencvlibrary/'},
 'openev' = {url='http://openev.sourceforge.net/',wnpp='291562'},
 'openjump' = {url='http://jump-pilot.sourceforge.net/',wnpp='356494'},


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3003 - scripts

2011-05-27 Thread hamish-guest

Author: hamish-guest
Date: 2011-05-27 09:19:47 + (Fri, 27 May 2011)
New Revision: 3003

Modified:
   scripts/dgis-status.pl
Log:
updated for another 2 years of ubuntu releases

Modified: scripts/dgis-status.pl
===
--- scripts/dgis-status.pl  2011-05-27 09:05:19 UTC (rev 3002)
+++ scripts/dgis-status.pl  2011-05-27 09:19:47 UTC (rev 3003)
@@ -33,6 +33,7 @@
 #   Authors:
 # Francesco P. Lovergine (original author of dgis-status.pl)
 # Cameron Shorter (extended to Ubuntu)
+# Hamish Bowman (updated for another 2 years of ubuntu releases)
 #
 
 use strict 'vars';
@@ -91,30 +92,36 @@
 
http://www.backports.org/debian/dists/lenny-backports/non-free/source/;,
 http://www.backports.org/debian/dists/lenny-backports/contrib/source/;
 ],
-'jaunty' = [
-http://archive.ubuntu.com/ubuntu/dists/jaunty/main/source/;,
-http://archive.ubuntu.com/ubuntu/dists/jaunty/multiverse/source/;,
-http://archive.ubuntu.com/ubuntu/dists/jaunty/restricted/source/;,
-http://archive.ubuntu.com/ubuntu/dists/jaunty/universe/source/;
+'oneiric' = [
+http://archive.ubuntu.com/ubuntu/dists/oneiric/main/source/;,
+http://archive.ubuntu.com/ubuntu/dists/oneiric/multiverse/source/;,
+http://archive.ubuntu.com/ubuntu/dists/oneiric/restricted/source/;,
+http://archive.ubuntu.com/ubuntu/dists/oneiric/universe/source/;
 ],
-'intrepid' = [
-http://archive.ubuntu.com/ubuntu/dists/intrepid/main/source/;,
-http://archive.ubuntu.com/ubuntu/dists/intrepid/multiverse/source/;,
-http://archive.ubuntu.com/ubuntu/dists/intrepid/restricted/source/;,
-http://archive.ubuntu.com/ubuntu/dists/intrepid/universe/source/;
+'natty' = [
+http://archive.ubuntu.com/ubuntu/dists/natty/main/source/;,
+http://archive.ubuntu.com/ubuntu/dists/natty/multiverse/source/;,
+http://archive.ubuntu.com/ubuntu/dists/natty/restricted/source/;,
+http://archive.ubuntu.com/ubuntu/dists/natty/universe/source/;
 ],
+'maverick' = [
+http://archive.ubuntu.com/ubuntu/dists/maverick/main/source/;,
+http://archive.ubuntu.com/ubuntu/dists/maverick/multiverse/source/;,
+http://archive.ubuntu.com/ubuntu/dists/maverick/restricted/source/;,
+http://archive.ubuntu.com/ubuntu/dists/maverick/universe/source/;
+],
+'lucid' = [
+http://archive.ubuntu.com/ubuntu/dists/lucid/main/source/;,
+http://archive.ubuntu.com/ubuntu/dists/lucid/multiverse/source/;,
+http://archive.ubuntu.com/ubuntu/dists/lucid/restricted/source/;,
+http://archive.ubuntu.com/ubuntu/dists/lucid/universe/source/;
+],
 'hardy' = [
 http://archive.ubuntu.com/ubuntu/dists/hardy/main/source/;,
 http://archive.ubuntu.com/ubuntu/dists/hardy/multiverse/source/;,
 http://archive.ubuntu.com/ubuntu/dists/hardy/restricted/source/;,
 http://archive.ubuntu.com/ubuntu/dists/hardy/universe/source/;
 ],
-'gutsy' = [
-http://archive.ubuntu.com/ubuntu/dists/gutsy/main/source/;,
-http://archive.ubuntu.com/ubuntu/dists/gutsy/multiverse/source/;,
-http://archive.ubuntu.com/ubuntu/dists/gutsy/restricted/source/;,
-http://archive.ubuntu.com/ubuntu/dists/gutsy/universe/source/;
-],
 'dapper' = [
 http://archive.ubuntu.com/ubuntu/dists/dapper/main/source/;,
 http://archive.ubuntu.com/ubuntu/dists/dapper/multiverse/source/;,
@@ -128,14 +135,15 @@
 if ($opt_u) {
 @versions = (
 stable, testing,  unstable, lenny-bpo,
-jaunty, intrepid, hardy,gutsy,
-dapper
+oneiric, natty, maverick,
+lucid, hardy, dapper
 );
 }
 else {
 @versions = ( stable, testing, unstable, lenny-bpo );
 }
-my $ubuntuVer = jaunty;
+# which version of Ubuntu to compare against for newer/older comparisons?
+my $ubuntuVer = natty;
 my $sources   = Sources;
 my $sourcesgz = $sources.gz;
 my $verbose   = 0;


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3004 - scripts

2011-05-27 Thread hamish-guest

Author: hamish-guest
Date: 2011-05-27 13:03:29 + (Fri, 27 May 2011)
New Revision: 3004

Modified:
   scripts/dgis-status.pl
Log:
update lenny-bpo to stable-bpo

Modified: scripts/dgis-status.pl
===
--- scripts/dgis-status.pl  2011-05-27 09:19:47 UTC (rev 3003)
+++ scripts/dgis-status.pl  2011-05-27 13:03:29 UTC (rev 3004)
@@ -87,10 +87,10 @@
 http://ftp.nl.debian.org/debian/dists/unstable/non-free/source/;,
 http://ftp.it.debian.org/debian/dists/unstable/contrib/source/;
 ],
-'lenny-bpo' = [
-http://www.backports.org/debian/dists/lenny-backports/main/source/;,
-
http://www.backports.org/debian/dists/lenny-backports/non-free/source/;,
-http://www.backports.org/debian/dists/lenny-backports/contrib/source/;
+'stable-bpo' = [
+
http://backports.debian.org/debian-backports/dists/stable-backports/main/source/;,
+
http://backports.debian.org/debian-backports/dists/stable-backports/non-free/source/;,
+
http://backports.debian.org/debian-backports/dists/stable-backports/contrib/source/;
 ],
 'oneiric' = [
 http://archive.ubuntu.com/ubuntu/dists/oneiric/main/source/;,
@@ -134,13 +134,13 @@
 my @versions;
 if ($opt_u) {
 @versions = (
-stable, testing,  unstable, lenny-bpo,
+stable, testing,  unstable, stable-bpo,
 oneiric, natty, maverick,
 lucid, hardy, dapper
 );
 }
 else {
-@versions = ( stable, testing, unstable, lenny-bpo );
+@versions = ( stable, testing, unstable, stable-bpo );
 }
 # which version of Ubuntu to compare against for newer/older comparisons?
 my $ubuntuVer = natty;


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3005 - scripts

2011-05-27 Thread hamish-guest

Author: hamish-guest
Date: 2011-05-27 13:16:03 + (Fri, 27 May 2011)
New Revision: 3005

Modified:
   scripts/dgis-status.pl
Log:
alioth url migration

Modified: scripts/dgis-status.pl
===
--- scripts/dgis-status.pl  2011-05-27 13:03:29 UTC (rev 3004)
+++ scripts/dgis-status.pl  2011-05-27 13:16:03 UTC (rev 3005)
@@ -61,7 +61,7 @@
 #my $_ubuntu   = fred;
 #my $_testing  = fred;
 my $svn_repo = svn://svn.debian.org/pkg-grass;
-my $web_repo = http://svn.debian.org/wsvn/pkg-grass;;
+my $web_repo = http://anonscm.debian.org/viewvc/pkg-grass;;
 
 require dgis-packages.inc;
 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2011-06-14 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-14 20:44:46 + (Tue, 14 Jun 2011)
New Revision: 3011

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/patches/fix-plugin-path.patch
   packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
Log:
Refreshed patches for new upstream git beta version 2.4.612

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-06-07 15:52:00 UTC (rev 
3010)
+++ packages/opencpn/trunk/debian/changelog 2011-06-14 20:44:46 UTC (rev 
3011)
@@ -1,3 +1,9 @@
+opencpn (2.4.612-1) unstable; urgency=low
+
+  * Packaged for upstream git beta version 2.4.612
+
+ -- Hamish B hamis...@yahoo.com  Wed, 15 Jun 2011 08:43:50 +1200
+
 opencpn (2.4.606-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/opencpn/trunk/debian/patches/fix-plugin-path.patch
===
--- packages/opencpn/trunk/debian/patches/fix-plugin-path.patch 2011-06-07 
15:52:00 UTC (rev 3010)
+++ packages/opencpn/trunk/debian/patches/fix-plugin-path.patch 2011-06-14 
20:44:46 UTC (rev 3011)
@@ -3,9 +3,9 @@
 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
-+++ opencpn/src/pluginmanager.cpp  2011-04-15 20:59:16.701862358 +1200
-@@ -106,7 +106,8 @@
+--- 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)
  {

Modified: packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
===
--- packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch 
2011-06-07 15:52:00 UTC (rev 3010)
+++ packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch 
2011-06-14 20:44:46 UTC (rev 3011)
@@ -4,9 +4,9 @@
 Author: Hamish B hamish_b yahoo com
 Index: opencpn/src/chart1.cpp
 ===
 opencpn.orig/src/chart1.cpp2011-05-24 19:46:54.491952983 +1200
-+++ opencpn/src/chart1.cpp 2011-05-24 19:59:59.886929260 +1200
-@@ -2205,8 +2205,9 @@
+--- opencpn.orig/src/chart1.cpp2011-06-15 07:31:01.039909704 +1200
 opencpn/src/chart1.cpp 2011-06-15 08:31:17.874925509 +1200
+@@ -2272,8 +2272,9 @@
  
  
  //  Establish the WorldVectorShoreline Dataset location
@@ -20,8 +20,8 @@
  //  Reload the config data, to pick up any missing data class 
configuration info
 Index: opencpn/src/wvschart.cpp
 ===
 opencpn.orig/src/wvschart.cpp  2011-05-24 19:46:54.516175613 +1200
-+++ opencpn/src/wvschart.cpp   2011-05-24 19:59:59.898963894 +1200
+--- opencpn.orig/src/wvschart.cpp  2011-06-15 07:30:12.142924679 +1200
 opencpn/src/wvschart.cpp   2011-06-15 08:31:17.894959863 +1200
 @@ -52,7 +52,8 @@
  {
  pwvs_home_dir = new wxString(wvs_chart_home);


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3013 - packages/opencpn/tarballs

2011-06-16 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-17 05:01:47 + (Fri, 17 Jun 2011)
New Revision: 3013

Added:
   packages/opencpn/tarballs/opencpn_2.4.612.orig.tar.gz
Log:
Adding 2.4.612 upstream version tarball, with mswin  osx build bits removed

Added: packages/opencpn/tarballs/opencpn_2.4.612.orig.tar.gz
===
(Binary files differ)


Property changes on: packages/opencpn/tarballs/opencpn_2.4.612.orig.tar.gz
___
Added: svn:mime-type
   + application/octet-stream


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3014 - packages/opencpn/tarballs

2011-06-16 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-17 05:16:20 + (Fri, 17 Jun 2011)
New Revision: 3014

Added:
   packages/opencpn/tarballs/get_latest_from_git.sh
Log:
add helper script

Added: packages/opencpn/tarballs/get_latest_from_git.sh
===
--- packages/opencpn/tarballs/get_latest_from_git.sh
(rev 0)
+++ packages/opencpn/tarballs/get_latest_from_git.sh2011-06-17 05:16:20 UTC 
(rev 3014)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# grab upstream source and strip for .orig.tar.gz 
+#  H.Bowman 17 June 2011, released to the public domain
+
+git clone git://opencpn.git.sourceforge.net/gitroot/opencpn/opencpn
+
+rm -rf opencpn/.git/
+rm -rf opencpn/buildosx/
+rm -rf opencpn/buildwin/
+rm -rf opencpn/wxWidgets/
+
+VERS=`cat opencpn/VERSION.cmake | cut -f2 -d'' | head -n 3 | \
+   tr '\n' '.' | sed -e 's/\.$//'`
+
+mv opencpn/ opencpn-$VERS
+
+
+tar czf opencpn_$VERS.orig.tar.gz opencpn-$VERS/
+rm -rf opencpn-$VERS/
+
+
+


Property changes on: packages/opencpn/tarballs/get_latest_from_git.sh
___
Added: svn:executable
   + *
Added: svn:mime-type
   + text/x-sh
Added: svn:eol-style
   + native


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3015 - packages/opencpn/tarballs

2011-06-17 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-17 07:16:40 + (Fri, 17 Jun 2011)
New Revision: 3015

Modified:
   packages/opencpn/tarballs/get_latest_from_git.sh
Log:
indicate that this is modified from upstream

Modified: packages/opencpn/tarballs/get_latest_from_git.sh
===
--- packages/opencpn/tarballs/get_latest_from_git.sh2011-06-17 05:16:20 UTC 
(rev 3014)
+++ packages/opencpn/tarballs/get_latest_from_git.sh2011-06-17 07:16:40 UTC 
(rev 3015)
@@ -15,7 +15,7 @@
 mv opencpn/ opencpn-$VERS
 
 
-tar czf opencpn_$VERS.orig.tar.gz opencpn-$VERS/
+tar czf opencpn_$VERS+dfsg.orig.tar.gz opencpn-$VERS/
 rm -rf opencpn-$VERS/
 
 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3016 - packages/opencpn/tarballs

2011-06-17 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-17 07:26:47 + (Fri, 17 Jun 2011)
New Revision: 3016

Added:
   packages/opencpn/tarballs/opencpn_2.4.606+dfsg.orig.tar.gz
   packages/opencpn/tarballs/opencpn_2.4.612+dfsg.orig.tar.gz
Removed:
   packages/opencpn/tarballs/opencpn_2.4.606.orig.tar.gz
   packages/opencpn/tarballs/opencpn_2.4.612.orig.tar.gz
Log:
rename to make it obvious that the tarball has been stripped of non-dfsg stuff

Copied: packages/opencpn/tarballs/opencpn_2.4.606+dfsg.orig.tar.gz (from rev 
3012, packages/opencpn/tarballs/opencpn_2.4.606.orig.tar.gz)
===
(Binary files differ)

Deleted: packages/opencpn/tarballs/opencpn_2.4.606.orig.tar.gz
===
(Binary files differ)

Copied: packages/opencpn/tarballs/opencpn_2.4.612+dfsg.orig.tar.gz (from rev 
3013, packages/opencpn/tarballs/opencpn_2.4.612.orig.tar.gz)
===
(Binary files differ)

Deleted: packages/opencpn/tarballs/opencpn_2.4.612.orig.tar.gz
===
(Binary files differ)


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3019 - packages/opencpn/trunk/debian

2011-06-18 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-18 13:28:11 + (Sat, 18 Jun 2011)
New Revision: 3019

Modified:
   packages/opencpn/trunk/debian/changelog
Log:
+  * Add README.Debian


Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-06-17 12:41:31 UTC (rev 
3018)
+++ packages/opencpn/trunk/debian/changelog 2011-06-18 13:28:11 UTC (rev 
3019)
@@ -1,6 +1,7 @@
 opencpn (2.4.612-1) unstable; urgency=low
 
   * Packaged for upstream git beta version 2.4.612
+  * Add README.Debian
 
  -- Hamish B hamis...@yahoo.com  Wed, 15 Jun 2011 08:43:50 +1200
 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3020 - packages/opencpn/trunk/debian

2011-06-20 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-20 08:31:34 + (Mon, 20 Jun 2011)
New Revision: 3020

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/rules
Log:
rm dupe opt flags, rm unused css/javascript stuff

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-06-18 13:28:11 UTC (rev 
3019)
+++ packages/opencpn/trunk/debian/changelog 2011-06-20 08:31:34 UTC (rev 
3020)
@@ -2,8 +2,9 @@
 
   * Packaged for upstream git beta version 2.4.612
   * Add README.Debian
+  * Various minor packaging cleanups
 
- -- Hamish B hamis...@yahoo.com  Wed, 15 Jun 2011 08:43:50 +1200
+ -- Hamish B hamis...@yahoo.com  Mon, 20 Jun 2011 18:00:15 +1200
 
 opencpn (2.4.606-1) unstable; urgency=low
 

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2011-06-18 13:28:11 UTC (rev 3019)
+++ packages/opencpn/trunk/debian/rules 2011-06-20 08:31:34 UTC (rev 3020)
@@ -3,6 +3,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Optimization and debugging flags are added in CMakeLists.txt. To support
+#  DEB_BUILD_OPTIONS's noopt perhaps that should be patched away and that
+#  logic be made to happen here?
+# Specifically, -O3's function inlining is desired.
+CFLAGS=-Wall
+CXXFLAGS=-Wall
 
 %:
dh  $@
@@ -26,3 +32,9 @@
#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
+
+override_dh_installdocs:
+   dh_installdocs
+   rm -rf $(CURDIR)/debian/opencpn-doc/usr/share/doc/opencpn-doc/doc/css/
+   rm -rf $(CURDIR)/debian/opencpn-doc/usr/share/doc/opencpn-doc/doc/js/
+


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3021 - packages/opencpn/tarballs

2011-06-20 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-20 08:52:25 + (Mon, 20 Jun 2011)
New Revision: 3021

Added:
   packages/opencpn/tarballs/opencpn_2.4.620+dfsg.orig.tar.gz
Log:
Add 2.4.620 upstream version tarball (with mswin  osx build bits removed)

Added: packages/opencpn/tarballs/opencpn_2.4.620+dfsg.orig.tar.gz
===
(Binary files differ)


Property changes on: packages/opencpn/tarballs/opencpn_2.4.620+dfsg.orig.tar.gz
___
Added: svn:mime-type
   + application/octet-stream


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2011-06-20 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-20 09:04:24 + (Mon, 20 Jun 2011)
New Revision: 3022

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
   packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch
   packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
Log:
Packaged for upstream git beta version 2.4.620

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-06-20 08:52:25 UTC (rev 
3021)
+++ packages/opencpn/trunk/debian/changelog 2011-06-20 09:04:24 UTC (rev 
3022)
@@ -1,3 +1,9 @@
+opencpn (2.4.620-1) unstable; urgency=low
+
+  * Packaged for upstream git beta version 2.4.620
+
+ -- Hamish B hamis...@yahoo.com  Mon, 20 Jun 2011 20:54:17 +1200
+
 opencpn (2.4.612-1) unstable; urgency=low
 
   * Packaged for upstream git beta version 2.4.612

Modified: packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
===
--- packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch  
2011-06-20 08:52:25 UTC (rev 3021)
+++ packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch  
2011-06-20 09:04:24 UTC (rev 3022)
@@ -2,9 +2,9 @@
 Author: Hamish B hamish_b yahoo com
 Index: opencpn/src/about.cpp
 ===
 opencpn.orig/src/about.cpp 2011-05-24 20:03:38.014938255 +1200
-+++ opencpn/src/about.cpp  2011-05-24 20:03:45.214915189 +1200
-@@ -449,7 +449,8 @@
+--- opencpn.orig/src/about.cpp 2011-06-20 20:53:28.910938614 +1200
 opencpn/src/about.cpp  2011-06-20 20:53:34.422923130 +1200
+@@ -452,7 +452,8 @@
  wxString def_lang_canonical = 
wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT)-CanonicalName;
  
  wxString help_locn = _T(doc/help_);

Modified: packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch
===
--- packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch 2011-06-20 
08:52:25 UTC (rev 3021)
+++ packages/opencpn/trunk/debian/patches/ref_debian_gpl2.patch 2011-06-20 
09:04:24 UTC (rev 3022)
@@ -2,9 +2,9 @@
 Author: Hamish B hamish_b yahoo com
 Index: opencpn/src/about.cpp
 ===
 opencpn.orig/src/about.cpp 2011-04-25 09:18:19.0 +1200
-+++ opencpn/src/about.cpp  2011-04-25 09:37:24.193610483 +1200
-@@ -295,8 +295,9 @@
+--- 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 @@
  
pLicenseTextCtl-SetDefaultStyle(ta);
pLicenseTextCtl-Clear();

Modified: packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
===
--- packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch 
2011-06-20 08:52:25 UTC (rev 3021)
+++ packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch 
2011-06-20 09:04:24 UTC (rev 3022)
@@ -4,9 +4,9 @@
 Author: Hamish B hamish_b yahoo com
 Index: opencpn/src/chart1.cpp
 ===
 opencpn.orig/src/chart1.cpp2011-06-15 07:31:01.039909704 +1200
-+++ opencpn/src/chart1.cpp 2011-06-15 08:31:17.874925509 +1200
-@@ -2272,8 +2272,9 @@
+--- opencpn.orig/src/chart1.cpp2011-06-20 20:42:50.955910181 +1200
 opencpn/src/chart1.cpp 2011-06-20 20:53:11.075910208 +1200
+@@ -2312,8 +2312,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-15 07:30:12.142924679 +1200
-+++ opencpn/src/wvschart.cpp   2011-06-15 08:31:17.894959863 +1200
-@@ -52,7 +52,8 @@
+--- 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 @@
  {
  pwvs_home_dir = new wxString(wvs_chart_home);
  pwvs_file_name = new wxString(*pwvs_home_dir);


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3023 - packages/opencpn/trunk/debian

2011-06-20 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-20 10:02:50 + (Mon, 20 Jun 2011)
New Revision: 3023

Modified:
   packages/opencpn/trunk/debian/rules
Log:
plugins weren't getting -O3

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2011-06-20 09:04:24 UTC (rev 3022)
+++ packages/opencpn/trunk/debian/rules 2011-06-20 10:02:50 UTC (rev 3023)
@@ -8,7 +8,7 @@
 #  logic be made to happen here?
 # Specifically, -O3's function inlining is desired.
 CFLAGS=-Wall
-CXXFLAGS=-Wall
+CXXFLAGS=-Wall -O3
 
 %:
dh  $@


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3024 - packages/opencpn/trunk/debian

2011-06-26 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-26 13:02:06 + (Sun, 26 Jun 2011)
New Revision: 3024

Added:
   packages/opencpn/trunk/debian/TODO
Log:
so things are not forgotten

Added: packages/opencpn/trunk/debian/TODO
===
--- packages/opencpn/trunk/debian/TODO  (rev 0)
+++ packages/opencpn/trunk/debian/TODO  2011-06-26 13:02:06 UTC (rev 3024)
@@ -0,0 +1,6 @@
+-Build-Depend on libtinyxml-dev and add any patches needed to build against 
the system version.
+
+-at the start of the debian/rules file, rm unused embedded source files, 
rendering them unusable.
+
+-close ITP #538067 in the changelog once ready for final review.
+


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3025 - packages/opencpn/trunk/debian

2011-06-28 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-28 13:53:18 + (Tue, 28 Jun 2011)
New Revision: 3025

Modified:
   packages/opencpn/trunk/debian/control
Log:
use packaged tinyxml, part 1

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2011-06-26 13:02:06 UTC (rev 
3024)
+++ packages/opencpn/trunk/debian/control   2011-06-28 13:53:18 UTC (rev 
3025)
@@ -4,7 +4,8 @@
 Maintainer: Debian GIS Project debian-...@lists.debian.org
 Uploaders: Anton Martchukov an...@martchukov.com, Hamish Bowman 
hamis...@yahoo.com
 Build-Depends: debhelper (= 7.0.50~), cmake, libglu-dev, libwxbase2.8-dev,
-   libwxgtk2.8-dev, libgtk2.0-dev, zlib1g-dev, libbz2-dev, libgps-dev
+   libwxgtk2.8-dev, libgtk2.0-dev, zlib1g-dev, libbz2-dev, libgps-dev,
+   libtinyxml-dev
 Standards-Version: 3.9.2
 Homepage: http://www.opencpn.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/opencpn/trunk/


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3026 - packages/opencpn/trunk/debian/patches

2011-06-29 Thread hamish-guest

Author: hamish-guest
Date: 2011-06-29 09:55:08 + (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/series2011-06-28 13:53:18 UTC 
(rev 3025)
+++ packages/opencpn/trunk/debian/patches/series2011-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.cpp2011-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.cpp2011-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);


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2011-06-30 Thread hamish-guest

Author: hamish-guest
Date: 2011-07-01 03:38:47 + (Fri, 01 Jul 2011)
New Revision: 3031

Modified:
   packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
   packages/opencpn/trunk/debian/rules
Log:
TinyXML dep: tinystr.h is only required if TINYXML_USE_STL is disabled, but 
libtinyxml2.5.3 defines it.

Modified: packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
===
--- packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-06-30 
02:57:47 UTC (rev 3030)
+++ packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-07-01 
03:38:47 UTC (rev 3031)
@@ -2,8 +2,8 @@
 Author: Hamish B hamish_b yahoo com
 Index: opencpn/CMakeLists.txt
 ===
 opencpn.orig/CMakeLists.txt2011-06-30 14:40:47.014926145 +1200
-+++ opencpn/CMakeLists.txt 2011-06-30 14:42:57.935949014 +1200
+--- opencpn.orig/CMakeLists.txt2011-07-01 11:55:11.290937381 +1200
 opencpn/CMakeLists.txt 2011-07-01 15:23:02.090948646 +1200
 @@ -126,6 +126,8 @@
  INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
  FIND_PACKAGE(ZLIB REQUIRED)
@@ -13,25 +13,27 @@
  ENDIF(UNIX)
  
  # For convenience we define the sources as a variable. You can add 
-@@ -224,7 +226,6 @@
+@@ -223,8 +225,6 @@
+   include/ais.h
  include/pluginmanager.h
  include/ocpn_plugin.h
-   include/tinystr.h
+-  include/tinystr.h
 -  include/tinyxml.h
include/gpxdocument.h
  )
  
-@@ -251,9 +252,6 @@
+@@ -251,10 +251,6 @@
src/about.cpp
src/ais.cpp
  src/pluginmanager.cpp
 -  src/tinyxml.cpp
 -  src/tinyxmlerror.cpp
 -  src/tinyxmlparser.cpp
-   src/tinystr.cpp
+-  src/tinystr.cpp
src/gpxdocument.cpp
  )
-@@ -606,6 +604,7 @@
+ 
+@@ -606,6 +602,7 @@
${GETTEXT_LIBRARY}
${BZIP2_LIBRARIES}
${ZLIB_LIBRARY}
@@ -39,3 +41,15 @@
  )
  ENDIF(UNIX)
  
+Index: opencpn/include/gpxdocument.h
+===
+--- opencpn.orig/include/gpxdocument.h 2011-07-01 15:25:22.290911324 +1200
 opencpn/include/gpxdocument.h  2011-07-01 15:25:34.522922563 +1200
+@@ -29,7 +29,6 @@
+ 
+ #include wx/wx.h
+ #include tinyxml.h
+-#include tinystr.h
+ #include stdio.h
+ 
+ const wxString GpxxColorNames[] = { _(Black), _(DarkRed), _(DarkGreen), 
_(DarkYellow), _(DarkBlue), _(DarkMagenta), _(DarkCyan), 
_(LightGray), _(DarkGray), _(Red), _(Green), _(Yellow), _(Blue), 
_(Magenta), _(Cyan), _(White) };//The last color defined by Garmin is 
transparent - we ignore it

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2011-06-30 02:57:47 UTC (rev 3030)
+++ packages/opencpn/trunk/debian/rules 2011-07-01 03:38:47 UTC (rev 3031)
@@ -19,7 +19,9 @@
rm -rf $(CURDIR)/plugins/grib_pi/src/zlib-1.2.3/
rm -rf $(CURDIR)/plugins/grib_pi/src/bzip2/
rm -f $(CURDIR)/include/tinyxml.h
+   rm -f $(CURDIR)/include/tinystr.h
rm -f $(CURDIR)/src/tinyxml*.cpp
+   rm -f $(CURDIR)/src/tinystr.cpp
dh_auto_configure
 
 override_dh_install:


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3036 - packages/opencpn/tarballs

2011-07-09 Thread hamish-guest

Author: hamish-guest
Date: 2011-07-09 21:15:21 + (Sat, 09 Jul 2011)
New Revision: 3036

Modified:
   packages/opencpn/tarballs/get_latest_from_git.sh
Log:
create md5sum, indicate where results go

Modified: packages/opencpn/tarballs/get_latest_from_git.sh
===
--- packages/opencpn/tarballs/get_latest_from_git.sh2011-07-09 18:26:22 UTC 
(rev 3035)
+++ packages/opencpn/tarballs/get_latest_from_git.sh2011-07-09 21:15:21 UTC 
(rev 3036)
@@ -21,4 +21,11 @@
 rm -rf opencpn-$VERS/
 
 
+md5sum opencpn_$VERS+dfsg.orig.tar.gz  opencpn_$VERS+dfsg.orig.tar.gz.MD5SUM
+#svn add opencpn_$VERS+dfsg.orig.tar.gz.MD5SUM
 
+
+# (wagner.debian.org)
+scp opencpn_$VERS+dfsg.orig.tar.gz \
+alioth.debian.org:/srv/home/groups/pkg-grass/htdocs/tarballs/
+


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3037 - packages/opencpn/tarballs

2011-07-10 Thread hamish-guest

Author: hamish-guest
Date: 2011-07-10 09:48:34 + (Sun, 10 Jul 2011)
New Revision: 3037

Added:
   packages/opencpn/tarballs/opencpn_2.4.708+dfsg.orig.tar.gz.MD5SUM
Removed:
   packages/opencpn/tarballs/opencpn_2.4.606+dfsg.orig.tar.gz
   packages/opencpn/tarballs/opencpn_2.4.612+dfsg.orig.tar.gz
   packages/opencpn/tarballs/opencpn_2.4.620+dfsg.orig.tar.gz
   packages/opencpn/tarballs/opencpn_2.4.708+dfsg.orig.tar.gz
Modified:
   packages/opencpn/tarballs/get_latest_from_git.sh
Log:
rm/mv tarballs to http://pkg-grass.alioth.debian.org/tarballs/

Modified: packages/opencpn/tarballs/get_latest_from_git.sh
===
--- packages/opencpn/tarballs/get_latest_from_git.sh2011-07-09 21:15:21 UTC 
(rev 3036)
+++ packages/opencpn/tarballs/get_latest_from_git.sh2011-07-10 09:48:34 UTC 
(rev 3037)
@@ -20,8 +20,9 @@
 tar czf opencpn_$VERS+dfsg.orig.tar.gz opencpn-$VERS/
 rm -rf opencpn-$VERS/
 
-
-md5sum opencpn_$VERS+dfsg.orig.tar.gz  opencpn_$VERS+dfsg.orig.tar.gz.MD5SUM
+echo # 
http://pkg-grass.alioth.debian.org/tarballs/opencpn_$VERS+dfsg.orig.tar.gz; \
+   opencpn_$VERS+dfsg.orig.tar.gz.MD5SUM
+md5sum opencpn_$VERS+dfsg.orig.tar.gz  opencpn_$VERS+dfsg.orig.tar.gz.MD5SUM
 #svn add opencpn_$VERS+dfsg.orig.tar.gz.MD5SUM
 
 

Deleted: packages/opencpn/tarballs/opencpn_2.4.606+dfsg.orig.tar.gz
===
(Binary files differ)

Deleted: packages/opencpn/tarballs/opencpn_2.4.612+dfsg.orig.tar.gz
===
(Binary files differ)

Deleted: packages/opencpn/tarballs/opencpn_2.4.620+dfsg.orig.tar.gz
===
(Binary files differ)

Deleted: packages/opencpn/tarballs/opencpn_2.4.708+dfsg.orig.tar.gz
===
(Binary files differ)

Added: packages/opencpn/tarballs/opencpn_2.4.708+dfsg.orig.tar.gz.MD5SUM
===
--- packages/opencpn/tarballs/opencpn_2.4.708+dfsg.orig.tar.gz.MD5SUM   
(rev 0)
+++ packages/opencpn/tarballs/opencpn_2.4.708+dfsg.orig.tar.gz.MD5SUM   
2011-07-10 09:48:34 UTC (rev 3037)
@@ -0,0 +1,2 @@
+# http://pkg-grass.alioth.debian.org/tarballs/opencpn_2.4.708+dfsg.orig.tar.gz
+ba7ed9175264d6793ea9f5893c92c775  opencpn_2.4.708+dfsg.orig.tar.gz


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3038 - packages/opencpn/trunk/debian

2011-07-10 Thread hamish-guest

Author: hamish-guest
Date: 2011-07-10 10:00:57 + (Sun, 10 Jul 2011)
New Revision: 3038

Removed:
   packages/opencpn/trunk/debian/cmake_Modules/
Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/rules
Log:
FindTinyXML.cmake now included by upstream

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-07-10 09:48:34 UTC (rev 
3037)
+++ packages/opencpn/trunk/debian/changelog 2011-07-10 10:00:57 UTC (rev 
3038)
@@ -1,13 +1,17 @@
 opencpn (2.4.708+dfsg-1) unstable; urgency=low
 
+  [ Anton Martchukov ]
   * Packaged for upstream git beta version 2.4.708
   * Fixed use_pkg_tinyxml.patch to apply cleanly with upstream changes
   * Added dfsg to version number
   * Added DEP-5 machine-readable copyright file
   * Closing ITP. (Closes: #538067)
 
- -- Anton Martchukov an...@martchukov.com  Sat, 09 Jul 2011 17:13:00 +0400
+  [ Hamish B ]
+  * FindTinyXML.cmake now included by upstream
 
+ -- Hamish B hamis...@yahoo.com  Sun, 10 Jul 2011 21:59:32 +1200
+
 opencpn (2.4.628-0) unstable; urgency=low
 
   * Packaged for upstream git beta version 2.4.628

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2011-07-10 09:48:34 UTC (rev 3037)
+++ packages/opencpn/trunk/debian/rules 2011-07-10 10:00:57 UTC (rev 3038)
@@ -14,7 +14,6 @@
dh $@ --parallel
 
 override_dh_auto_configure:
-   cp -f $(CURDIR)/debian/cmake_Modules/FindTinyXML.cmake $(CURDIR)/
# Remove embedded stuff which will go unused
rm -rf $(CURDIR)/plugins/grib_pi/src/zlib-1.2.3/
rm -rf $(CURDIR)/plugins/grib_pi/src/bzip2/


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

2011-08-02 Thread hamish-guest

Author: hamish-guest
Date: 2011-08-02 11:29:51 + (Tue, 02 Aug 2011)
New Revision: 3042

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
   packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
   packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
Log:
Packaged for upstream version 2.5.0

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-07-20 11:27:53 UTC (rev 
3041)
+++ packages/opencpn/trunk/debian/changelog 2011-08-02 11:29:51 UTC (rev 
3042)
@@ -1,11 +1,17 @@
-opencpn (2.4.708+dfsg-1) unstable; urgency=low
+opencpn (2.5.0-1) unstable; urgency=low
 
+  * Packaged for upstream version 2.5.0
+  * Drop most of TinyXML patch (superseded by upstream)
+  * Closing ITP. (Closes: #538067)
+
+ -- Hamish B hamis...@yahoo.com  Tue, 02 Aug 2011 22:36:56 +1200
+
+opencpn (2.4.708-0) unstable; urgency=low
+
   [ Anton Martchukov ]
   * Packaged for upstream git beta version 2.4.708
   * Fixed use_pkg_tinyxml.patch to apply cleanly with upstream changes
-  * Added dfsg to version number
   * Added DEP-5 machine-readable copyright file
-  * Closing ITP. (Closes: #538067)
 
   [ Hamish B ]
   * FindTinyXML.cmake now included by upstream

Modified: packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
===
--- packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch  
2011-07-20 11:27:53 UTC (rev 3041)
+++ packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch  
2011-08-02 11:29:51 UTC (rev 3042)
@@ -2,8 +2,8 @@
 Author: Hamish B hamish_b yahoo com
 Index: opencpn/src/about.cpp
 ===
 opencpn.orig/src/about.cpp 2011-06-20 20:53:28.910938614 +1200
-+++ opencpn/src/about.cpp  2011-06-20 20:53:34.422923130 +1200
+--- opencpn.orig/src/about.cpp 2011-08-02 22:59:00.202915243 +1200
 opencpn/src/about.cpp  2011-08-02 22:59:00.210927964 +1200
 @@ -452,7 +452,8 @@
  wxString def_lang_canonical = 
wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT)-CanonicalName;
  

Modified: packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
===
--- packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-07-20 
11:27:53 UTC (rev 3041)
+++ packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-08-02 
11:29:51 UTC (rev 3042)
@@ -1,52 +1,16 @@
 Description: Use system's copy of the TinyXML library
 Author: Hamish B hamish_b yahoo com
-Index: opencpn/CMakeLists.txt
+Index: opencpn/include/gpxdocument.h
 ===
 opencpn.orig/CMakeLists.txt2011-07-09 18:33:01.292126460 +0400
-+++ opencpn/CMakeLists.txt 2011-07-09 18:52:35.488126851 +0400
-@@ -178,7 +178,8 @@
- INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
- FIND_PACKAGE(ZLIB REQUIRED)
- INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
--FIND_PACKAGE(TinyXML)
-+FIND_PACKAGE(TinyXML REQUIRED)
-+INCLUDE_DIRECTORIES(${TINYXML_INCLUDE_DIR})
- ENDIF(UNIX)
+--- opencpn.orig/include/gpxdocument.h 2011-08-02 23:09:19.967165256 +1200
 opencpn/include/gpxdocument.h  2011-08-02 23:09:48.359953077 +1200
+@@ -29,7 +29,9 @@
  
- # For convenience we define the sources as a variable. You can add 
-@@ -276,7 +277,6 @@
-   include/ais.h
- include/pluginmanager.h
- include/ocpn_plugin.h
--  include/tinystr.h
-   include/gpxdocument.h
- )
- 
-@@ -303,7 +303,6 @@
-   src/about.cpp
-   src/ais.cpp
- src/pluginmanager.cpp
--  src/tinystr.cpp
-   src/gpxdocument.cpp
- )
- 
-@@ -670,6 +669,7 @@
-   ${GETTEXT_LIBRARY}
-   ${BZIP2_LIBRARIES}
-   ${ZLIB_LIBRARY}
-+  ${TINYXML_LIBRARIES}
-   )
- 
- IF(TINYXML_FOUND)
-Index: opencpn-2.4.708/include/gpxdocument.h
-===
 opencpn-2.4.708.orig/include/gpxdocument.h 2011-07-09 18:53:08.484126861 
+0400
-+++ opencpn-2.4.708/include/gpxdocument.h  2011-07-09 18:53:19.240126866 
+0400
-@@ -29,7 +29,6 @@
- 
  #include wx/wx.h
  #include tinyxml.h
--#include tinystr.h
++#ifndef TIXML_USE_STL
+ #include tinystr.h
++#endif
  #include stdio.h
  
  const wxString GpxxColorNames[] = { _(Black), _(DarkRed), _(DarkGreen), 
_(DarkYellow), _(DarkBlue), _(DarkMagenta), _(DarkCyan), 
_(LightGray), _(DarkGray), _(Red), _(Green), _(Yellow), _(Blue), 
_(Magenta), _(Cyan), _(White) };//The last color defined by Garmin is 
transparent - we ignore it

Modified: packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
===
--- packages

r3043 - packages/opencpn/tarballs

2011-08-02 Thread hamish-guest

Author: hamish-guest
Date: 2011-08-02 11:35:46 + (Tue, 02 Aug 2011)
New Revision: 3043

Added:
   packages/opencpn/tarballs/opencpn_2.5.0+dfsg.orig.tar.gz.MD5SUM
Modified:
   packages/opencpn/tarballs/get_latest_from_git.sh
Log:
Packaged for upstream version 2.5.0; use dfsg pruning for dfsg issues, not 
packaging cleanup (debian/rules is for that)

Modified: packages/opencpn/tarballs/get_latest_from_git.sh
===
--- packages/opencpn/tarballs/get_latest_from_git.sh2011-08-02 11:29:51 UTC 
(rev 3042)
+++ packages/opencpn/tarballs/get_latest_from_git.sh2011-08-02 11:35:46 UTC 
(rev 3043)
@@ -8,8 +8,6 @@
 rm -rf opencpn/buildosx/
 rm -rf opencpn/buildwin/
 rm -rf opencpn/wxWidgets/
-rm -rf opencpn/plugins/grib_pi/src/bzip2/
-rm -rf opencpn/plugins/grib_pi/src/zlib*/
 
 VERS=`cat opencpn/VERSION.cmake | cut -f2 -d'' | head -n 3 | \
tr '\n' '.' | sed -e 's/\.$//'`

Added: packages/opencpn/tarballs/opencpn_2.5.0+dfsg.orig.tar.gz.MD5SUM
===
--- packages/opencpn/tarballs/opencpn_2.5.0+dfsg.orig.tar.gz.MD5SUM 
(rev 0)
+++ packages/opencpn/tarballs/opencpn_2.5.0+dfsg.orig.tar.gz.MD5SUM 
2011-08-02 11:35:46 UTC (rev 3043)
@@ -0,0 +1,2 @@
+# http://pkg-grass.alioth.debian.org/tarballs/opencpn_2.5.0+dfsg.orig.tar.gz
+db6f0b02e49179397abc8ff7983a2389  opencpn_2.5.0+dfsg.orig.tar.gz


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3050 - packages/opencpn/trunk/debian

2011-12-10 Thread hamish-guest

Author: hamish-guest
Date: 2011-12-11 05:40:32 + (Sun, 11 Dec 2011)
New Revision: 3050

Added:
   packages/opencpn/trunk/debian/opencpn-plugins.dirs
   packages/opencpn/trunk/debian/opencpn-plugins.install
Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/control
   packages/opencpn/trunk/debian/rules
Log:
move plugins into their own binary package

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-11-28 11:19:27 UTC (rev 
3049)
+++ packages/opencpn/trunk/debian/changelog 2011-12-11 05:40:32 UTC (rev 
3050)
@@ -3,9 +3,10 @@
   * Packaged for upstream version 2.5.0
   * Drop most of TinyXML patch (superseded by upstream)
   * CSS and JavaScript cruft now dropped upstream
+  * Move plugins into new opencpn-plugins package
   * Closing ITP. (Closes: #538067)
 
- -- Hamish B hamis...@yahoo.com  Tue, 02 Aug 2011 22:36:56 +1200
+ -- Hamish Bowman hamis...@yahoo.com  Sun, 11 Dec 2011 18:35:49 +1300
 
 opencpn (2.4.708-0) unstable; urgency=low
 

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2011-11-28 11:19:27 UTC (rev 
3049)
+++ packages/opencpn/trunk/debian/control   2011-12-11 05:40:32 UTC (rev 
3050)
@@ -15,7 +15,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgps19
 Recommends: gpsd, opencpn-data, opencpn-doc, xtide-coastline
-Suggests: gpsd-clients, xcalib
+Suggests: opencpn-plugins, gpsd-clients, xcalib
 Description: GPS ChartPlotter/Navigator
  OpenCPN is a concise ship-borne GUI chart plotter
  application supporting:
@@ -44,3 +44,15 @@
  OpenCPN is a concise ship-borne GUI chart plotter application.
  .
  This package contains the tidal harmonics and audio files for OpenCPN.
+
+Package: opencpn-plugins
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: opencpn
+Description: Additional plugins for OpenCPN
+ OpenCPN is a concise ship-borne GUI chart plotter application.
+ .
+ This package contains additional plugins for OpenCPN:
+ .
+ * Heads-up dashboard 
+ * GRIB weather data overlay

Added: packages/opencpn/trunk/debian/opencpn-plugins.dirs
===
--- packages/opencpn/trunk/debian/opencpn-plugins.dirs  
(rev 0)
+++ packages/opencpn/trunk/debian/opencpn-plugins.dirs  2011-12-11 05:40:32 UTC 
(rev 3050)
@@ -0,0 +1 @@
+usr/lib/opencpn

Added: packages/opencpn/trunk/debian/opencpn-plugins.install
===
--- packages/opencpn/trunk/debian/opencpn-plugins.install   
(rev 0)
+++ packages/opencpn/trunk/debian/opencpn-plugins.install   2011-12-11 
05:40:32 UTC (rev 3050)
@@ -0,0 +1 @@
+usr/lib/opencpn

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2011-11-28 11:19:27 UTC (rev 3049)
+++ packages/opencpn/trunk/debian/rules 2011-12-11 05:40:32 UTC (rev 3050)
@@ -30,9 +30,11 @@
dh_install

rm $(CURDIR)/debian/opencpn/usr/share/opencpn/license.txt
+   #moved into subordinate packages:
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/doc
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/sounds
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/tcdata
+   rm -f $(CURDIR)/debian/opencpn/usr/lib/opencpn/*.so
 
#READMEs already installed to the opencpn-data/docs dir
rm $(CURDIR)/debian/opencpn-data/usr/share/opencpn/sounds/README.bells


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3051 - packages/opencpn/trunk/debian

2012-01-18 Thread hamish-guest

Author: hamish-guest
Date: 2012-01-18 09:30:30 + (Wed, 18 Jan 2012)
New Revision: 3051

Added:
   packages/opencpn/trunk/debian/opencpn-doc.doc-base
   packages/opencpn/trunk/debian/opencpn.lintian-overrides
Modified:
   packages/opencpn/trunk/debian/changelog
Log:
Register docs with doc-base; Lintian override for the sometimes-empty plugins 
dir

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2011-12-11 05:40:32 UTC (rev 
3050)
+++ packages/opencpn/trunk/debian/changelog 2012-01-18 09:30:30 UTC (rev 
3051)
@@ -4,9 +4,11 @@
   * Drop most of TinyXML patch (superseded by upstream)
   * CSS and JavaScript cruft now dropped upstream
   * Move plugins into new opencpn-plugins package
+  * Register docs with doc-base
+  * Lintian override for the sometimes-empty plugins dir
   * Closing ITP. (Closes: #538067)
 
- -- Hamish Bowman hamis...@yahoo.com  Sun, 11 Dec 2011 18:35:49 +1300
+ -- M. Hamish Bowman hamis...@yahoo.com  Wed, 18 Jan 2012 22:22:04 +1300
 
 opencpn (2.4.708-0) unstable; urgency=low
 

Added: packages/opencpn/trunk/debian/opencpn-doc.doc-base
===
--- packages/opencpn/trunk/debian/opencpn-doc.doc-base  
(rev 0)
+++ packages/opencpn/trunk/debian/opencpn-doc.doc-base  2012-01-18 09:30:30 UTC 
(rev 3051)
@@ -0,0 +1,10 @@
+Document: opencpn-manual
+Title: The OpenCPN User Manual
+Author: David S Register and the OpenCPN Development Team
+Abstract: This is everything you'll need to know to get
+ up and running with the OpenCPN GPS navigation software.
+Section: Science/Geoscience
+
+Format: HTML
+Index: /usr/share/doc/opencpn-doc/doc/help_en_US.html
+Files: /usr/share/doc/opencpn-doc/doc/*.html 
/usr/share/doc/opencpn-doc/doc/*/*.html

Added: packages/opencpn/trunk/debian/opencpn.lintian-overrides
===
--- packages/opencpn/trunk/debian/opencpn.lintian-overrides 
(rev 0)
+++ packages/opencpn/trunk/debian/opencpn.lintian-overrides 2012-01-18 
09:30:30 UTC (rev 3051)
@@ -0,0 +1,4 @@
+# We create the plugin(.so) dir in case the opencpn-plugins
+# package is not installed, so that users who wish to install
+# 3rd party plugins will still know where to put them.
+opencpn binary: package-contains-empty-directory usr/lib/opencpn/


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3052 - packages/opencpn/trunk/debian

2012-01-19 Thread hamish-guest

Author: hamish-guest
Date: 2012-01-19 09:02:38 + (Thu, 19 Jan 2012)
New Revision: 3052

Modified:
   packages/opencpn/trunk/debian/README.Debian
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/rules
Log:
avoid empty plugins dir, add note to README.Debian about it

Modified: packages/opencpn/trunk/debian/README.Debian
===
--- packages/opencpn/trunk/debian/README.Debian 2012-01-18 09:30:30 UTC (rev 
3051)
+++ packages/opencpn/trunk/debian/README.Debian 2012-01-19 09:02:38 UTC (rev 
3052)
@@ -1,7 +1,15 @@
+Third party plugins (.so) should go into /usr/lib/opencpn/. If you have
+not installed the opencpn-plugins package you will need to create this
+directory yourself.
+
+
+Free NOAA nautical charts can be downloaded here:
+  http://www.nauticalcharts.noaa.gov/mcd/Raster/
+
+
 User-visible differences from upstream:
-
  - Xtide's higher-resolution vector shoreline is used for the default backdrop.
 
 
 --
-HB 17 June 2011
+Hamish Bowman, January 2012

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2012-01-18 09:30:30 UTC (rev 
3051)
+++ packages/opencpn/trunk/debian/changelog 2012-01-19 09:02:38 UTC (rev 
3052)
@@ -5,7 +5,7 @@
   * CSS and JavaScript cruft now dropped upstream
   * Move plugins into new opencpn-plugins package
   * Register docs with doc-base
-  * Lintian override for the sometimes-empty plugins dir
+  * Note what plugins dir should be if -plugins pkg is not installed
   * Closing ITP. (Closes: #538067)
 
  -- M. Hamish Bowman hamis...@yahoo.com  Wed, 18 Jan 2012 22:22:04 +1300

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2012-01-18 09:30:30 UTC (rev 3051)
+++ packages/opencpn/trunk/debian/rules 2012-01-19 09:02:38 UTC (rev 3052)
@@ -34,7 +34,7 @@
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/doc
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/sounds
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/tcdata
-   rm -f $(CURDIR)/debian/opencpn/usr/lib/opencpn/*.so
+   rm -rf $(CURDIR)/debian/opencpn/usr/lib/opencpn
 
#READMEs already installed to the opencpn-data/docs dir
rm $(CURDIR)/debian/opencpn-data/usr/share/opencpn/sounds/README.bells


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3053 - packages/opencpn/trunk/debian

2012-01-19 Thread hamish-guest

Author: hamish-guest
Date: 2012-01-19 09:53:36 + (Thu, 19 Jan 2012)
New Revision: 3053

Removed:
   packages/opencpn/trunk/debian/opencpn.lintian-overrides
Modified:
   packages/opencpn/trunk/debian/rules
Log:
avoid empty plugins dir try 2

Deleted: packages/opencpn/trunk/debian/opencpn.lintian-overrides
===
--- packages/opencpn/trunk/debian/opencpn.lintian-overrides 2012-01-19 
09:02:38 UTC (rev 3052)
+++ packages/opencpn/trunk/debian/opencpn.lintian-overrides 2012-01-19 
09:53:36 UTC (rev 3053)
@@ -1,4 +0,0 @@
-# We create the plugin(.so) dir in case the opencpn-plugins
-# package is not installed, so that users who wish to install
-# 3rd party plugins will still know where to put them.
-opencpn binary: package-contains-empty-directory usr/lib/opencpn/

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2012-01-19 09:02:38 UTC (rev 3052)
+++ packages/opencpn/trunk/debian/rules 2012-01-19 09:53:36 UTC (rev 3053)
@@ -34,7 +34,7 @@
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/doc
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/sounds
rm -rf $(CURDIR)/debian/opencpn/usr/share/opencpn/tcdata
-   rm -rf $(CURDIR)/debian/opencpn/usr/lib/opencpn
+   rm -rf $(CURDIR)/debian/opencpn/usr/lib
 
#READMEs already installed to the opencpn-data/docs dir
rm $(CURDIR)/debian/opencpn-data/usr/share/opencpn/sounds/README.bells


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3054 - packages/opencpn/trunk/debian

2012-01-19 Thread hamish-guest

Author: hamish-guest
Date: 2012-01-19 19:12:09 + (Thu, 19 Jan 2012)
New Revision: 3054

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/control
Log:
Suggests zygrib

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2012-01-19 09:53:36 UTC (rev 
3053)
+++ packages/opencpn/trunk/debian/changelog 2012-01-19 19:12:09 UTC (rev 
3054)
@@ -6,6 +6,7 @@
   * Move plugins into new opencpn-plugins package
   * Register docs with doc-base
   * Note what plugins dir should be if -plugins pkg is not installed
+  * Suggests zygrib
   * Closing ITP. (Closes: #538067)
 
  -- M. Hamish Bowman hamis...@yahoo.com  Wed, 18 Jan 2012 22:22:04 +1300

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2012-01-19 09:53:36 UTC (rev 
3053)
+++ packages/opencpn/trunk/debian/control   2012-01-19 19:12:09 UTC (rev 
3054)
@@ -15,7 +15,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgps19
 Recommends: gpsd, opencpn-data, opencpn-doc, xtide-coastline
-Suggests: opencpn-plugins, gpsd-clients, xcalib
+Suggests: opencpn-plugins, gpsd-clients, xcalib, zygrib
 Description: GPS ChartPlotter/Navigator
  OpenCPN is a concise ship-borne GUI chart plotter
  application supporting:


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3055 - packages/opencpn/trunk/debian

2012-01-19 Thread hamish-guest

Author: hamish-guest
Date: 2012-01-19 19:13:36 + (Thu, 19 Jan 2012)
New Revision: 3055

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/control
Log:
Suggests xtide too

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2012-01-19 19:12:09 UTC (rev 
3054)
+++ packages/opencpn/trunk/debian/changelog 2012-01-19 19:13:36 UTC (rev 
3055)
@@ -6,7 +6,7 @@
   * Move plugins into new opencpn-plugins package
   * Register docs with doc-base
   * Note what plugins dir should be if -plugins pkg is not installed
-  * Suggests zygrib
+  * Suggests xtide and zygrib
   * Closing ITP. (Closes: #538067)
 
  -- M. Hamish Bowman hamis...@yahoo.com  Wed, 18 Jan 2012 22:22:04 +1300

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2012-01-19 19:12:09 UTC (rev 
3054)
+++ packages/opencpn/trunk/debian/control   2012-01-19 19:13:36 UTC (rev 
3055)
@@ -15,7 +15,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgps19
 Recommends: gpsd, opencpn-data, opencpn-doc, xtide-coastline
-Suggests: opencpn-plugins, gpsd-clients, xcalib, zygrib
+Suggests: opencpn-plugins, gpsd-clients, xcalib, xtide, zygrib
 Description: GPS ChartPlotter/Navigator
  OpenCPN is a concise ship-borne GUI chart plotter
  application supporting:


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3056 - packages/opencpn/trunk/debian

2012-01-30 Thread hamish-guest

Author: hamish-guest
Date: 2012-01-31 01:38:05 + (Tue, 31 Jan 2012)
New Revision: 3056

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/copyright
Log:
add DEP-5 comments about embedded files

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2012-01-19 19:13:36 UTC (rev 
3055)
+++ packages/opencpn/trunk/debian/changelog 2012-01-31 01:38:05 UTC (rev 
3056)
@@ -7,9 +7,10 @@
   * Register docs with doc-base
   * Note what plugins dir should be if -plugins pkg is not installed
   * Suggests xtide and zygrib
+  * Add DEP-5 comments to copyright file explaining embedded copies
   * Closing ITP. (Closes: #538067)
 
- -- M. Hamish Bowman hamis...@yahoo.com  Wed, 18 Jan 2012 22:22:04 +1300
+ -- M. Hamish Bowman hamis...@yahoo.com  Tue, 31 Jan 2012 14:36:54 +1300
 
 opencpn (2.4.708-0) unstable; urgency=low
 

Modified: packages/opencpn/trunk/debian/copyright
===
--- packages/opencpn/trunk/debian/copyright 2012-01-19 19:13:36 UTC (rev 
3055)
+++ packages/opencpn/trunk/debian/copyright 2012-01-31 01:38:05 UTC (rev 
3056)
@@ -9,7 +9,7 @@
 
 Files: debian/*
 Copyright: 2010-2011 Anton Martchukov an...@martchukov.com
-   2010-2011 DebianGIS Team http://wiki.debian.org/DebianGis
+   2010-2012 DebianGIS Team http://wiki.debian.org/DebianGis
 License: GPL-2.0+
 
 Files: debian/cmake_Modules/FindTinyXML.cmake
@@ -24,21 +24,51 @@
 License: GPL-2.0+
 
 Files: src/mygdal/*
-Copyright: 1998-2011 GDAL/OGR Project http://www.gdal.org/
+Copyright: 1998-2011 GDAL/OGR Project http://www.gdal.org
 License: Expat
+Comment: Dave Register (OpenCPN lead author) wrote:
+ We could use libgdal, with what I would call moderate
+ effort, with some loss of functionality.
+ .
+ There are good reasons not to.  libgdal is very capable, but
+ not optimum for dynamic GUI based systems like ours.  Its
+ great for generating static data from S57 cells.
+ .
+ I tweaked some of the code to compile on Windows, eliminate
+ redundancy, reduce memory footprint, fix some obvious bugs
+ present in the version I started with, and add call backs to
+ support Progress Dialogs on SENC creation. In theory, these
+ fixes should go upstream to GDAL.  In practice, though.
+ .
+ IMHO, this kind of improvement for a specific application
+ should not block debian repo inclusion.  Otherwise we wear a
+ ball and chain, and innovation is stifled.
+ .
+ Thanks Dave
 
 Files: src/myiso8211/*
-Copyright: 1999 Frank Warmerdam warme...@home.com
+Copyright: 1999 Frank Warmerdam warme...@pobox.com
 License: Expat
+Comment: Also from GDAL source tree, see above comments.
 
 Files: src/nmea0183/* plugins/*/src/nmea0183/*
 Copyright: 2010 Samuel R. Blackburn
2010-2011 David S Register bdb...@yahoo.com
 License: GPL-2.0+
+Comment: wrt code duplication,
+ plugins/demo_pi_sample's copy is just for illustrative purposes.
+ see http://opencpn.org/ocpn/flyspray/index.php?do=detailstask_id=725
+ .
+ wrt being an embedded library,
+ It does not exist in elsewhere in Debian; the code here has been
+ specifically tailored/reworked by the OpenCPN lead author and is
+ maintained within the OpenCPN source tree.
 
 Files: plugins/grib_pi/src/Grib* plugins/grib_pi/src/Iso* 
plugins/grib_pi/src/ZuFile
 Copyright: 2008 Jacques Zaninetti http://www.zygrib.org
 License: GPL-3.0+
+Comment: Built into a separate binary package which is only Suggested
+ by the main (GPL=2) package.
 
 Files: data/s57data/*
 Copyright: 2000-2001 Sylvain Duclos sylvain_duc...@yahoo.com


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3057 - packages/opencpn/trunk/debian

2012-01-30 Thread hamish-guest

Author: hamish-guest
Date: 2012-01-31 07:23:08 + (Tue, 31 Jan 2012)
New Revision: 3057

Modified:
   packages/opencpn/trunk/debian/control
Log:
longer pkg descriptions

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2012-01-31 01:38:05 UTC (rev 
3056)
+++ packages/opencpn/trunk/debian/control   2012-01-31 07:23:08 UTC (rev 
3057)
@@ -17,14 +17,18 @@
 Recommends: gpsd, opencpn-data, opencpn-doc, xtide-coastline
 Suggests: opencpn-plugins, gpsd-clients, xcalib, xtide, zygrib
 Description: GPS ChartPlotter/Navigator
- OpenCPN is a concise ship-borne GUI chart plotter
- application supporting:
+ OpenCPN is a concise ship-borne GUI chart plotter and navigation
+ application for use as a planning tool or while underway. OpenCPN is
+ developed by a team of active sailors using real world conditions
+ for program testing and refinement. It supports:
  .
- * GPS/GPDS Postition Input
- * BSB Raster Chart Display
- * S57 Vector ENChart Display
- * AIS Input Decoding
- * Waypoint Autopilot Navigation
+ * GPS/GPDS postition input
+ * BSB raster chart display
+ * S-57 and CM93 vector ENChart display
+ * AIS input decoding with tracking and alerts
+ * Route planning with tidal support
+ * Waypoint autopilot navigation
+ * GPX file input and output
 
 Package: opencpn-doc
 Architecture: all
@@ -32,7 +36,10 @@
 Section: doc
 Suggests: opencpn
 Description: Documentation for OpenCPN, a GPS ChartPlotter/Navigator
- OpenCPN is a concise ship-borne GUI chart plotter application.
+ OpenCPN is a concise ship-borne GUI chart plotter and navigation
+ application for use as a planning tool or while underway. OpenCPN is
+ developed by a team of active sailors using real world conditions
+ for program testing and refinement.
  .   
  This package contains the HTML documentation for OpenCPN.
 
@@ -41,7 +48,10 @@
 Depends: ${misc:Depends}
 Suggests: opencpn
 Description: Tidal harmonics and audio files for OpenCPN
- OpenCPN is a concise ship-borne GUI chart plotter application.
+ OpenCPN is a concise ship-borne GUI chart plotter and navigation
+ application for use as a planning tool or while underway. OpenCPN is
+ developed by a team of active sailors using real world conditions
+ for program testing and refinement.
  .
  This package contains the tidal harmonics and audio files for OpenCPN.
 
@@ -50,9 +60,12 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: opencpn
 Description: Additional plugins for OpenCPN
- OpenCPN is a concise ship-borne GUI chart plotter application.
+ OpenCPN is a concise ship-borne GUI chart plotter and navigation
+ application for use as a planning tool or while underway. OpenCPN is
+ developed by a team of active sailors using real world conditions
+ for program testing and refinement.
  .
  This package contains additional plugins for OpenCPN:
  .
- * Heads-up dashboard 
+ * Heads-up dashboard
  * GRIB weather data overlay


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3058 - packages/opencpn/trunk/debian

2012-01-30 Thread hamish-guest

Author: hamish-guest
Date: 2012-01-31 07:37:05 + (Tue, 31 Jan 2012)
New Revision: 3058

Modified:
   packages/opencpn/trunk/debian/changelog
Log:
+dfsg needed in version number to match cleansed tarball

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2012-01-31 07:23:08 UTC (rev 
3057)
+++ packages/opencpn/trunk/debian/changelog 2012-01-31 07:37:05 UTC (rev 
3058)
@@ -1,4 +1,4 @@
-opencpn (2.5.0-1) unstable; urgency=low
+opencpn (2.5.0+dfsg-1) unstable; urgency=low
 
   * Packaged for upstream version 2.5.0
   * Drop most of TinyXML patch (superseded by upstream)


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3059 - packages/opencpn/trunk/debian

2012-01-31 Thread hamish-guest

Author: hamish-guest
Date: 2012-01-31 09:04:13 + (Tue, 31 Jan 2012)
New Revision: 3059

Modified:
   packages/opencpn/trunk/debian/control
Log:
uploader name needs to match $DEBFULLNAME exactly

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2012-01-31 07:37:05 UTC (rev 
3058)
+++ packages/opencpn/trunk/debian/control   2012-01-31 09:04:13 UTC (rev 
3059)
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Debian GIS Project debian-...@lists.debian.org
-Uploaders: Anton Martchukov an...@martchukov.com, Hamish Bowman 
hamis...@yahoo.com
+Uploaders: Anton Martchukov an...@martchukov.com, M. Hamish Bowman 
hamis...@yahoo.com
 Build-Depends: debhelper (= 7.0.50~), cmake, libglu-dev, libwxbase2.8-dev,
libwxgtk2.8-dev, libgtk2.0-dev, zlib1g-dev, libbz2-dev, libgps-dev,
libtinyxml-dev


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3060 - packages/opencpn/trunk/debian

2012-02-17 Thread hamish-guest

Author: hamish-guest
Date: 2012-02-18 04:07:43 + (Sat, 18 Feb 2012)
New Revision: 3060

Modified:
   packages/opencpn/trunk/debian/control
Log:
fix GLU pkg dep

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2012-01-31 09:04:13 UTC (rev 
3059)
+++ packages/opencpn/trunk/debian/control   2012-02-18 04:07:43 UTC (rev 
3060)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GIS Project debian-...@lists.debian.org
 Uploaders: Anton Martchukov an...@martchukov.com, M. Hamish Bowman 
hamis...@yahoo.com
-Build-Depends: debhelper (= 7.0.50~), cmake, libglu-dev, libwxbase2.8-dev,
+Build-Depends: debhelper (= 7.0.50~), cmake, libglu1-mesa-dev, 
libwxbase2.8-dev,
libwxgtk2.8-dev, libgtk2.0-dev, zlib1g-dev, libbz2-dev, libgps-dev,
libtinyxml-dev
 Standards-Version: 3.9.2


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3064 - packages/opencpn/trunk/debian

2012-02-25 Thread hamish-guest

Author: hamish-guest
Date: 2012-02-25 10:01:48 + (Sat, 25 Feb 2012)
New Revision: 3064

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/control
Log:
Policy bumped to 3.9.3, without changes

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2012-02-19 10:23:37 UTC (rev 
3063)
+++ packages/opencpn/trunk/debian/changelog 2012-02-25 10:01:48 UTC (rev 
3064)
@@ -8,6 +8,7 @@
   * Note what plugins dir should be if -plugins pkg is not installed
   * Suggests xtide and zygrib
   * Add DEP-5 comments to copyright file explaining embedded copies
+  * Policy bumped to 3.9.3, without changes.
   * Closing ITP. (Closes: #538067)
 
  -- M. Hamish Bowman hamis...@yahoo.com  Tue, 31 Jan 2012 14:36:54 +1300

Modified: packages/opencpn/trunk/debian/control
===
--- packages/opencpn/trunk/debian/control   2012-02-19 10:23:37 UTC (rev 
3063)
+++ packages/opencpn/trunk/debian/control   2012-02-25 10:01:48 UTC (rev 
3064)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (= 7.0.50~), cmake, libglu1-mesa-dev, 
libwxbase2.8-dev,
libwxgtk2.8-dev, libgtk2.0-dev, zlib1g-dev, libbz2-dev, libgps-dev,
libtinyxml-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.opencpn.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/opencpn/trunk/
 Vcs-Browser: 
http://svn.debian.org/viewsvn/pkg-grass/packages/opencpn/trunk/debian/


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3065 - packages/opencpn/trunk/debian

2012-02-29 Thread hamish-guest

Author: hamish-guest
Date: 2012-02-29 23:54:54 + (Wed, 29 Feb 2012)
New Revision: 3065

Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/copyright
Log:
new address for the FSF

Modified: packages/opencpn/trunk/debian/changelog
===
--- packages/opencpn/trunk/debian/changelog 2012-02-25 10:01:48 UTC (rev 
3064)
+++ packages/opencpn/trunk/debian/changelog 2012-02-29 23:54:54 UTC (rev 
3065)
@@ -11,8 +11,11 @@
   * Policy bumped to 3.9.3, without changes.
   * Closing ITP. (Closes: #538067)
 
- -- M. Hamish Bowman hamis...@yahoo.com  Tue, 31 Jan 2012 14:36:54 +1300
+  [ Anton Martchukov ]
+  * Additional copyright file auditing
 
+ -- M. Hamish Bowman hamis...@yahoo.com  Thu, 01 Mar 2012 12:53:43 +1300
+
 opencpn (2.4.708-0) unstable; urgency=low
 
   [ Anton Martchukov ]

Modified: packages/opencpn/trunk/debian/copyright
===
--- packages/opencpn/trunk/debian/copyright 2012-02-25 10:01:48 UTC (rev 
3064)
+++ packages/opencpn/trunk/debian/copyright 2012-02-29 23:54:54 UTC (rev 
3065)
@@ -288,8 +288,8 @@
  .
  You should have received a copy of the GNU Library General Public Licence
  along with this software, usually in a file named COPYING.LIB.  If not,
- write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- Boston, MA 02111-1307 USA.
+ write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA.
  .
  EXCEPTION NOTICE
  .


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3069 - packages/gpsdrive/trunk/debian

2012-05-19 Thread hamish-guest

Author: hamish-guest
Date: 2012-05-19 08:06:34 + (Sat, 19 May 2012)
New Revision: 3069

Modified:
   packages/gpsdrive/trunk/debian/changelog
   packages/gpsdrive/trunk/debian/control
Log:
updated build dep to mapnik2, added myself to uploaders

Modified: packages/gpsdrive/trunk/debian/changelog
===
--- packages/gpsdrive/trunk/debian/changelog2012-05-15 13:24:12 UTC (rev 
3068)
+++ packages/gpsdrive/trunk/debian/changelog2012-05-19 08:06:34 UTC (rev 
3069)
@@ -1,12 +1,17 @@
 gpsdrive (2.10~pre4-6.dfsg-6) unstable; urgency=low
 
-  * Added libxcursor-dev build-dep. 
+  [ Francesco Paolo Lovergine ]
+  * Added libxcursor-dev build-dep.
 (closes: #615653, #628310)
   * Switch perl module is now deprecated, added a suitable build-dep.
 (closes: #629338)
 
- -- Francesco Paolo Lovergine fran...@debian.org  Mon, 06 Jun 2011 10:28:49 
+0200
+  [ Hamish Bowman ]
+  * Updated build dep to Mapnik2.
+  * Add myself to uploaders.
 
+ -- M. Hamish Bowman hamis...@yahoo.com  Sat, 19 May 2012 19:26:54 +1200
+
 gpsdrive (2.10~pre4-6.dfsg-5) unstable; urgency=low
 
   * Added 103-no-textquery patch to remove Text::Query use. Removed

Modified: packages/gpsdrive/trunk/debian/control
===
--- packages/gpsdrive/trunk/debian/control  2012-05-15 13:24:12 UTC (rev 
3068)
+++ packages/gpsdrive/trunk/debian/control  2012-05-19 08:06:34 UTC (rev 
3069)
@@ -2,10 +2,10 @@
 Section: utils
 Priority: optional
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: Andreas Putzo andr...@putzo.net, Francesco Paolo Lovergine 
fran...@debian.org
+Uploaders: Andreas Putzo andr...@putzo.net, Francesco Paolo Lovergine 
fran...@debian.org, M. Hamish Bowman hamis...@yahoo.com
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (= 7), automake1.9, libtool, pkg-config, 
libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient-dev, 
- autotools-dev, dpatch, libmapnik-dev (= 0.6), libboost-dev, 
libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev, 
+ autotools-dev, dpatch, libmapnik2-dev (= 0.6), libboost-dev, 
libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev, 
  libxcursor-dev, libswitch-perl | perl ( 5.10.1-13)
 Standards-Version: 3.8.4
 Homepage: http://gpsdrive.de
@@ -40,7 +40,7 @@
 
 Package: gpsdrive-scripts
 Architecture: all
-Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik, 
libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl, 
+Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik2, 
libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl, 
  libmime-base64-perl, libtime-local-perl, libwww-curl-perl, 
libwww-mechanize-perl, libxml-parser-perl, libxml-simple-perl, 
libxml-twig-perl, 
  libxml-writer-perl, perlmagick, perl-tk
 Description: Various scripts for gpsdrive


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3070 - packages/opencpn/trunk/debian

2012-06-09 Thread hamish-guest

Author: hamish-guest
Date: 2012-06-10 01:25:08 + (Sun, 10 Jun 2012)
New Revision: 3070

Modified:
   packages/opencpn/trunk/debian/copyright
Log:
document remaining copyrights noticed missing by Mike O'Connor 
ftpmas...@debian.org

Modified: packages/opencpn/trunk/debian/copyright
===
--- packages/opencpn/trunk/debian/copyright 2012-05-19 08:06:34 UTC (rev 
3069)
+++ packages/opencpn/trunk/debian/copyright 2012-06-10 01:25:08 UTC (rev 
3070)
@@ -16,6 +16,17 @@
 Copyright: 2006-2008 The EVEmu Team http://trac.evemu.org
 License: GPL-2.0+
 
+Files: Findgps.cmake
+Copyright: 2000-2009 Kitware, Inc., Insight Software Consortium
+   2006-2009 Kitware, Inc.
+   2006 Alexander Neundorf neund...@kde.org
+   2010 David Register bdb...@yahoo.com
+License: BSD-3-clause
+
+Files: CMakeLists.txt plugins/CMakeLists.txt plugins/grib_pi/CMakeLists.txt 
plugins/demo_pi_sample/src/CMakeLists.txt plugins/demo_pi_sample/CMakeLists.txt 
plugins/dashboard_pi/CMakeLists.txt
+Copyright: 2010-2011 David S Register bdb...@yahoo.com
+License: WXwindows
+
 Files: src/garmin/jeeps/*
 Copyright: 2004-2006 Robert Lipe robertl...@usa.net
   2010 David S Register bdb...@yahoo.com
@@ -336,6 +347,33 @@
  .
  3. This notice may not be removed or altered from any source distribution.
 
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+  1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+  3. Neither the name of Kitware, Inc., the Insight Software Consortium,
+ nor the names of its contributors may be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS
+ IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: BSD-4-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3071 - packages/opencpn/trunk/debian

2012-06-09 Thread hamish-guest

Author: hamish-guest
Date: 2012-06-10 02:09:21 + (Sun, 10 Jun 2012)
New Revision: 3071

Modified:
   packages/opencpn/trunk/debian/copyright
Log:
add'l copyright file refinement

Modified: packages/opencpn/trunk/debian/copyright
===
--- packages/opencpn/trunk/debian/copyright 2012-06-10 01:25:08 UTC (rev 
3070)
+++ packages/opencpn/trunk/debian/copyright 2012-06-10 02:09:21 UTC (rev 
3071)
@@ -27,11 +27,19 @@
 Copyright: 2010-2011 David S Register bdb...@yahoo.com
 License: WXwindows
 
-Files: src/garmin/jeeps/*
+Files: src/garmin/jeeps/garmin* src/garmin/jeeps/gpsdevice.* 
src/garmin/jeeps/gpsusb*
 Copyright: 2004-2006 Robert Lipe robertl...@usa.net
   2010 David S Register bdb...@yahoo.com
 License: GPL-2.0+
 
+Files: src/garmin/jeeps/gps[acf-s]* src/garmin/jeeps/gpsdatum.h 
src/garmin/jeeps/gpsutil.*
+Copyright: 1999-2000 Alan Bleasby
+   2004-2006 Robert Lipe robertl...@usa.net
+   2007 Achim Schumacher
+   2010 Martin Buck
+   2010 David S Register bdb...@yahoo.com
+License: LGPL-2.0+
+
 Files: src/garmin/jeeps/gpsprot.c src/garmin/jeeps/gpscom.c 
src/garmin/jeeps/gpsapp.c src/garmin/jeeps/gpsmath.c src/garmin/jeeps/gpsrqst.c 
src/garmin/jeeps/gpsutil.c src/garmin/jeeps/gpsread.c 
src/garmin/jeeps/gpssend.c src/garmin/jeeps/gpsserial.c 
src/garmin/jeeps/gpsmem.c
 Copyright: 1999-2000 Alan Bleasby
2004-2006 Robert Lipe robertl...@usa.net
@@ -86,6 +94,10 @@
 Comment: Built into a separate binary package which is only Suggested
  by the main (GPL=2) package.
 
+Files: plugins/grib_pi/src/icons.sh plugins/dashboard_pi/src/icons.sh 
src/bitmaps/*.sh src/bitmaps/*/*.sh src/bitmaps/*/*/*.sh
+Copyright: 2010 David S Register bdb...@yahoo.com
+License: GPL-2.0+
+
 Files: src/scrollingdialog.* src/bbox.cpp
 Copyright: 2000 Klaas Holwerda
2007 Julian Smart


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3072 - packages/opencpn/trunk/debian

2012-06-10 Thread hamish-guest

Author: hamish-guest
Date: 2012-06-10 21:44:17 + (Sun, 10 Jun 2012)
New Revision: 3072

Modified:
   packages/opencpn/trunk/debian/copyright
Log:
a few more stragglers

Modified: packages/opencpn/trunk/debian/copyright
===
--- packages/opencpn/trunk/debian/copyright 2012-06-10 02:09:21 UTC (rev 
3071)
+++ packages/opencpn/trunk/debian/copyright 2012-06-10 21:44:17 UTC (rev 
3072)
@@ -87,6 +87,12 @@
  It does not exist in elsewhere in Debian; the code here has been
  specifically tailored/reworked by the OpenCPN lead author and is
  maintained within the OpenCPN source tree.
+ .
+ Samuel Blackburn's original source license:
+ You can use it any way you like.
+ More recent (2010) license statement from Samuel:
+ It is BSD license, do with it what you will
+ (and what Dave's decided to do with it is make our copy of it GPLv2+)
 
 Files: plugins/grib_pi/src/Grib* plugins/grib_pi/src/Iso* 
plugins/grib_pi/src/ZuFile*
 Copyright: 2008 Jacques Zaninetti http://www.zygrib.org
@@ -98,7 +104,7 @@
 Copyright: 2010 David S Register bdb...@yahoo.com
 License: GPL-2.0+
 
-Files: src/scrollingdialog.* src/bbox.cpp
+Files: src/scrollingdialog.* include/scrollingdialog.h src/bbox.cpp 
include/bbox.h
 Copyright: 2000 Klaas Holwerda
2007 Julian Smart
 License: WXwindows
@@ -125,7 +131,7 @@
  This code is in the public domain. Specifically, we give to the public
  domain all rights for future licensing of the source code, all resale
  rights, and all publishing rights.
-
+ .
  UNC-CH GIVES NO WARRANTY, EXPRESSED OR IMPLIED, FOR THE SOFTWARE
  AND/OR DOCUMENTATION PROVIDED, INCLUDING, WITHOUT LIMITATION, WARRANTY
  OF MERCHANTABILITY AND WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE.


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3073 - packages/opencpn/trunk/debian

2012-06-10 Thread hamish-guest

Author: hamish-guest
Date: 2012-06-11 04:28:13 + (Mon, 11 Jun 2012)
New Revision: 3073

Modified:
   packages/opencpn/trunk/debian/copyright
Log:
Dave confirms that icons.cpp/.h (generated) are covered by the project's GPLv2 
copyright

Modified: packages/opencpn/trunk/debian/copyright
===
--- packages/opencpn/trunk/debian/copyright 2012-06-10 21:44:17 UTC (rev 
3072)
+++ packages/opencpn/trunk/debian/copyright 2012-06-11 04:28:13 UTC (rev 
3073)
@@ -100,7 +100,7 @@
 Comment: Built into a separate binary package which is only Suggested
  by the main (GPL=2) package.
 
-Files: plugins/grib_pi/src/icons.sh plugins/dashboard_pi/src/icons.sh 
src/bitmaps/*.sh src/bitmaps/*/*.sh src/bitmaps/*/*/*.sh
+Files: src/bitmaps/icons.* plugins/grib_pi/src/icons.* 
plugins/dashboard_pi/src/icons.* src/bitmaps/*.sh src/bitmaps/*/*.sh 
src/bitmaps/*/*/*.sh
 Copyright: 2010 David S Register bdb...@yahoo.com
 License: GPL-2.0+
 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3076 - packages/opencpn/trunk/debian

2012-06-28 Thread hamish-guest

Author: hamish-guest
Date: 2012-06-28 07:55:50 + (Thu, 28 Jun 2012)
New Revision: 3076

Modified:
   packages/opencpn/trunk/debian/rules
Log:
put hardening flags in place, ready for activation upon demand

Modified: packages/opencpn/trunk/debian/rules
===
--- packages/opencpn/trunk/debian/rules 2012-06-16 05:06:02 UTC (rev 3075)
+++ packages/opencpn/trunk/debian/rules 2012-06-28 07:55:50 UTC (rev 3076)
@@ -10,6 +10,20 @@
 CFLAGS=-Wall
 CXXFLAGS=-Wall -O3
 
+# comment out the above and uncomment the following to enable hardening
+#include /usr/share/hardening-includes/hardening.make
+#DEB_CFLAGS_MAINT_APPEND=-O3
+#CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+#CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+#CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
+#LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+#CFLAGS+=$(HARDENING_CFLAGS)
+#CXXFLAGS+=$(HARDENING_CXXFLAGS)
+#LDFLAGS+=$(HARDENING_LDFLAGS)
+#CXXFLAGS+=-fPIC
+#export DEB_CFLAGS_MAINT_APPEND CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+
+
 %:
dh $@ --parallel
 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3077 - packages/gpsdrive/branches

2012-06-29 Thread hamish-guest

Author: hamish-guest
Date: 2012-06-29 08:29:04 + (Fri, 29 Jun 2012)
New Revision: 3077

Added:
   packages/gpsdrive/branches/squeeze/
Log:
copy over old build files


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3079 - packages/gpsdrive/trunk/debian

2012-07-02 Thread hamish-guest

Author: hamish-guest
Date: 2012-07-02 08:37:17 + (Mon, 02 Jul 2012)
New Revision: 3079

Modified:
   packages/gpsdrive/trunk/debian/TODO
   packages/gpsdrive/trunk/debian/examples
   packages/gpsdrive/trunk/debian/gpsdrive-scripts.install
   packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages
   packages/gpsdrive/trunk/debian/gpsdrive.install
Log:
rm refs to old files no longer relevant for gpsdrive 2.12

Modified: packages/gpsdrive/trunk/debian/TODO
===
--- packages/gpsdrive/trunk/debian/TODO 2012-07-02 08:23:29 UTC (rev 3078)
+++ packages/gpsdrive/trunk/debian/TODO 2012-07-02 08:37:17 UTC (rev 3079)
@@ -1,18 +1,10 @@
 Debian maintainers TODO list
 
 
+* Package modern version (2.12svn)
 * Help upstream to get the perl module namespace organized.
 * Remove the following patches on next release as they are fixed upstream
-- 01-make (upstream switched to cmake)
 - 03-manpage
 - 20-homedir (~/.gpsdrive/osm.xml no longer overwritten)
-- 40-backported (bugfixes backported from upstream vcs)
-- 60-sql (uses sqlite now)
-- 90-usage (fixed upstream)
-- 95-newapi (should be fixed)
-- 96-mapnik-plugins-dir (should be fixed)
-- 98-mapnik-exception (fixed upstream)
-- 99-autobestmap (fixed upstream)
-* Create a bpo package for 2.4.10pre5
+* Create a bpo package for 2.12
 
--- Andreas Putzo andr...@putzo.net at Tue Jul 15 20:56:13 UTC 2008

Modified: packages/gpsdrive/trunk/debian/examples
===
--- packages/gpsdrive/trunk/debian/examples 2012-07-02 08:23:29 UTC (rev 
3078)
+++ packages/gpsdrive/trunk/debian/examples 2012-07-02 08:37:17 UTC (rev 
3079)
@@ -1,6 +1 @@
-scripts/gpssql_backup.sh
-scripts/gpssql_restore.sh
 scripts/nasaconv.sh
-scripts/wp2sql
-scripts/wpcvt
-scripts/wpget

Modified: packages/gpsdrive/trunk/debian/gpsdrive-scripts.install
===
--- packages/gpsdrive/trunk/debian/gpsdrive-scripts.install 2012-07-02 
08:23:29 UTC (rev 3078)
+++ packages/gpsdrive/trunk/debian/gpsdrive-scripts.install 2012-07-02 
08:37:17 UTC (rev 3079)
@@ -1,10 +1,7 @@
 usr/bin/convert-waypoints.pl
-usr/bin/geo-code
 usr/bin/geocache2way
-usr/bin/geoinfo.pl
 usr/bin/gpspoint2gpsdrive.pl
 usr/bin/gpsreplay
-usr/bin/poi-manager.pl
 usr/bin/gpsdrive_mapnik_gentiles.py
 usr/share/perl5/Geo/Filter/*usr/share/perl5/Geo/Gpsdrive/Filter
 usr/share/perl5/Geo/GPX/*   usr/share/perl5/Geo/Gpsdrive/GPX

Modified: packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages
===
--- packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages2012-07-02 
08:23:29 UTC (rev 3078)
+++ packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages2012-07-02 
08:37:17 UTC (rev 3079)
@@ -1,6 +1,3 @@
 man/convert-waypoints.pl.1
-man/geo-code.1
-man/geoinfo.pl.1
 debian/man/gpsfetchmap.1
 man/gpspoint2gpsdrive.pl.1
-man/poi-manager.pl.1

Modified: packages/gpsdrive/trunk/debian/gpsdrive.install
===
--- packages/gpsdrive/trunk/debian/gpsdrive.install 2012-07-02 08:23:29 UTC 
(rev 3078)
+++ packages/gpsdrive/trunk/debian/gpsdrive.install 2012-07-02 08:37:17 UTC 
(rev 3079)
@@ -3,4 +3,3 @@
 usr/share/applications/gpsdrive.desktop
 usr/share/gpsdrive/map_koord.txt
 usr/share/gpsdrive/mapnik/osm.xml
-usr/share/map-icons/icons.xml usr/share/gpsdrive/map-icons/


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3080 - packages/gpsdrive/trunk/debian

2012-07-02 Thread hamish-guest

Author: hamish-guest
Date: 2012-07-02 08:40:07 + (Mon, 02 Jul 2012)
New Revision: 3080

Added:
   packages/gpsdrive/trunk/debian/gpsdrive-utils.install
   packages/gpsdrive/trunk/debian/gpsdrive-utils.manpages
Removed:
   packages/gpsdrive/trunk/debian/gpsdrive-scripts.install
   packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages
Modified:
   packages/gpsdrive/trunk/debian/control
   packages/gpsdrive/trunk/debian/rules
Log:
gpsdrive-scripts is renamed to gpsdrive-utils

Modified: packages/gpsdrive/trunk/debian/control
===
--- packages/gpsdrive/trunk/debian/control  2012-07-02 08:37:17 UTC (rev 
3079)
+++ packages/gpsdrive/trunk/debian/control  2012-07-02 08:40:07 UTC (rev 
3080)
@@ -15,7 +15,7 @@
 Package: gpsdrive
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gpsdrive-data, 
openstreetmap-map-icons-square, openstreetmap-map-icons-classic
-Recommends: gpsd, gpsdrive-scripts
+Recommends: gpsd, gpsdrive-utils
 Suggests: flite | festival, osm2pgsql, mysql-server, postgresql-8.4-postgis
 Description: Car navigation system
  Map-based navigation system that displays the current
@@ -38,7 +38,7 @@
  .
  This package contains the data files.
 
-Package: gpsdrive-scripts
+Package: gpsdrive-utils
 Architecture: all
 Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik2, 
libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl, 
  libmime-base64-perl, libtime-local-perl, libwww-curl-perl, 
libwww-mechanize-perl, libxml-parser-perl, libxml-simple-perl, 
libxml-twig-perl, 

Deleted: packages/gpsdrive/trunk/debian/gpsdrive-scripts.install
===
--- packages/gpsdrive/trunk/debian/gpsdrive-scripts.install 2012-07-02 
08:37:17 UTC (rev 3079)
+++ packages/gpsdrive/trunk/debian/gpsdrive-scripts.install 2012-07-02 
08:40:07 UTC (rev 3080)
@@ -1,11 +0,0 @@
-usr/bin/convert-waypoints.pl
-usr/bin/geocache2way
-usr/bin/gpspoint2gpsdrive.pl
-usr/bin/gpsreplay
-usr/bin/gpsdrive_mapnik_gentiles.py
-usr/share/perl5/Geo/Filter/*usr/share/perl5/Geo/Gpsdrive/Filter
-usr/share/perl5/Geo/GPX/*   usr/share/perl5/Geo/Gpsdrive/GPX
-usr/share/perl5/Geo/Geometry.pm usr/share/perl5/Geo/Gpsdrive
-usr/share/perl5/Geo/Gpsdrive/*
-usr/share/perl5/Geo/OSM/Planet.pm   usr/share/perl5/Geo/Gpsdrive/OSM
-usr/share/perl5/Utils/* usr/share/perl5/Geo/Gpsdrive/Utils

Deleted: packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages
===
--- packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages2012-07-02 
08:37:17 UTC (rev 3079)
+++ packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages2012-07-02 
08:40:07 UTC (rev 3080)
@@ -1,3 +0,0 @@
-man/convert-waypoints.pl.1
-debian/man/gpsfetchmap.1
-man/gpspoint2gpsdrive.pl.1

Copied: packages/gpsdrive/trunk/debian/gpsdrive-utils.install (from rev 3079, 
packages/gpsdrive/trunk/debian/gpsdrive-scripts.install)
===
--- packages/gpsdrive/trunk/debian/gpsdrive-utils.install   
(rev 0)
+++ packages/gpsdrive/trunk/debian/gpsdrive-utils.install   2012-07-02 
08:40:07 UTC (rev 3080)
@@ -0,0 +1,11 @@
+usr/bin/convert-waypoints.pl
+usr/bin/geocache2way
+usr/bin/gpspoint2gpsdrive.pl
+usr/bin/gpsreplay
+usr/bin/gpsdrive_mapnik_gentiles.py
+usr/share/perl5/Geo/Filter/*usr/share/perl5/Geo/Gpsdrive/Filter
+usr/share/perl5/Geo/GPX/*   usr/share/perl5/Geo/Gpsdrive/GPX
+usr/share/perl5/Geo/Geometry.pm usr/share/perl5/Geo/Gpsdrive
+usr/share/perl5/Geo/Gpsdrive/*
+usr/share/perl5/Geo/OSM/Planet.pm   usr/share/perl5/Geo/Gpsdrive/OSM
+usr/share/perl5/Utils/* usr/share/perl5/Geo/Gpsdrive/Utils

Copied: packages/gpsdrive/trunk/debian/gpsdrive-utils.manpages (from rev 3079, 
packages/gpsdrive/trunk/debian/gpsdrive-scripts.manpages)
===
--- packages/gpsdrive/trunk/debian/gpsdrive-utils.manpages  
(rev 0)
+++ packages/gpsdrive/trunk/debian/gpsdrive-utils.manpages  2012-07-02 
08:40:07 UTC (rev 3080)
@@ -0,0 +1,3 @@
+man/convert-waypoints.pl.1
+debian/man/gpsfetchmap.1
+man/gpspoint2gpsdrive.pl.1

Modified: packages/gpsdrive/trunk/debian/rules
===
--- packages/gpsdrive/trunk/debian/rules2012-07-02 08:37:17 UTC (rev 
3079)
+++ packages/gpsdrive/trunk/debian/rules2012-07-02 08:40:07 UTC (rev 
3080)
@@ -115,21 +115,21 @@
dh_fixperms -i
dh_installdeb -i
# strip language extensions
-   mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/convert-waypoints.pl 
$(CURDIR)/debian/gpsdrive-scripts/usr/bin/convert-waypoints
-   mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/geoinfo.pl 
$(CURDIR)/debian/gpsdrive

r3081 - packages/gpsdrive/trunk/debian

2012-07-02 Thread hamish-guest

Author: hamish-guest
Date: 2012-07-02 08:42:46 + (Mon, 02 Jul 2012)
New Revision: 3081

Added:
   packages/gpsdrive/trunk/debian/menu
Log:
+menu file

Added: packages/gpsdrive/trunk/debian/menu
===
--- packages/gpsdrive/trunk/debian/menu (rev 0)
+++ packages/gpsdrive/trunk/debian/menu 2012-07-02 08:42:46 UTC (rev 3081)
@@ -0,0 +1,5 @@
+?package(gpsdrive):needs=x11\
+  section=Applications/Science/Geoscience\
+  longtitle=GpsDrive: A car (bike, ship, plane, foot) navigation system\
+  title=GpsDrive command=gpsdrive\
+  icon=/usr/share/icons/hicolor/32x32/apps/gpsdrive.xpm


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3082 - packages/gpsdrive/trunk/debian

2012-07-05 Thread hamish-guest

Author: hamish-guest
Date: 2012-07-05 07:40:44 + (Thu, 05 Jul 2012)
New Revision: 3082

Modified:
   packages/gpsdrive/trunk/debian/changelog
   packages/gpsdrive/trunk/debian/control
Log:
whitespace reorg of control file for easier to read diffs; notes about upcoming 
version into the changelog file

Modified: packages/gpsdrive/trunk/debian/changelog
===
--- packages/gpsdrive/trunk/debian/changelog2012-07-02 08:42:46 UTC (rev 
3081)
+++ packages/gpsdrive/trunk/debian/changelog2012-07-05 07:40:44 UTC (rev 
3082)
@@ -1,3 +1,16 @@
+gpsdrive (2.12+svn2702-1) unstable; urgency=low
+
+   * Modernize Debian package with many changes
+ (closes: #287845, #456149, #498428, #508595, #585866, #589718, #591260, 
#672229, #674213)
+   * Sync'd to modern location of packaged OSM icons
+   * TMS and tiled WMS server support upgrade
+   * Include osm2poidb utility in utils package
+   * Move gpsdrive-data (maps) into main build system
+   * Update debian/copyright file
+   * Bundle simplified Natural Earth world coastline and cities
+
+ -- M. Hamish Bowman hamis...@yahoo.com  Thu, 05 Jul 2012 16:56:49 +1200
+
 gpsdrive (2.10~pre4-6.dfsg-6) unstable; urgency=low
 
   [ Francesco Paolo Lovergine ]

Modified: packages/gpsdrive/trunk/debian/control
===
--- packages/gpsdrive/trunk/debian/control  2012-07-02 08:42:46 UTC (rev 
3081)
+++ packages/gpsdrive/trunk/debian/control  2012-07-05 07:40:44 UTC (rev 
3082)
@@ -4,9 +4,24 @@
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Andreas Putzo andr...@putzo.net, Francesco Paolo Lovergine 
fran...@debian.org, M. Hamish Bowman hamis...@yahoo.com
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (= 7), automake1.9, libtool, pkg-config, 
libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient-dev, 
- autotools-dev, dpatch, libmapnik2-dev (= 0.6), libboost-dev, 
libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev, 
- libxcursor-dev, libswitch-perl | perl ( 5.10.1-13)
+Build-Depends: debhelper (= 7),
+   automake1.9,
+   autotools-dev,
+   dpatch,
+   libart-2.0-dev,
+   libboost-dev,
+   libboost-filesystem-dev,
+   libboost-serialization-dev,
+   libdbus-glib-1-dev,
+   libgtk2.0-dev,
+   libmapnik2-dev (= 0.6),
+   libmysqlclient-dev,
+   libpcre3-dev,
+   libswitch-perl | perl ( 5.10.1-13),
+   libtool,
+   libxcursor-dev,
+   libxml2-dev,
+   pkg-config
 Standards-Version: 3.8.4
 Homepage: http://gpsdrive.de
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gpsdrive/trunk
@@ -14,9 +29,17 @@
 
 Package: gpsdrive
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gpsdrive-data, 
openstreetmap-map-icons-square, openstreetmap-map-icons-classic
-Recommends: gpsd, gpsdrive-utils
-Suggests: flite | festival, osm2pgsql, mysql-server, postgresql-8.4-postgis
+Depends: ${shlibs:Depends},
+${misc:Depends},
+gpsdrive-data,
+openstreetmap-map-icons-classic,
+openstreetmap-map-icons-square
+Recommends: gpsd,
+gpsdrive-utils
+Suggests: flite | festival,
+osm2pgsql,
+mysql-server,
+postgresql-8.4-postgis
 Description: Car navigation system
  Map-based navigation system that displays the current
  position provided by a GPS receiver on a zoomable map.
@@ -40,9 +63,25 @@
 
 Package: gpsdrive-utils
 Architecture: all
-Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik2, 
libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl, 
- libmime-base64-perl, libtime-local-perl, libwww-curl-perl, 
libwww-mechanize-perl, libxml-parser-perl, libxml-simple-perl, 
libxml-twig-perl, 
- libxml-writer-perl, perlmagick, perl-tk
+Depends: gpsdrive,
+${perl:Depends},
+libdate-manip-perl,
+libdbd-mysql-perl,
+libdbi-perl,
+libfile-slurp-perl, 
+libmime-base64-perl,
+libtime-local-perl,
+libwww-curl-perl,
+libwww-mechanize-perl,
+libxml-parser-perl,
+libxml-simple-perl,
+libxml-twig-perl, 
+libxml-writer-perl,
+perl-tk,
+perlmagick,
+python,
+python-imaging,
+python-mapnik2
 Description: Various scripts for gpsdrive
  Gpsdrive is a car (bike, ship, plane) navigation system.
  .


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3086 - packages/mbsystem/trunk/debian/patches

2013-06-02 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-02 05:25:03 + (Sun, 02 Jun 2013)
New Revision: 3086

Modified:
   packages/mbsystem/trunk/debian/patches/older_autoconf.patch
Log:
patch to fix missing library spec

Modified: packages/mbsystem/trunk/debian/patches/older_autoconf.patch
===
--- packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-02 
05:08:51 UTC (rev 3085)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-02 
05:25:03 UTC (rev 3086)
@@ -16,3 +16,12 @@
  
  dnl Disable configure caching
  define([AC_CACHE_LOAD], )
+@@ -191,7 +191,7 @@
+ dnl Package check failed so check manually
+ if test $GOT_GMT = no ; then
+ 
+-libgmt_LIBS=-lgmt
++libgmt_LIBS=-lgmt -lgmtps -lpsl
+ dnl arg for command line
+ AC_ARG_WITH(gmt-lib, [  --with-gmt-lib=DIRLocation of GMT library],
+   [libgmt_CFLAGS=-L${withval}] [GOT_GMT=yes], [GOT_GMT=no])


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3088 - packages/mbsystem/trunk/debian

2013-06-02 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-02 07:42:08 + (Sun, 02 Jun 2013)
New Revision: 3088

Modified:
   packages/mbsystem/trunk/debian/mbsystem-doc.dirs
   packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
   packages/mbsystem/trunk/debian/mbsystem-doc.install
   packages/mbsystem/trunk/debian/mbsystem-doc.links
Log:
further doc install fixes

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 07:05:12 UTC 
(rev 3087)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 07:42:08 UTC 
(rev 3088)
@@ -1,2 +1 @@
-usr/share/doc/mbsystem/docs
 usr/share/doc/mbsystem-doc/docs

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-02 
07:05:12 UTC (rev 3087)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-02 
07:42:08 UTC (rev 3088)
@@ -10,4 +10,4 @@
 Files: /usr/share/doc/mbsystem-doc/docs/*.html 
/usr/share/doc/mbsystem-doc/docs/*.gif
 
 Format: PostScript
-Files: /usr/share/doc/mbsystem-doc/docs/*.ps
+Files: /usr/share/doc/mbsystem-doc/docs/*.ps.gz

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.install
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-02 07:05:12 UTC 
(rev 3087)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-02 07:42:08 UTC 
(rev 3088)
@@ -1 +1 @@
-usr/share/doc/mbsystem/docs
+usr/share/doc/mbsystem/docs /usr/share/doc/mbsystem-doc

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.links
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.links   2013-06-02 07:05:12 UTC 
(rev 3087)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.links   2013-06-02 07:42:08 UTC 
(rev 3088)
@@ -1 +1 @@
-usr/share/doc/mbsystem/docs/usr/share/doc/mbsystem/docs
+usr/share/doc/mbsystem-doc/docsusr/share/doc/mbsystem/docs


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3092 - packages/mbsystem/trunk/debian

2013-06-02 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-02 08:59:33 + (Sun, 02 Jun 2013)
New Revision: 3092

Modified:
   packages/mbsystem/trunk/debian/mbsystem.docs
Log:
omit placeholder file

Modified: packages/mbsystem/trunk/debian/mbsystem.docs
===
--- packages/mbsystem/trunk/debian/mbsystem.docs2013-06-02 08:48:07 UTC 
(rev 3091)
+++ packages/mbsystem/trunk/debian/mbsystem.docs2013-06-02 08:59:33 UTC 
(rev 3092)
@@ -1,6 +1,5 @@
 AUTHORS
 COPYING
 ChangeLog
-NEWS
 NOTES
 README


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3091 - packages/mbsystem/trunk/debian

2013-06-02 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-02 08:48:07 + (Sun, 02 Jun 2013)
New Revision: 3091

Added:
   packages/mbsystem/trunk/debian/mbsystem.docs
Log:
include tarball readmes

Added: packages/mbsystem/trunk/debian/mbsystem.docs
===
--- packages/mbsystem/trunk/debian/mbsystem.docs
(rev 0)
+++ packages/mbsystem/trunk/debian/mbsystem.docs2013-06-02 08:48:07 UTC 
(rev 3091)
@@ -0,0 +1,6 @@
+AUTHORS
+COPYING
+ChangeLog
+NEWS
+NOTES
+README


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3087 - in packages/mbsystem/trunk/debian: . patches

2013-06-02 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-02 07:05:12 + (Sun, 02 Jun 2013)
New Revision: 3087

Added:
   packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
   packages/mbsystem/trunk/debian/mbsystem-doc.links
   packages/mbsystem/trunk/debian/patches/system_proj4.patch
Modified:
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/mbsystem-doc.dirs
   packages/mbsystem/trunk/debian/patches/series
Log:
further proj4 and doc install fixes

Modified: packages/mbsystem/trunk/debian/changelog
===
--- packages/mbsystem/trunk/debian/changelog2013-06-02 05:25:03 UTC (rev 
3086)
+++ packages/mbsystem/trunk/debian/changelog2013-06-02 07:05:12 UTC (rev 
3087)
@@ -1,7 +1,8 @@
-mbsystem (5.4.2081-0) UNRELEASED; urgency=low
+mbsystem (5.4.2083-0) UNRELEASED; urgency=low
 
   * Initial packaging incorporating upstream support for shared libs
   * Split off -dev, -doc, -data packages
+  * Added doc-base registration
 
  -- Hamish Bowman hamish_b yahoo.com  Sun, 02 Jun 2013 13:09:24 +1200
 

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 05:25:03 UTC 
(rev 3086)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 07:05:12 UTC 
(rev 3087)
@@ -1 +1,2 @@
 usr/share/doc/mbsystem/docs
+usr/share/doc/mbsystem-doc/docs

Added: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
(rev 0)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-02 
07:05:12 UTC (rev 3087)
@@ -0,0 +1,13 @@
+Document: mbsystem-manual
+Title: The MB-System User Manual
+Author: David Caress, Dale Chayes, Val Schmidt
+Abstract: This is everything you'll need to know to get
+ up and running with the MB-System software.
+Section: Science/Geoscience
+
+Format: HTML
+Index: /usr/share/doc/mbsystem-doc/docs/index.html
+Files: /usr/share/doc/mbsystem-doc/docs/*.html 
/usr/share/doc/mbsystem-doc/docs/*.gif
+
+Format: PostScript
+Files: /usr/share/doc/mbsystem-doc/docs/*.ps

Added: packages/mbsystem/trunk/debian/mbsystem-doc.links
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.links   
(rev 0)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.links   2013-06-02 07:05:12 UTC 
(rev 3087)
@@ -0,0 +1 @@
+usr/share/doc/mbsystem/docs/usr/share/doc/mbsystem/docs

Modified: packages/mbsystem/trunk/debian/patches/series
===
--- packages/mbsystem/trunk/debian/patches/series   2013-06-02 05:25:03 UTC 
(rev 3086)
+++ packages/mbsystem/trunk/debian/patches/series   2013-06-02 07:05:12 UTC 
(rev 3087)
@@ -1,3 +1,4 @@
 # patches to apply
 #older_autoconf.patch
 mbview_makefile.patch
+system_proj4.patch

Added: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch   
(rev 0)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch   2013-06-02 
07:05:12 UTC (rev 3087)
@@ -0,0 +1,55 @@
+Last-Update: 2013-06-02
+Author: Hamish Bowman hamish_b yahoo.com
+Applied-Upstream: no
+Forwarded: no
+Bug-MC:
+Description: Use Debian's PROJ.4 programs instead of bundled ones
+
+
+--- a/src/proj/Makefile.am (revision 2083)
 b/src/proj/Makefile.am (working copy)
+@@ -1,14 +1,14 @@
+-bin_PROGRAMS = proj geod
++#bin_PROGRAMS = proj geod
+ 
+ AM_CPPFLAGS = -I..
+ 
+ include_HEADERS = proj_api.h 
+ 
+-proj_SOURCES = proj.c gen_cheb.c p_series.c
+-geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h
++#proj_SOURCES = proj.c gen_cheb.c p_series.c
++#geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h
+ 
+-proj_LDADD = libmbproj.la
+-geod_LDADD = libmbproj.la
++#proj_LDADD = libmbproj.la
++#geod_LDADD = libmbproj.la
+ 
+ lib_LTLIBRARIES = libmbproj.la
+ 
+--- a/src/man/man1/Makefile.am (revision 2083)
 b/src/man/man1/Makefile.am (working copy)
+@@ -1,4 +1,4 @@
+-man_MANS = geod.1 \
++man_MANS = \
+ hsdump.1 \
+ mb7k2jstar.1 \
+ mb7k2ss.1 \
+@@ -76,7 +76,6 @@
+ mbswath.1 \
+ mbsystem.1 \
+ mbtime.1 \
+-mbvelocitytool.1 \
+-proj.1 
++mbvelocitytool.1
+ 
+ EXTRA_DIST = $(man_MANS)
+--- a/src/man/man3/Makefile.am (revision 2083)
 b/src/man/man3/Makefile.am (working copy)
+@@ -1,4 +1,4 @@
+-man_MANS = mbio.3  pj_init.3
++man_MANS = mbio.3
+ 
+ EXTRA_DIST = $(man_MANS)
+ 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3090 - packages/mbsystem/trunk/debian

2013-06-02 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-02 08:34:27 + (Sun, 02 Jun 2013)
New Revision: 3090

Modified:
   packages/mbsystem/trunk/debian/copyright
Log:
update copyright statement

Modified: packages/mbsystem/trunk/debian/copyright
===
--- packages/mbsystem/trunk/debian/copyright2013-06-02 08:11:25 UTC (rev 
3089)
+++ packages/mbsystem/trunk/debian/copyright2013-06-02 08:34:27 UTC (rev 
3090)
@@ -1,4 +1,98 @@
-GPL 3
+MB-System Copyright
+===
 
-http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html
+MB-System Copyright (C) 1993-2013 by
 
+David W. Caress (car...@mbari.org)
+  Monterey Bay Aquarium Research Institute
+  Moss Landing, CA 95039
+Dale N. Chayes (d...@ldeo.columbia.edu)
+  Lamont-Doherty Earth Observatory
+  Palisades, NY 10964mbbackangle.manl
+
+All Rights Reserved.
+All Wrongs Remembered.
+
+  http://www.ldeo.columbia.edu/res/pi/MB-System/html/mbsystem_copyright.html
+  http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html
+
+For the full text of the GPLv3 see /usr/share/common-licenses/GPL-3
+
+
+MB-System Licensing
+---
+
+The MB-System source code is distributed under the GNU General Public
+License (version 3) as formulated by the Free Software Foundation. Early
+MB-System distributions were described as public domain, which meant
+there was no restriction whatsoever on the use of the code. For over a
+decade we have adopted the more restrictive GNU GPL license in order to
+insure that anyone who distributes software based in whole or in part on
+MB-System also distributes the modified MB-System source code and any
+additional source code.
+
+The GNU GPL also prohibits the distribution of proprietary executables
+linked with MB-System libraries unless the source code is also distributed.
+We waive this restriction on distributing proprietary compiled programs for
+specific software products if and only if those software products meet the
+following two conditions:
+
+ 1) The software product was created, sold, and delivered to customers
+using source code derived from MB-System release 4.6 distributions.
+
+ 2) The software product was sold and delivered to customers prior to
+January 1, 2001.
+
+
+Acknowledgment of Source Code Derived From Other Sources
+
+
+The MB-System distribution includes some source code derived from packages
+that are distributed separately and have been authored by programmers other
+than the MB-System team. This includes:
+
+ - The Generic Sensor Format (GSF) library source located in
+mbsystem/src/gsf. The GSF package is distributed by the Science
+Applications International Corporation under contract to the Naval
+Oceanographic Office.
+
+ - The SURF API (SAPI) library source located in mbsystem/src/surf. The
+SAPI package has been released under the GNU General Public License by
+Atlas Hydrographic.
+
+ - The MR1PR library source located in mbsystem/src/mr1pr. This package has
+been openly released by the Hawaii Mapping Research Group.
+
+ - The PROJ.4 library source located in mbsystem/src/proj. This package was
+originally developed by Gerald Evenden of the United States Geological
+Survey, and is now maintained and distributed under an MIT license (that is
+very close to public domain) by Frank Warmerdam in association with the
+Open Source Geospational Foundation
+
+ - The mb_mergesort() function found in mbsystem/src/mbio/mb_esf.c derives
+from the GNU-Darwin Distribution. This code is released under both the
+Apple Public Source License Version 1.1 and the BSD license, with original
+copyright by the Regents of the University of California.
+
+
+MB-System Caveat
+
+
+The MB-System software package does not come with any warranties, nor is it
+guarenteed to work on your computer or to do anything useful. The user
+assumes full responsibility for the use of this software. In particular,
+David W. Caress, Dale N. Chayes, the Lamont-Doherty Earth Observatory of
+Columbia University, the Monterey Bay Aquarium Research Institute, or any
+other individuals or organizations involved in the design and maintenance
+of the MB-System software package are NOT responsible for any damage that
+may follow from correct or incorrect use of these programs.
+
+
+Debian packaging
+
+
+This package was debianized by M. Hamish Bowman, Depts. of Geology and
+Marine Science, University of Otago, Dunedin, New Zealand.
+Debian packaging (c) 2010-2013 the MB-System Development Team and the
+DebianGIS project under the same terms as the MB-System source package.
+


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3089 - packages/mbsystem/trunk/debian

2013-06-02 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-02 08:11:25 + (Sun, 02 Jun 2013)
New Revision: 3089

Modified:
   packages/mbsystem/trunk/debian/rules
Log:
clear out some comment cruft

Modified: packages/mbsystem/trunk/debian/rules
===
--- packages/mbsystem/trunk/debian/rules2013-06-02 07:42:08 UTC (rev 
3088)
+++ packages/mbsystem/trunk/debian/rules2013-06-02 08:11:25 UTC (rev 
3089)
@@ -3,13 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# 
-# # These are used for cross-compiling and for saving the configure script
-# # from having to guess our platform (since we know it already)
-# DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-# DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
@@ -31,26 +25,9 @@
 #  uscan --noconf --destdir=. --download-current-version --rename --verbose
 
 
+# cleaner doc install
+# install --mode=644 html /usr/share/doc/mbsystem-doc/html
+# install --mode=644 ps /usr/share/doc/mbsystem-doc/ps
+# ps2pdf + pdftk cat all .ps man pages into a single PDF document.
+#   see the osgeolive mb-system build script for the code.
 
-# # apply patches
-# include /usr/share/dpatch/dpatch.make
-# 
-# 
-# # install
-# ## sort of modeled after GMT packaging:
-# install bin/* /usr/lib/mbsystem/bin
-# install --mode=644 lib/* /usr/lib/mbsystem
-# install --mode=644 man/manl/* /usr/share/man/man1
-# install --mode=644 html /usr/share/doc/mbsystem/html
-# install --mode=644 ps /usr/share/doc/mbsystem/ps
-# install --mode=644 share /usr/share/mbsystem
-# install --mode=644 include /usr/lib/mbsystem/include
-# 
-#now integrated:
-# # get Levitus annual water temperature profile database (binary blob)
-# # needed for mblevitus program, uncompressed it is 16mb.
-# #
-# wget -nv ftp://ftp.ldeo.columbia.edu/pub/MB-System/annual.gz
-# gzip -d annual.gz
-# \mv annual LevitusAnnual82.dat
-# install --mode=644 LevitusAnnual82.data /usr/share/mbsystem/


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3083 - in packages/mbsystem/trunk/debian: . patches

2013-06-02 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-02 01:48:43 + (Sun, 02 Jun 2013)
New Revision: 3083

Added:
   packages/mbsystem/trunk/debian/patches/mbview_makefile
   packages/mbsystem/trunk/debian/patches/older_autoconf
   packages/mbsystem/trunk/debian/patches/series
Removed:
   packages/mbsystem/trunk/debian/patches/00list
   packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch
Modified:
   packages/mbsystem/trunk/debian/TODO
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/control
   packages/mbsystem/trunk/debian/rules
   packages/mbsystem/trunk/debian/watch
Log:
Initial packaging with upstream support for shared libs


Modified: packages/mbsystem/trunk/debian/TODO
===
--- packages/mbsystem/trunk/debian/TODO 2012-07-05 07:40:44 UTC (rev 3082)
+++ packages/mbsystem/trunk/debian/TODO 2013-06-02 01:48:43 UTC (rev 3083)
@@ -1,6 +1,10 @@
-TODO: adapt these beginnings of a Debian build script into full packaging 
rules:
+TODO:
 
-https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
+* GMT binaries - $PATH ?
+* Integrate GMT coastline(s)
+* adapt these beginnings of a Debian build script into full packaging rules:
+* 
https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
+* Audit for bundled libraries (libproj)
+* document Copyright for LevitusAnnual82.dat global water properties database
 
 
-


Property changes on: packages/mbsystem/trunk/debian/TODO
___
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id
Added: svn:eol-style
   + native

Modified: packages/mbsystem/trunk/debian/changelog
===
--- packages/mbsystem/trunk/debian/changelog2012-07-05 07:40:44 UTC (rev 
3082)
+++ packages/mbsystem/trunk/debian/changelog2013-06-02 01:48:43 UTC (rev 
3083)
@@ -1,3 +1,9 @@
+mbsystem (5.4.2081-0) UNRELEASED; urgency=low
+
+  * Initial packaging with upstream support for shared libs
+
+ -- Hamish Bowman hamish_b yahoo.com  Sun, 02 Jun 2013 13:09:24 +1200
+
 mbsystem (5.1.2-0) UNRELEASED; urgency=low
 
   * Initial packaging

Modified: packages/mbsystem/trunk/debian/control
===
--- packages/mbsystem/trunk/debian/control  2012-07-05 07:40:44 UTC (rev 
3082)
+++ packages/mbsystem/trunk/debian/control  2013-06-02 01:48:43 UTC (rev 
3083)
@@ -2,19 +2,21 @@
 Section: science
 Priority: optional
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: 
-Build-depends: libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev,
+Uploaders: M. Hamish Bowman hamis...@yahoo.com
+Build-depends: debhelper (= 8), dh-autoreconf,
+  libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev,
   libgl1-mesa-dev, libfftw3-dev, libproj-dev
-Standards-Version: 
+Standards-Version: 3.9.4
 Homepage: http://www.ldeo.columbia.edu/res/pi/MB-System/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/mbsystem/trunk/
+Vcs-Browser: 
http://svn.debian.org/viewsvn/pkg-grass/packages/mbsystem/trunk/debian/
 
 Package: mbsystem
 Section: science
 Architecture: any
-Depends: ${shlibs:Depends}, gmt, lesstif2, libnetcdf4, libgl1-mesa-glx,
-  libglu1-mesa, libfftw3-3, libproj0
-Suggests: ghostscript, proj-bin, xv
-Recommends: 
+Depends: ${shlibs:Depends}, ${misc:Depends}, csh, gmt
+Recommends: gv, libparallel-forkmanager-perl
+Suggests: ghostscript, proj-bin
 Description: Processing tools for multibeam and sidescan sonar data
  MB-System is an open source software package for the processing and
  display of bathymetry and backscatter imagery data derived from

Deleted: packages/mbsystem/trunk/debian/patches/00list
===
--- packages/mbsystem/trunk/debian/patches/00list   2012-07-05 07:40:44 UTC 
(rev 3082)
+++ packages/mbsystem/trunk/debian/patches/00list   2013-06-02 01:48:43 UTC 
(rev 3083)
@@ -1 +0,0 @@
-install_makefiles

Deleted: packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch
===
--- packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch 
2012-07-05 07:40:44 UTC (rev 3082)
+++ packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch 
2013-06-02 01:48:43 UTC (rev 3083)
@@ -1,68 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## install_makefiles.dpatch by Hamish Bowman hamish_b yahoo com
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makefile adjustments suitable for Debian
-
-@DPATCH@
 install_makefiles.ORIG 2010-01-01 20:16:22.0 +1300
-+++ install_makefiles  2010-01-01 21:33:37.0 +1300
-@@ -102,27 +102,26 @@
- #
- #
- # Required parameters

r3084 - in packages/mbsystem/trunk/debian: . patches source

2013-06-02 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-02 02:20:44 + (Sun, 02 Jun 2013)
New Revision: 3084

Added:
   packages/mbsystem/trunk/debian/compat
   packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
   packages/mbsystem/trunk/debian/patches/older_autoconf.patch
   packages/mbsystem/trunk/debian/source/
   packages/mbsystem/trunk/debian/source/format
Removed:
   packages/mbsystem/trunk/debian/patches/mbview_makefile
   packages/mbsystem/trunk/debian/patches/older_autoconf
Modified:
   packages/mbsystem/trunk/debian/patches/series
Log:
fixes to patching

Added: packages/mbsystem/trunk/debian/compat
===
--- packages/mbsystem/trunk/debian/compat   (rev 0)
+++ packages/mbsystem/trunk/debian/compat   2013-06-02 02:20:44 UTC (rev 
3084)
@@ -0,0 +1 @@
+8

Deleted: packages/mbsystem/trunk/debian/patches/mbview_makefile
===
--- packages/mbsystem/trunk/debian/patches/mbview_makefile  2013-06-02 
01:48:43 UTC (rev 3083)
+++ packages/mbsystem/trunk/debian/patches/mbview_makefile  2013-06-02 
02:20:44 UTC (rev 3084)
@@ -1,12 +0,0 @@
-Index: src/mbview/Makefile.am
-===
 src/mbview/Makefile.am (revision 2083)
-+++ src/mbview/Makefile.am (working copy)
-@@ -1,6 +1,6 @@
- bin_PROGRAMS = mbgrdviz mbeditviz
- 
--AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@
-+AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@ 
@GMT_INC_DIR@
- LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@
- 
- include_HEADERS = mbview.h

Copied: packages/mbsystem/trunk/debian/patches/mbview_makefile.patch (from rev 
3083, packages/mbsystem/trunk/debian/patches/mbview_makefile)
===
--- packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
(rev 0)
+++ packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
2013-06-02 02:20:44 UTC (rev 3084)
@@ -0,0 +1,18 @@
+Last-Update: 2013-06-02
+Author: Hamish Bowman hamish_b yahoo.com
+Applied-Upstream: no
+Forwarded: yes
+Bug-MC:
+Description: Add missing GMT includes dir
+
+
+--- a/src/mbview/Makefile.am   (revision 2083)
 b/src/mbview/Makefile.am   (working copy)
+@@ -1,6 +1,6 @@
+ bin_PROGRAMS = mbgrdviz mbeditviz
+ 
+-AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@
++AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@ 
@GMT_INC_DIR@
+ LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@
+ 
+ include_HEADERS = mbview.h

Deleted: packages/mbsystem/trunk/debian/patches/older_autoconf
===
--- packages/mbsystem/trunk/debian/patches/older_autoconf   2013-06-02 
01:48:43 UTC (rev 3083)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf   2013-06-02 
02:20:44 UTC (rev 3084)
@@ -1,12 +0,0 @@
-Index: configure.in
-===
 configure.in   (revision 2083)
-+++ configure.in   (working copy)
-@@ -1,6 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
- dnl configure.in for mbsystem
--AC_PREREQ([2.69])
-+AC_PREREQ([2.67])
- 
- dnl Disable configure caching
- define([AC_CACHE_LOAD], )

Copied: packages/mbsystem/trunk/debian/patches/older_autoconf.patch (from rev 
3083, packages/mbsystem/trunk/debian/patches/older_autoconf)
===
--- packages/mbsystem/trunk/debian/patches/older_autoconf.patch 
(rev 0)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-02 
02:20:44 UTC (rev 3084)
@@ -0,0 +1,18 @@
+Last-Update: 2013-06-02
+Author: Hamish Bowman hamish_b yahoo.com
+Applied-Upstream: no
+Forwarded: yes
+Bug-MC: 
+Description: Allow build to continue on Squeeze
+
+
+--- a/configure.in (revision 2083)
 b/configure.in (working copy)
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ dnl configure.in for mbsystem
+-AC_PREREQ([2.69])
++AC_PREREQ([2.67])
+ 
+ dnl Disable configure caching
+ define([AC_CACHE_LOAD], )

Modified: packages/mbsystem/trunk/debian/patches/series
===
--- packages/mbsystem/trunk/debian/patches/series   2013-06-02 01:48:43 UTC 
(rev 3083)
+++ packages/mbsystem/trunk/debian/patches/series   2013-06-02 02:20:44 UTC 
(rev 3084)
@@ -1,3 +1,3 @@
 # patches to apply
-older_autoconf
-mbview_makefile
+older_autoconf.patch
+mbview_makefile.patch

Added: packages/mbsystem/trunk/debian/source/format
===
--- packages/mbsystem/trunk/debian/source/format
(rev 0)
+++ packages/mbsystem/trunk/debian/source/format2013-06-02 02

r3093 - in packages/mbsystem/trunk/debian: . patches

2013-06-04 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-05 01:15:15 + (Wed, 05 Jun 2013)
New Revision: 3093

Removed:
   packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
Modified:
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/patches/older_autoconf.patch
   packages/mbsystem/trunk/debian/patches/series
   packages/mbsystem/trunk/debian/patches/system_proj4.patch
Log:
drop patches merged upstream

Modified: packages/mbsystem/trunk/debian/changelog
===
--- packages/mbsystem/trunk/debian/changelog2013-06-02 08:59:33 UTC (rev 
3092)
+++ packages/mbsystem/trunk/debian/changelog2013-06-05 01:15:15 UTC (rev 
3093)
@@ -1,4 +1,4 @@
-mbsystem (5.4.2083-0) UNRELEASED; urgency=low
+mbsystem (5.4.2097-0) UNRELEASED; urgency=low
 
   * Initial packaging incorporating upstream support for shared libs
   * Split off -dev, -doc, -data packages

Deleted: packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
===
--- packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
2013-06-02 08:59:33 UTC (rev 3092)
+++ packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
2013-06-05 01:15:15 UTC (rev 3093)
@@ -1,20 +0,0 @@
-Last-Update: 2013-06-02
-Author: Hamish Bowman hamish_b yahoo.com
-Applied-Upstream: no
-Forwarded: yes
-Bug-MC:
-Description: Add missing GMT includes dir
-
-
 a/src/mbview/Makefile.am   (revision 2083)
-+++ b/src/mbview/Makefile.am   (working copy)
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = mbgrdviz mbeditviz
- 
--AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@
--LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@
-+AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@ 
@GMT_INC_DIR@
-+LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@ ${libgmt_LIBS}
- 
- include_HEADERS = mbview.h
- 

Modified: packages/mbsystem/trunk/debian/patches/older_autoconf.patch
===
--- packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-02 
08:59:33 UTC (rev 3092)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-05 
01:15:15 UTC (rev 3093)
@@ -16,12 +16,3 @@
  
  dnl Disable configure caching
  define([AC_CACHE_LOAD], )
-@@ -191,7 +191,7 @@
- dnl Package check failed so check manually
- if test $GOT_GMT = no ; then
- 
--libgmt_LIBS=-lgmt
-+libgmt_LIBS=-lgmt -lgmtps -lpsl
- dnl arg for command line
- AC_ARG_WITH(gmt-lib, [  --with-gmt-lib=DIRLocation of GMT library],
-   [libgmt_CFLAGS=-L${withval}] [GOT_GMT=yes], [GOT_GMT=no])

Modified: packages/mbsystem/trunk/debian/patches/series
===
--- packages/mbsystem/trunk/debian/patches/series   2013-06-02 08:59:33 UTC 
(rev 3092)
+++ packages/mbsystem/trunk/debian/patches/series   2013-06-05 01:15:15 UTC 
(rev 3093)
@@ -1,4 +1,3 @@
 # patches to apply
 #older_autoconf.patch
-mbview_makefile.patch
 system_proj4.patch

Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch   2013-06-02 
08:59:33 UTC (rev 3092)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch   2013-06-05 
01:15:15 UTC (rev 3093)
@@ -6,13 +6,13 @@
 Description: Use Debian's PROJ.4 programs instead of bundled ones
 
 
 a/src/proj/Makefile.am (revision 2083)
+--- a/src/proj/Makefile.am (revision 2097)
 +++ b/src/proj/Makefile.am (working copy)
 @@ -1,14 +1,14 @@
 -bin_PROGRAMS = proj geod
 +#bin_PROGRAMS = proj geod
  
- AM_CPPFLAGS = -I..
+ AM_CPPFLAGS = -I@top_srcdir@/src
  
  include_HEADERS = proj_api.h 
  


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3094 - packages/mbsystem/trunk/debian/patches

2013-06-04 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-05 01:32:55 + (Wed, 05 Jun 2013)
New Revision: 3094

Modified:
   packages/mbsystem/trunk/debian/patches/system_proj4.patch
Log:
fix patch

Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch   2013-06-05 
01:15:15 UTC (rev 3093)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch   2013-06-05 
01:32:55 UTC (rev 3094)
@@ -14,7 +14,7 @@
  
  AM_CPPFLAGS = -I@top_srcdir@/src
  
- include_HEADERS = proj_api.h 
+ include_HEADERS = proj_api.h
  
 -proj_SOURCES = proj.c gen_cheb.c p_series.c
 -geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3095 - packages/mbsystem/trunk/debian/patches

2013-06-04 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-05 03:28:35 + (Wed, 05 Jun 2013)
New Revision: 3095

Modified:
   packages/mbsystem/trunk/debian/patches/series
Log:
rm comment, enable squeeze patch

Modified: packages/mbsystem/trunk/debian/patches/series
===
--- packages/mbsystem/trunk/debian/patches/series   2013-06-05 01:32:55 UTC 
(rev 3094)
+++ packages/mbsystem/trunk/debian/patches/series   2013-06-05 03:28:35 UTC 
(rev 3095)
@@ -1,3 +1,2 @@
-# patches to apply
-#older_autoconf.patch
+older_autoconf.patch
 system_proj4.patch


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3101 - in packages/mbsystem/trunk/debian: . patches

2013-06-05 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-06 03:45:50 + (Thu, 06 Jun 2013)
New Revision: 3101

Removed:
   packages/mbsystem/trunk/debian/patches/older_autoconf.patch
Modified:
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/patches/series
   packages/mbsystem/trunk/debian/patches/system_proj4.patch
Log:
sync to latest upstream (patch applied)

Modified: packages/mbsystem/trunk/debian/changelog
===
--- packages/mbsystem/trunk/debian/changelog2013-06-05 14:52:26 UTC (rev 
3100)
+++ packages/mbsystem/trunk/debian/changelog2013-06-06 03:45:50 UTC (rev 
3101)
@@ -1,4 +1,4 @@
-mbsystem (5.4.2097-0) UNRELEASED; urgency=low
+mbsystem (5.4.2098-0) UNRELEASED; urgency=low
 
   * Initial packaging incorporating upstream support for shared libs
   * Split off -dev, -doc, -data packages

Deleted: packages/mbsystem/trunk/debian/patches/older_autoconf.patch
===
--- packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-05 
14:52:26 UTC (rev 3100)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-06 
03:45:50 UTC (rev 3101)
@@ -1,18 +0,0 @@
-Last-Update: 2013-06-02
-Author: Hamish Bowman hamish_b yahoo.com
-Applied-Upstream: no
-Forwarded: yes
-Bug-MC: 
-Description: Allow build to continue on Squeeze
-
-
 a/configure.in (revision 2083)
-+++ b/configure.in (working copy)
-@@ -1,6 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
- dnl configure.in for mbsystem
--AC_PREREQ([2.69])
-+AC_PREREQ([2.67])
- 
- dnl Disable configure caching
- define([AC_CACHE_LOAD], )

Modified: packages/mbsystem/trunk/debian/patches/series
===
--- packages/mbsystem/trunk/debian/patches/series   2013-06-05 14:52:26 UTC 
(rev 3100)
+++ packages/mbsystem/trunk/debian/patches/series   2013-06-06 03:45:50 UTC 
(rev 3101)
@@ -1,2 +1 @@
-older_autoconf.patch
 system_proj4.patch

Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch   2013-06-05 
14:52:26 UTC (rev 3100)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch   2013-06-06 
03:45:50 UTC (rev 3101)
@@ -6,13 +6,13 @@
 Description: Use Debian's PROJ.4 programs instead of bundled ones
 
 
 a/src/proj/Makefile.am (revision 2097)
+--- a/src/proj/Makefile.am (revision 2098)
 +++ b/src/proj/Makefile.am (working copy)
 @@ -1,14 +1,14 @@
 -bin_PROGRAMS = proj geod
 +#bin_PROGRAMS = proj geod
  
- AM_CPPFLAGS = -I@top_srcdir@/src
+ AM_CPPFLAGS = -I@top_srcdir@/src/mbio
  
  include_HEADERS = proj_api.h
  
@@ -28,7 +28,7 @@
  
  lib_LTLIBRARIES = libmbproj.la
  
 a/src/man/man1/Makefile.am (revision 2083)
+--- a/src/man/man1/Makefile.am (revision 2098)
 +++ b/src/man/man1/Makefile.am (working copy)
 @@ -1,4 +1,4 @@
 -man_MANS = geod.1 \
@@ -45,7 +45,7 @@
 +mbvelocitytool.1
  
  EXTRA_DIST = $(man_MANS)
 a/src/man/man3/Makefile.am (revision 2083)
+--- a/src/man/man3/Makefile.am (revision 2098)
 +++ b/src/man/man3/Makefile.am (working copy)
 @@ -1,4 +1,4 @@
 -man_MANS = mbio.3  pj_init.3


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3102 - packages/mbsystem/trunk/debian

2013-06-06 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-07 03:05:25 + (Fri, 07 Jun 2013)
New Revision: 3102

Modified:
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/mbsystem-doc.dirs
   packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
   packages/mbsystem/trunk/debian/mbsystem-doc.install
   packages/mbsystem/trunk/debian/mbsystem.docs
   packages/mbsystem/trunk/debian/rules
Log:
cleanup doc install, better handling of upstream changelog

Modified: packages/mbsystem/trunk/debian/changelog
===
--- packages/mbsystem/trunk/debian/changelog2013-06-06 03:45:50 UTC (rev 
3101)
+++ packages/mbsystem/trunk/debian/changelog2013-06-07 03:05:25 UTC (rev 
3102)
@@ -1,4 +1,4 @@
-mbsystem (5.4.2098-0) UNRELEASED; urgency=low
+mbsystem (5.4.2111-0) UNRELEASED; urgency=low
 
   * Initial packaging incorporating upstream support for shared libs
   * Split off -dev, -doc, -data packages

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-06 03:45:50 UTC 
(rev 3101)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-07 03:05:25 UTC 
(rev 3102)
@@ -1 +1,2 @@
-usr/share/doc/mbsystem-doc/docs
+usr/share/doc/mbsystem-doc/docs/html
+usr/share/doc/mbsystem-doc/docs/ps

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-06 
03:45:50 UTC (rev 3101)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-07 
03:05:25 UTC (rev 3102)
@@ -6,8 +6,8 @@
 Section: Science/Geoscience
 
 Format: HTML
-Index: /usr/share/doc/mbsystem-doc/docs/index.html
-Files: /usr/share/doc/mbsystem-doc/docs/*.html 
/usr/share/doc/mbsystem-doc/docs/*.gif
+Index: /usr/share/doc/mbsystem-doc/docs/html/index.html
+Files: /usr/share/doc/mbsystem-doc/docs/html/*.html 
/usr/share/doc/mbsystem-doc/docs/html/*.gif
 
 Format: PostScript
-Files: /usr/share/doc/mbsystem-doc/docs/*.ps.gz
+Files: /usr/share/doc/mbsystem-doc/docs/ps/*.ps.gz

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.install
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-06 03:45:50 UTC 
(rev 3101)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-07 03:05:25 UTC 
(rev 3102)
@@ -1 +1,3 @@
-usr/share/doc/mbsystem/docs /usr/share/doc/mbsystem-doc
+usr/share/doc/mbsystem/docs/*.html /usr/share/doc/mbsystem-doc/docs/html/
+usr/share/doc/mbsystem/docs/*.gif /usr/share/doc/mbsystem-doc/docs/html/
+usr/share/doc/mbsystem/docs/*.ps /usr/share/doc/mbsystem-doc/docs/ps/

Modified: packages/mbsystem/trunk/debian/mbsystem.docs
===
--- packages/mbsystem/trunk/debian/mbsystem.docs2013-06-06 03:45:50 UTC 
(rev 3101)
+++ packages/mbsystem/trunk/debian/mbsystem.docs2013-06-07 03:05:25 UTC 
(rev 3102)
@@ -1,5 +1,4 @@
 AUTHORS
 COPYING
-ChangeLog
 NOTES
 README

Modified: packages/mbsystem/trunk/debian/rules
===
--- packages/mbsystem/trunk/debian/rules2013-06-06 03:45:50 UTC (rev 
3101)
+++ packages/mbsystem/trunk/debian/rules2013-06-07 03:05:25 UTC (rev 
3102)
@@ -20,14 +20,18 @@
--docdir=/usr/share/doc/mbsystem/docs \
--with-gmt-include=/usr/include/gmt
 
-#todo:
+override_dh_installchangelogs:
+   dh_installchangelogs ChangeLog
+
+
+# problematic: the upstream tarball is officially pkg-latest.tar.gz,
+#  which is then symlinked to an exact pkg-x.y.svn_rev.tar.gz filename.
+#  but sometimes there are newer x.y.svn_rev versions there for testing,
+#  so we can't rely on the biggest number there being a real release.
 #get-orig-source:
 #  uscan --noconf --destdir=. --download-current-version --rename --verbose
 
 
 # cleaner doc install
-# install --mode=644 html /usr/share/doc/mbsystem-doc/html
-# install --mode=644 ps /usr/share/doc/mbsystem-doc/ps
 # ps2pdf + pdftk cat all .ps man pages into a single PDF document.
-#   see the osgeolive mb-system build script for the code.
-
+#  use ReStructured text to PDF or TeX to make the cover page.


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3103 - in packages/mbsystem/trunk/debian: . patches

2013-06-07 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-08 00:46:15 + (Sat, 08 Jun 2013)
New Revision: 3103

Modified:
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/mbsystem-doc.dirs
   packages/mbsystem/trunk/debian/mbsystem-doc.install
   packages/mbsystem/trunk/debian/patches/system_proj4.patch
   packages/mbsystem/trunk/debian/rules
Log:
sync patches and doc install to upstream changes

Modified: packages/mbsystem/trunk/debian/changelog
===
--- packages/mbsystem/trunk/debian/changelog2013-06-07 03:05:25 UTC (rev 
3102)
+++ packages/mbsystem/trunk/debian/changelog2013-06-08 00:46:15 UTC (rev 
3103)
@@ -1,4 +1,4 @@
-mbsystem (5.4.2111-0) UNRELEASED; urgency=low
+mbsystem (5.4.2120-0) UNRELEASED; urgency=low
 
   * Initial packaging incorporating upstream support for shared libs
   * Split off -dev, -doc, -data packages

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-07 03:05:25 UTC 
(rev 3102)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-08 00:46:15 UTC 
(rev 3103)
@@ -1,2 +1 @@
-usr/share/doc/mbsystem-doc/docs/html
-usr/share/doc/mbsystem-doc/docs/ps
+usr/share/doc/mbsystem-doc/docs

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.install
===
--- packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-07 03:05:25 UTC 
(rev 3102)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-08 00:46:15 UTC 
(rev 3103)
@@ -1,3 +1,2 @@
-usr/share/doc/mbsystem/docs/*.html /usr/share/doc/mbsystem-doc/docs/html/
-usr/share/doc/mbsystem/docs/*.gif /usr/share/doc/mbsystem-doc/docs/html/
-usr/share/doc/mbsystem/docs/*.ps /usr/share/doc/mbsystem-doc/docs/ps/
+usr/share/doc/mbsystem/html /usr/share/doc/mbsystem-doc/docs/
+usr/share/doc/mbsystem/ps /usr/share/doc/mbsystem-doc/docs/

Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch   2013-06-07 
03:05:25 UTC (rev 3102)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch   2013-06-08 
00:46:15 UTC (rev 3103)
@@ -28,12 +28,12 @@
  
  lib_LTLIBRARIES = libmbproj.la
  
 a/src/man/man1/Makefile.am (revision 2098)
+--- a/src/man/man1/Makefile.am (revision 2120)
 +++ b/src/man/man1/Makefile.am (working copy)
 @@ -1,4 +1,4 @@
 -man_MANS = geod.1 \
 +man_MANS = \
- hsdump.1 \
+ mbhsdump.1 \
  mb7k2jstar.1 \
  mb7k2ss.1 \
 @@ -76,7 +76,6 @@
@@ -41,7 +41,7 @@
  mbsystem.1 \
  mbtime.1 \
 -mbvelocitytool.1 \
--proj.1 
+-proj.1
 +mbvelocitytool.1
  
  EXTRA_DIST = $(man_MANS)

Modified: packages/mbsystem/trunk/debian/rules
===
--- packages/mbsystem/trunk/debian/rules2013-06-07 03:05:25 UTC (rev 
3102)
+++ packages/mbsystem/trunk/debian/rules2013-06-08 00:46:15 UTC (rev 
3103)
@@ -32,6 +32,7 @@
 #  uscan --noconf --destdir=. --download-current-version --rename --verbose
 
 
-# cleaner doc install
-# ps2pdf + pdftk cat all .ps man pages into a single PDF document.
+# PDF doc generation and install:
+# ps2pdf + 'pdftk cat' to combine all .ps man pages into a single
+#  PDF document.
 #  use ReStructured text to PDF or TeX to make the cover page.


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3104 - packages/mbsystem/trunk/debian

2013-06-07 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-08 02:52:53 + (Sat, 08 Jun 2013)
New Revision: 3104

Modified:
   packages/mbsystem/trunk/debian/TODO
Log:
todone

Modified: packages/mbsystem/trunk/debian/TODO
===
--- packages/mbsystem/trunk/debian/TODO 2013-06-08 00:46:15 UTC (rev 3103)
+++ packages/mbsystem/trunk/debian/TODO 2013-06-08 02:52:53 UTC (rev 3104)
@@ -1,10 +1,12 @@
 TODO:
 
-* GMT binaries - $PATH ?
-* Integrate GMT coastline(s)
-* adapt these beginnings of a Debian build script into full packaging rules:
-* 
https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
-* Audit for bundled libraries (libproj)
-* document Copyright for LevitusAnnual82.dat global water properties database
+* GMT binaries are not in the $PATH by default. Deal with that or
+  make a large patch adding it to the PATH at the start of each
+  of the MB scripts and hardcoding the full path into the C code.
+* Integrate the GMT coastline(s)
+* Audit  remove bundled libraries (libproj)
+* Remove GSF code until license statement is made clear
+* Document copyright for LevitusAnnual82.dat global water properties
+  database (US Fed. Gov't product, NOAA)
 
 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3105 - packages/mbsystem/trunk/debian

2013-06-07 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-08 03:33:34 + (Sat, 08 Jun 2013)
New Revision: 3105

Modified:
   packages/mbsystem/trunk/debian/rules
Log:
take care of some lintian issues

Modified: packages/mbsystem/trunk/debian/rules
===
--- packages/mbsystem/trunk/debian/rules2013-06-08 02:52:53 UTC (rev 
3104)
+++ packages/mbsystem/trunk/debian/rules2013-06-08 03:33:34 UTC (rev 
3105)
@@ -23,7 +23,14 @@
 override_dh_installchangelogs:
dh_installchangelogs ChangeLog
 
+override_dh_install:
+   # add some missing shebangs to Perl scripts
+   sed -i 1i #!/usr/bin/perl `find $(CURDIR)/debian/tmp/usr/bin -type f 
-executable -name 'mbm_*'`
+   # take care of lintian tag: non-empty-dependency_libs-in-la-file
+   sed -i /dependency_libs/ s/'.*'/''/ `find 
$(CURDIR)/debian/tmp/usr/lib -name '*.la'`
+   dh_install
 
+
 # problematic: the upstream tarball is officially pkg-latest.tar.gz,
 #  which is then symlinked to an exact pkg-x.y.svn_rev.tar.gz filename.
 #  but sometimes there are newer x.y.svn_rev versions there for testing,


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3106 - packages/mbsystem/trunk/debian

2013-06-07 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-08 04:11:29 + (Sat, 08 Jun 2013)
New Revision: 3106

Modified:
   packages/mbsystem/trunk/debian/control
Log:
tweak depends/recommends/suggests

Modified: packages/mbsystem/trunk/debian/control
===
--- packages/mbsystem/trunk/debian/control  2013-06-08 03:33:34 UTC (rev 
3105)
+++ packages/mbsystem/trunk/debian/control  2013-06-08 04:11:29 UTC (rev 
3106)
@@ -14,9 +14,10 @@
 Package: mbsystem
 Section: science
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, csh, gmt
-Recommends: mbsystem-doc, mbsystem-data, gv, libparallel-forkmanager-perl
-Suggests: ghostscript, proj-bin
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ csh, gmt, libparallel-forkmanager-perl
+Recommends: mbsystem-doc, mbsystem-data, gv
+Suggests: proj-bin, gimp
 Description: Processing tools for multibeam and sidescan sonar data
  MB-System is an open source software package for the processing and
  display of bathymetry and backscatter imagery data derived from


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

r3107 - in packages/mbsystem/trunk/debian: . patches

2013-06-07 Thread hamish-guest

Author: hamish-guest
Date: 2013-06-08 05:08:25 + (Sat, 08 Jun 2013)
New Revision: 3107

Modified:
   packages/mbsystem/trunk/debian/control
   packages/mbsystem/trunk/debian/patches/system_proj4.patch
   packages/mbsystem/trunk/debian/rules
Log:
add perl:Depends, add'l embedded proj4 cleanout, hardening flags for sid

Modified: packages/mbsystem/trunk/debian/control
===
--- packages/mbsystem/trunk/debian/control  2013-06-08 04:11:29 UTC (rev 
3106)
+++ packages/mbsystem/trunk/debian/control  2013-06-08 05:08:25 UTC (rev 
3107)
@@ -14,7 +14,7 @@
 Package: mbsystem
 Section: science
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
  csh, gmt, libparallel-forkmanager-perl
 Recommends: mbsystem-doc, mbsystem-data, gv
 Suggests: proj-bin, gimp

Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch   2013-06-08 
04:11:29 UTC (rev 3106)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch   2013-06-08 
05:08:25 UTC (rev 3107)
@@ -53,3 +53,18 @@
  
  EXTRA_DIST = $(man_MANS)
  
+--- a/src/man/whatis   (revision 2120)
 b/src/man/whatis   (working copy)
+@@ -1,6 +1,5 @@
+ MBeditviz(1) - 3D visualization-based editing of swath bathymetry 
soundings
+ MBgrdviz(1)  - Simple interactive 2D/3D visualization of GMT grids
+-geod(1)  - direct geodesic computations invgeod - inverse 
geodesic computations
+ hsdump(1)- hsdump lists the information contained in 
Hydrosweep DS data files
+ mb7k2jstar(1)- extracts subbottom profiler and/or sidescan sonar 
data from Reson 7k format data files into Edgetech Jstar format data files
+ mb7k2ss(1)   - extracts sidescan sonar data from Reson 7k format 
data, bins and lays the sidescan onto the seafloor, and outputs files in the 
MBF_MBLDEOIH formst (MBIO format id 71)
+@@ -78,5 +77,3 @@
+ mbsystem(1)  - A set of utilities for manipulating and processing 
swath sonar bathymetry, amplitude, and sidescan data
+ mbtime(1)- Translate between calendar time values and unix 
time
+ mbvelocitytool(1)- Interactive water sound velocity profile editor
+-pj_init(3)   - initialize cartographic projection pj_init_plus - 
initialize cartographic projection pj_fwd - forward cartographic projection 
pj_inv - inverse cartographic projection pj_transform - transform between 
coordinate systems pj_free - de-initialize projection
+-proj(1)  - forward cartographic projection filter invproj - 
inverse cartographic projection filter

Modified: packages/mbsystem/trunk/debian/rules
===
--- packages/mbsystem/trunk/debian/rules2013-06-08 04:11:29 UTC (rev 
3106)
+++ packages/mbsystem/trunk/debian/rules2013-06-08 05:08:25 UTC (rev 
3107)
@@ -18,8 +18,13 @@
dh_auto_configure -- \
--includedir=/usr/include/mbsystem \
--docdir=/usr/share/doc/mbsystem/docs \
-   --with-gmt-include=/usr/include/gmt
+   --with-gmt-include=/usr/include/gmt \
+   $(shell dpkg-buildflags --export=configure)
 
+# dpkg-buildflags needed for hardening support if compat is held at '8'.
+# The --exp=config doesn't exist on Squeeze, remove the line when building
+#   there and live without hardening. It's ok on ubuntu 12.04 though.
+
 override_dh_installchangelogs:
dh_installchangelogs ChangeLog
 


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

1 2 >

1 - 100 of 110 matches

Mail list logo