[python-cligj] branch master updated (dcde839 - ce6e0c6)
This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a change to branch master in repository python-cligj. from dcde839 Fix short descriptions new ce6e0c6 Fix typo in copyright The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-cligj.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-cligj] 01/01: Fix typo in copyright
This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch master in repository python-cligj. commit ce6e0c6bb50beadfdc7f86c535d6da3e1219d91c Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Fri Jan 23 20:54:04 2015 +0100 Fix typo in copyright --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index b3ce63d..b4683ed 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,7 @@ Copyright: 2014, Mapbox License: BSD-3-Clause -Files: Debian/* +Files: debian/* Copyright: 2015, Johan Van de Wauw License: BSD-3-Clause -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-cligj.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-cligj] branch master updated (ce6e0c6 - 2153fe6)
This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a change to branch master in repository python-cligj. from ce6e0c6 Fix typo in copyright new 2153fe6 Typo in d/control The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-cligj.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-cligj] 01/01: Typo in d/control
This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch master
in repository python-cligj.
commit 2153fe695efcf85d7400ddacdd9ca0f2ba1e5e68
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date: Fri Jan 23 21:09:37 2015 +0100
Typo in d/control
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 2886bf8..77cc569 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Package: python-cligj
Architecture: all
Depends: ${python:Depends},
${misc:Depends}
-Description: Python 2 ibrary for processing GeoJSON commands
+Description: Python 2 library for processing GeoJSON commands
Cligj is a small library which can be used to standardise processing
of geoJSON in Python command line programs.
.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/python-cligj.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-cligj] branch master updated (6f12941 - dcde839)
This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a change to branch master in repository python-cligj. from 6f12941 Release to unstable new 9f9cee6 Add myself to copyright file new dcde839 Fix short descriptions The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 4 ++-- debian/copyright | 5 + 2 files changed, 7 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-cligj.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-cligj] 01/02: Add myself to copyright file
This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch master in repository python-cligj. commit 9f9cee6087c390c7405dda3e16d8fb4051803e5a Author: Johan Van de Wauw johan.vandew...@gmail.com Date: Fri Jan 23 20:48:29 2015 +0100 Add myself to copyright file --- debian/copyright | 5 + 1 file changed, 5 insertions(+) diff --git a/debian/copyright b/debian/copyright index fa98ff3..b3ce63d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,6 +7,11 @@ Files: * Copyright: 2014, Mapbox License: BSD-3-Clause + +Files: Debian/* +Copyright: 2015, Johan Van de Wauw +License: BSD-3-Clause + 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: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-cligj.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: [python-cligj] 02/02: Fix short descriptions
On 01/23/2015 08:50 PM, Johan Van de Wauw wrote: +Description: Python 2 ibrary for processing GeoJSON commands s/ibrary/l/g ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of python-cligj_0.1.0-1_amd64.changes
python-cligj_0.1.0-1.dsc has incorrect md5 checksum; deleting it python-cligj_0.1.0-1.debian.tar.xz has incorrect size; deleting it Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-cligj] 02/02: Fix short descriptions
This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch master
in repository python-cligj.
commit dcde839b498e1d7b475ff53f087013594bbe29ae
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date: Fri Jan 23 20:50:25 2015 +0100
Fix short descriptions
---
debian/control | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index d39bb71..2886bf8 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Package: python-cligj
Architecture: all
Depends: ${python:Depends},
${misc:Depends}
-Description: Common arguments and options for GeoJSON processing commands
+Description: Python 2 ibrary for processing GeoJSON commands
Cligj is a small library which can be used to standardise processing
of geoJSON in Python command line programs.
.
@@ -31,7 +31,7 @@ Package: python3-cligj
Architecture: all
Depends: ${python3:Depends},
${misc:Depends}
-Description: Common arguments and options for GeoJSON processing commands
+Description: Python 3 library for processing GeoJSON commands
Cligj is a small library which can be used to standardise processing
of geoJSON in Python command line programs.
.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/python-cligj.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of python-cligj_0.1.0-1_amd64.changes
python-cligj_0.1.0-1.dsc doesn't exist python-cligj_0.1.0-1.debian.tar.xz doesn't exist Due to the errors above, the .changes file couldn't be processed. Please fix the problems for the upload to happen. Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 08/18: Install grass7 wrapper script.
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository grass.
commit e0e17fd9af52739104f909997b9d62f40eb46a06
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Jan 23 20:21:37 2015 +0100
Install grass7 wrapper script.
---
debian/grass7 | 1480 +
debian/rules |5 +-
2 files changed, 1484 insertions(+), 1 deletion(-)
diff --git a/debian/grass7 b/debian/grass7
new file mode 100755
index 000..d12ba8c
--- /dev/null
+++ b/debian/grass7
@@ -0,0 +1,1480 @@
+#!/usr/bin/env python
+#
+#
+# MODULE: GRASS initialization script
+# AUTHOR(S):Original author unknown - probably CERL
+# Andreas Lange andreas.lange rhein-main.de
+# Huidae Cho grass4u gmail.com
+# Justin Hickey jhickey hpcc.nectec.or.th
+# Markus Neteler neteler osgeo.org
+# Hamish Bowman hamish_b yahoo.com
+#
+# GRASS 7: converted to Python (based on init.sh shell
+# script from GRASS 6) by Glynn Clements
+# Martin Landa landa.martin gmail.com
+# Luca Delucchi lucadeluge gmail.com
+# PURPOSE: Sets up environment variables, parses any remaining
+# command line options for setting the GISDBASE, LOCATION,
+# and/or MAPSET. Finally it starts GRASS with the appropriate
+# user interface and cleans up after it is finished.
+# COPYRIGHT:(C) 2000-2014 by the GRASS Development Team
+#
+# This program is free software under the GNU General
+# Public License (=v2). Read the file COPYING that
+# comes with GRASS for details.
+#
+#
+
+import sys
+import os
+import atexit
+import string
+import subprocess
+import re
+import platform
+import tempfile
+
+# Variables substituted during build process
+if 'GISBASE' in os.environ:
+gisbase = os.environ['GISBASE']
+else:
+gisbase = /usr/lib/grass70
+cmd_name = grass70
+grass_version = 7.0.0
+ld_library_path_var = 'LD_LIBRARY_PATH'
+if 'GRASS_PROJSHARE' in os.environ:
+config_projshare = os.environ['GRASS_PROJSHARE']
+else:
+config_projshare = /usr/share/proj
+
+# configuration directory
+grass_env_file = None # see check_shell()
+if sys.platform == 'win32':
+grass_config_dirname = GRASS7
+grass_config_dir = os.path.join(os.getenv('APPDATA'), grass_config_dirname)
+else:
+grass_config_dirname = .grass7
+grass_config_dir = os.path.join(os.getenv('HOME'), grass_config_dirname)
+
+gisbase = os.path.normpath(gisbase)
+
+# i18N
+import gettext
+gettext.install('grasslibs', os.path.join(gisbase, 'locale'), unicode=True)
+
+tmpdir = None
+lockfile = None
+remove_lockfile = True
+location = None
+create_new = None
+grass_gui = None
+exit_grass = None
+
+def warning(text):
+sys.stderr.write(_(WARNING) + ': ' + text + os.linesep)
+
+
+def try_remove(path):
+try:
+os.remove(path)
+except:
+pass
+
+
+def try_rmdir(path):
+try:
+os.rmdir(path)
+except:
+pass
+
+
+def clean_env():
+env_curr = read_gisrc()
+env_new = {}
+for k,v in env_curr.iteritems():
+if 'MONITOR' not in k:
+env_new[k] = v
+
+write_gisrc(env_new)
+
+
+def cleanup_dir(path):
+if not path:
+return
+
+for root, dirs, files in os.walk(path, topdown=False):
+for name in files:
+try_remove(os.path.join(root, name))
+for name in dirs:
+try_rmdir(os.path.join(root, name))
+
+
+def cleanup():
+tmpdir, lockfile, remove_lockfile
+# all exits after setting up tmp dirs (system/location) should
+# also tidy it up
+cleanup_dir(tmpdir)
+try_rmdir(tmpdir)
+if location:
+tmpdir_loc = os.path.join(location, .tmp)
+cleanup_dir(tmpdir_loc)
+try_rmdir(tmpdir_loc)
+
+# remove lock-file if requested
+if lockfile and remove_lockfile:
+try_remove(lockfile)
+
+
+def fatal(msg):
+sys.stderr.write(%s: % _('ERROR') + msg + os.linesep)
+sys.exit(_(Exiting...))
+
+
+def message(msg):
+sys.stderr.write(msg + \n)
+sys.stderr.flush()
+
+
+def readfile(path):
+f = open(path, 'r')
+s = f.read()
+f.close()
+return s
+
+
+def writefile(path, s):
+f = open(path, 'w')
+f.write(s)
+f.close()
+
+
+def call(cmd, **kwargs):
+if windows:
+kwargs['shell'] = True
+return subprocess.call(cmd, **kwargs)
+
+
+def Popen(cmd, **kwargs):
+if windows:
+kwargs['shell'] = True
+return subprocess.Popen(cmd, **kwargs)
+
+
+def gfile(*args):
+return os.path.join(gisbase, *args)
+
+help_text = rGRASS GIS %s
+Geographic Resources Analysis Support System (GRASS GIS).
+
+%s:
+ $CMD_NAME [-h
[grass] 09/18: Install tools into -dev package using install file instead of d/rules.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit 0188fd1dbbc19525f04da770181394564138b4a3 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 20:28:44 2015 +0100 Install tools into -dev package using install file instead of d/rules. --- debian/grass-dev.install| 1 + debian/grass-dev.install.in | 1 + debian/rules| 16 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/debian/grass-dev.install b/debian/grass-dev.install index 865cbe0..bf53a03 100644 --- a/debian/grass-dev.install +++ b/debian/grass-dev.install @@ -1 +1,2 @@ usr/lib/grass70/include +usr/lib/grass70/tools diff --git a/debian/grass-dev.install.in b/debian/grass-dev.install.in index 52298fa..3b9eaf0 100644 --- a/debian/grass-dev.install.in +++ b/debian/grass-dev.install.in @@ -1 +1,2 @@ usr/lib/grass@VERSION@/include +usr/lib/grass@VERSION@/tools diff --git a/debian/rules b/debian/rules index 2a18c71..768e6a8 100755 --- a/debian/rules +++ b/debian/rules @@ -192,22 +192,6 @@ install-arch: build-arch -e s+^\(RUN_GISBASE[ ]*=\) .*+\1 /usr/lib/$(BASE_NAME)+ \ debian/tmp/usr/lib/$(BASE_NAME)/include/Make/Platform.make - # install helper scripts for building addon man pages - install -m 755 tools/mkhtml.py \ - debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/mkhtml.py - install -m 755 tools/mkrest.py \ - debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/mkrest.py - install -m 755 tools/thumbnails.py \ - debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/thumbnails.py - install -m 755 tools/g.html2man/g.html2man.py \ - debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/g.html2man.py - install -m 644 tools/g.html2man/groff.py \ - debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/groff.py - install -m 644 tools/g.html2man/html.py \ - debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/html.py - install -m 644 tools/g.html2man/rest.py \ - debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/rest.py - # install pkg-config file install -m 644 grass.pc debian/$(PKG_NAME)-dev/usr/share/pkgconfig/$(BASE_NAME).pc -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 16/18: Update copyright file.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit bc8c6ef72e3adcad6ca4a0b0980d589e67a2bb51 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 23:15:21 2015 +0100 Update copyright file. Changes: - Update copyright years - Group files by license - Remove unused license sections --- debian/changelog | 4 + debian/copyright | 885 +++ 2 files changed, 115 insertions(+), 774 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2003823..e915727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ grass (7.0.0~rc1-1) UNRELEASED; urgency=medium * Add configure options: --with-netcdf, --with-blas, --with-lapack, remove --with-tcltk-includes. * Update patches for GRASS 7. + * Update copyright file, changes: +- Update copyright years +- Group files by license +- Remove unused license sections -- Bas Couwenberg sebas...@xs4all.nl Thu, 15 Jan 2015 01:15:41 +0100 diff --git a/debian/copyright b/debian/copyright index 12fee07..cb07692 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,158 +4,82 @@ Upstream-Contact: GRASS Development Team grass-...@lists.osgeo.org Source: http://grass.osgeo.org/ Files: * -Copyright: 1994-2014, GRASS Development Team -License: GPL-2.0+ - -Files: display/d.paint.labels/color.c - gui/scripts/v.type_wrapper.sh - gui/scripts/d.path.sh - lib/gis/raster_metadata.c - lib/gis/wind_in.c - ps/ps.map/border.h - ps/ps.map/r_border.c - tools/module_synopsis.sh -Copyright: 2007, Hamish Bowman, and the GRASS Development Team -License: GPL-2.0+ - -Files: gui/scripts/v.type_wrapper.py -Copyright: 2007-2008, Hamish Bowman, and the GRASS Development Team -License: GPL-2.0+ - -Files: doc/python/m.distance.py -Copyright: 2008-2011, Hamish Bowman, and the GRASS Development Team -License: GPL-2.0+ - -Files: lib/display/symbol.c -Copyright: 2005-2007, M. Hamish Bowman, and the GRASS Development Team -License: GPL-2.0+ - -Files: gem/actions.c - gem/actions.h - gem/at_exit_funcs.c - gem/at_exit_funcs.h - gem/error.c - gem/error.h - gem/globals.h - gem/main.c - gem/reg_deps.c - gem/reg_deps.h - gem/tools.c - gem/tools.h -Copyright: 2005, Benjamin Ducke -License: GPL-2.0+ - -Files: gem/reg_entries.c - gem/reg_entries.h - gem/reg_html.c - gem/reg_html.h -Copyright: 2005, User -License: GPL-2.0+ - -Files: gui/scripts/g.extension.rebuild.all.py -Copyright: 2011, Martin Landa, and the GRASS Development Team -License: GPL-2.0+ - -Files: gui/scripts/g.extension.py -Copyright: 2009-2013, Markus Neteler, and the GRASS Development Team -License: GPL-2.0+ - -Files: gui/wxpython/compat/subprocess.py -Copyright: 2003-2005, Peter Astrand astr...@lysator.liu.se -License: GPL-2.0+ - -Files: gui/wxpython/psmap/utils.py -Copyright: 2012, Anna Kratochvilova, and the GRASS Development Team -License: GPL-2.0+ - -Files: gui/wxpython/psmap/dialogs.py - gui/wxpython/psmap/frame.py - gui/wxpython/psmap/instructions.py -Copyright: 2011-2012, Anna Kratochvilova, and the GRASS Development Team -License: GPL-2.0+ - -Files: imagery/i.atcorr/AerosolConcentration.h - imagery/i.atcorr/Transform.h - imagery/i.atcorr/main.cpp -Copyright: 2003, Christo Zietsman -License: GPL-2.0+ - -Files: imagery/i.landsat.acca/algorithm.c -Copyright: 2010, E. Jorge Tizado -License: GPL-2.0+ - -Files: imagery/i.topo.corr/correction.c - imagery/i.topo.corr/illumination.c -Copyright: 2007-2010, E. Jorge Tizado -License: GPL-2.0+ - -Files: imagery/i.landsat.toar/earth_sun.h - imagery/i.landsat.toar/earth_sun.c -Copyright: 2000-2005, Liam Girdwood - 2006, E. Jorge Tizado -License: GPL-2.0+ - -Files: include/iostream/ami.h - include/iostream/ami_config.h - include/iostream/ami_sort.h - include/iostream/ami_sort_impl.h - include/iostream/ami_stream.h - include/iostream/embuffer.h - include/iostream/empq.h - include/iostream/empq_adaptive.h - include/iostream/empq_adaptive_impl.h - include/iostream/empq_impl.h - include/iostream/imbuffer.h - include/iostream/mem_stream.h - include/iostream/minmaxheap.h - include/iostream/mm.h - include/iostream/mm_utils.h - include/iostream/pqheap.h - include/iostream/quicksort.h - include/iostream/replacementHeap.h - include/iostream/replacementHeapBlock.h - include/iostream/rtimer.h - include/iostream/queue.h -Copyright: 2007, Laura Toma -License: GPL-2.0+ - -Files: include/gmath.h -Copyright: 2000, David D.Gray ddg...@armadce.demon.co.uk -License: GPL-2.0+ - -Files: include/neta.h -Copyright: 2009-2010, Daniel Bundala, and the GRASS Development Team -License: GPL-2.0+ - -Files: lib/gis/make_loc.c -Copyright: 2000, Frank Warmerdam -License: LGPL-2.0+ - -Files: lib/gis/color_compat.c - lib/gis/color_rules.c - lib/gis/open_misc.c -Copyright: 2007, Glynn Clements and the GRASS Development Team -License: GPL-2.0+ - -Files: lib/gis/color_remove.c - lib/gis/color_xform.c -
[grass] 11/18: Add r.in.png false positive to lintian-overrides.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit 2f07e408d1d7c3e2d79fd3e1a818f23c2355ddbd Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 21:03:12 2015 +0100 Add r.in.png false positive to lintian-overrides. --- debian/grass-core.lintian-overrides | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/grass-core.lintian-overrides b/debian/grass-core.lintian-overrides index 5b88e81..9ba5f5d 100644 --- a/debian/grass-core.lintian-overrides +++ b/debian/grass-core.lintian-overrides @@ -1,4 +1,5 @@ # False positive, file is an executable not an image +grass-core: image-file-in-usr-lib usr/lib/grass*/bin/r.in.png grass-core: image-file-in-usr-lib usr/lib/grass*/bin/r.out.png grass-core: image-file-in-usr-lib usr/lib/grass*/bin/r.out.tiff grass-core: image-file-in-usr-lib usr/lib/grass*/scripts/d.out.png -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 14/18: Move image files from /usr/lib to /usr/share.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit 465b652e14581058ed5a7b1eb2bb04b00766bae4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 22:01:17 2015 +0100 Move image files from /usr/lib to /usr/share. --- debian/grass-gui.links| 18 ++ debian/grass-gui.links.in | 18 ++ debian/rules | 36 3 files changed, 72 insertions(+) diff --git a/debian/grass-gui.links b/debian/grass-gui.links index 7a52469..ea02ab9 100644 --- a/debian/grass-gui.links +++ b/debian/grass-gui.links @@ -1,2 +1,20 @@ usr/share/grass70/gui/icons usr/lib/grass70/gui/icons usr/share/grass70/gui/images usr/lib/grass70/gui/images + +usr/share/grass70/gui/wxpython/animation/wxGUI_animation_tool.jpg usr/lib/grass70/gui/wxpython/animation/wxGUI_animation_tool.jpg +usr/share/grass70/gui/wxpython/dbmgr/dbmgr_frame.jpg usr/lib/grass70/gui/wxpython/dbmgr/dbmgr_frame.jpg +usr/share/grass70/gui/wxpython/gmodeler/gmodeler_frame.jpg usr/lib/grass70/gui/wxpython/gmodeler/gmodeler_frame.jpg +usr/share/grass70/gui/wxpython/iclass/iclass_frame.jpg usr/lib/grass70/gui/wxpython/iclass/iclass_frame.jpg +usr/share/grass70/gui/wxpython/mapswipe/mapswipe_tsunami.jpg usr/lib/grass70/gui/wxpython/mapswipe/mapswipe_tsunami.jpg +usr/share/grass70/gui/wxpython/psmap/psmap_frame.jpg usr/lib/grass70/gui/wxpython/psmap/psmap_frame.jpg +usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_1.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_1.png +usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_2.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_2.png +usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_3.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_3.png +usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_4.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_4.png +usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_5.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_5.png +usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_6.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_6.png +usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_7.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_7.png +usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_8.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_8.png +usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.jpg usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.jpg +usr/share/grass70/gui/wxpython/timeline/timeline_2D.jpg usr/lib/grass70/gui/wxpython/timeline/timeline_2D.jpg +usr/share/grass70/gui/wxpython/vdigit/vdigit_toolbar.jpg usr/lib/grass70/gui/wxpython/vdigit/vdigit_toolbar.jpg diff --git a/debian/grass-gui.links.in b/debian/grass-gui.links.in index 4ad1f91..9f070d2 100644 --- a/debian/grass-gui.links.in +++ b/debian/grass-gui.links.in @@ -1,2 +1,20 @@ usr/share/grass@VERSION@/gui/icons usr/lib/grass@VERSION@/gui/icons usr/share/grass@VERSION@/gui/images usr/lib/grass@VERSION@/gui/images + +usr/share/grass@VERSION@/gui/wxpython/animation/wxGUI_animation_tool.jpg usr/lib/grass@VERSION@/gui/wxpython/animation/wxGUI_animation_tool.jpg +usr/share/grass@VERSION@/gui/wxpython/dbmgr/dbmgr_frame.jpg usr/lib/grass@VERSION@/gui/wxpython/dbmgr/dbmgr_frame.jpg +usr/share/grass@VERSION@/gui/wxpython/gmodeler/gmodeler_frame.jpg usr/lib/grass@VERSION@/gui/wxpython/gmodeler/gmodeler_frame.jpg +usr/share/grass@VERSION@/gui/wxpython/iclass/iclass_frame.jpg usr/lib/grass@VERSION@/gui/wxpython/iclass/iclass_frame.jpg +usr/share/grass@VERSION@/gui/wxpython/mapswipe/mapswipe_tsunami.jpg usr/lib/grass@VERSION@/gui/wxpython/mapswipe/mapswipe_tsunami.jpg +usr/share/grass@VERSION@/gui/wxpython/psmap/psmap_frame.jpg usr/lib/grass@VERSION@/gui/wxpython/psmap/psmap_frame.jpg +usr/share/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_1.png usr/lib/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_1.png +usr/share/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_2.png usr/lib/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_2.png +usr/share/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_3.png usr/lib/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_3.png +usr/share/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_4.png usr/lib/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_4.png +usr/share/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_5.png usr/lib/grass@VERSION@/gui/wxpython/rlisetup/g_gui_rlisetup_5.png
[grass] 10/18: Add shlibs python Depends for tools in grass-dev.
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository grass.
commit 5ba1ea17b17d0d4e2cafc47272f162fb09512632
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Jan 23 21:01:00 2015 +0100
Add shlibs python Depends for tools in grass-dev.
---
debian/control| 2 ++
debian/control.in | 2 ++
2 files changed, 4 insertions(+)
diff --git a/debian/control b/debian/control
index dff7aac..3a94398 100644
--- a/debian/control
+++ b/debian/control
@@ -173,6 +173,8 @@ Depends: grass-core (= ${binary:Version}),
libproj-dev,
libgdal-dev,
libfreetype6-dev,
+ ${shlibs:Depends},
+ ${python:Depends},
${misc:Depends}
# Subversion is needed by g.extension, a primary motivator for installing the
grass-dev pkg
Recommends: subversion
diff --git a/debian/control.in b/debian/control.in
index 4995699..be4805c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -173,6 +173,8 @@ Depends: grass-core (= ${binary:Version}),
libproj-dev,
libgdal-dev,
libfreetype6-dev,
+ ${shlibs:Depends},
+ ${python:Depends},
${misc:Depends}
# Subversion is needed by g.extension, a primary motivator for installing the
grass-dev pkg
Recommends: subversion
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/grass.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 15/18: Fix unknown substitution variable warnings.
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository grass.
commit c9cabc65731436915020246efcaf6f226edb21c2
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Jan 23 22:33:00 2015 +0100
Fix unknown substitution variable warnings.
---
debian/control| 4 ++--
debian/control.in | 4 ++--
debian/rules | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index 3a94398..311ddd9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Priority: optional
Build-Depends: autoconf2.13,
autotools-dev,
debhelper (= 9),
+ dh-python,
doxygen,
fakeroot,
flex,
@@ -107,8 +108,7 @@ Description: GRASS GIS core components
Package: grass-gui
Architecture: any
-Depends: ${shlibs:Depends},
- grass-core,
+Depends: grass-core,
${python:Depends},
python-wxgtk3.0,
# pyGL needed for wxNviz
diff --git a/debian/control.in b/debian/control.in
index be4805c..c9c244a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,6 +7,7 @@ Priority: optional
Build-Depends: autoconf2.13,
autotools-dev,
debhelper (= 9),
+ dh-python,
doxygen,
fakeroot,
flex,
@@ -107,8 +108,7 @@ Description: GRASS GIS core components
Package: grass-gui
Architecture: any
-Depends: ${shlibs:Depends},
- grass-core,
+Depends: grass-core,
${python:Depends},
python-wxgtk3.0,
# pyGL needed for wxNviz
diff --git a/debian/rules b/debian/rules
index 1b37757..a597f2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -315,7 +315,7 @@ binary-arch: install-arch
dh_lintian -a
dh_link -a
dh_python2
- dh_python2 /usr/lib/$(BASE_NAME)/gui/
+ dh_python2 /usr/lib/$(BASE_NAME)/gui/ /usr/lib/$(BASE_NAME)/tools/
dh_strip -a
dh_compress -a -XAUTHORS
dh_fixperms -a
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/grass.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 17/18: Add patches for various typos.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit df0cf9ce96c5bbaa68c4235be1a7f0686e56da68 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jan 24 02:56:37 2015 +0100 Add patches for various typos. --- debian/changelog | 1 + debian/patches/additionally-typo.patch | 25 debian/patches/available-typo.patch| 14 +++ debian/patches/default-typo.patch | 13 +++ debian/patches/extension-typo.patch| 47 debian/patches/information-typo.patch | 202 + debian/patches/parameter-typo.patch| 69 +++ debian/patches/preferred-typo.patch| 14 +++ debian/patches/series | 9 ++ debian/patches/specifying-typo.patch | 34 ++ debian/patches/transferred-typo.patch | 105 + 11 files changed, 533 insertions(+) diff --git a/debian/changelog b/debian/changelog index e915727..de84905 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ grass (7.0.0~rc1-1) UNRELEASED; urgency=medium - Update copyright years - Group files by license - Remove unused license sections + * Add patches for various typos. -- Bas Couwenberg sebas...@xs4all.nl Thu, 15 Jan 2015 01:15:41 +0100 diff --git a/debian/patches/additionally-typo.patch b/debian/patches/additionally-typo.patch new file mode 100644 index 000..50b693b --- /dev/null +++ b/debian/patches/additionally-typo.patch @@ -0,0 +1,25 @@ +Description: Fix 'Aditionally' typo, replace with 'Additionally'. +Author: Bas Couwenberg sebas...@xs4all.nl + +--- a/raster/r.solute.transport/r.solute.transport.html b/raster/r.solute.transport/r.solute.transport.html +@@ -77,7 +77,7 @@ module rapidely grow with the size of th + The resulting linear equation system iAx = b/i can be solved with several solvers. + Several iterative solvers with unsymmetric sparse and quadratic matrices support are implemented. + The jacobi method, the Gauss-Seidel method and the biconjugate gradients-stabilized (bicgstab) method. +-Aditionally a direct Gauss solver and LU solver are available. Those direct solvers ++Additionally a direct Gauss solver and LU solver are available. Those direct solvers + only work with quadratic matrices, so be careful using them with large maps + (maps of size 10.000 cells will need more than one gigabyte of ram). + Always prefer a sparse matrix solver. +--- a/raster3d/r3.gwflow/r3.gwflow.html b/raster3d/r3.gwflow/r3.gwflow.html +@@ -63,7 +63,7 @@ this module rapidely grow with the size + several solvers. An iterative solvers with sparse and quadratic matrices + support is implemented. + The conjugate gradients method with (pcg) and without (cg) precondition. +-Aditionally a direct Cholesky solver is available. This direct solver ++Additionally a direct Cholesky solver is available. This direct solver + only work with normal quadratic matrices, so be careful using them with + large maps (maps of size 10.000 cells will need more than one Gigabyte + of RAM). The user should always prefer to use a sparse matrix solver. diff --git a/debian/patches/available-typo.patch b/debian/patches/available-typo.patch new file mode 100644 index 000..96fd4f5 --- /dev/null +++ b/debian/patches/available-typo.patch @@ -0,0 +1,14 @@ +Description: Fix 'avaiable' typo, replace with 'available'. +Author: Bas Couwenberg sebas...@xs4all.nl + +--- a/scripts/r3.in.xyz/r3.in.xyz.html b/scripts/r3.in.xyz/r3.in.xyz.html +@@ -28,7 +28,7 @@ Unlike emr.in.xyz/em, reading from s + possible. Filtering by z-range is accomplished by setting the 3D region. + p + To enable parallel processing support, set the bworkers=/b option +-to match the number of CPUs or CPU-cores avaiable on your system. ++to match the number of CPUs or CPU-cores available on your system. + Alternatively, the ttWORKERS/tt environment variable can be set + to the number of concurrent processes desired. + p diff --git a/debian/patches/default-typo.patch b/debian/patches/default-typo.patch new file mode 100644 index 000..376b2fe --- /dev/null +++ b/debian/patches/default-typo.patch @@ -0,0 +1,13 @@ +Description: Fix 'deafult' typo, replace with 'default'. + +--- a/temporal/t.rast.list/t.rast.list.html b/temporal/t.rast.list/t.rast.list.html +@@ -9,7 +9,7 @@ dataset. Most of the raster map specifi + column selection, sorting and SQL where statements. + + Using the bmethod/b option allows the specification of different +-methods to list map layers. Method icol/i is the deafult option and ++methods to list map layers. Method icol/i is the default option and + sensitive to the bcolumn/b,border/b and bwhere/b options. + It will simply print user specified metadata columns of one map layer + per line. The icomma/i method will list the map layer as comma diff --git a/debian/patches/extension-typo.patch
[grass] 05/18: Update custom installation for GRASS 7.
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository grass.
commit 99cea04f36ca0a6b808af1c6b10168b5ac602e70
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Jan 23 17:46:26 2015 +0100
Update custom installation for GRASS 7.
Changes:
- Also install 64x64 icon
- Also install AppStream metadata
- Don't install etc/{bwidget,dm,gm,nviz2.2}, removed upstream.
- Don't install SUBMITTING_*, removed upstream.
- Update paths for GUI icons images.
- Update paths for programming-manual.
---
debian/grass-core.dirs | 1 +
debian/grass-core.dirs.in| 1 +
debian/grass-core.docs | 4 ---
debian/grass-core.install| 1 +
debian/grass-core.install.in | 1 +
debian/grass-doc.doc-base| 2 +-
debian/grass-gui.install | 18 ++
debian/grass-gui.install.in | 18 ++
debian/grass-gui.links | 45 ++---
debian/grass-gui.links.in| 45 ++---
debian/rules | 59
11 files changed, 34 insertions(+), 161 deletions(-)
diff --git a/debian/grass-core.dirs b/debian/grass-core.dirs
index a644a80..fd619db 100644
--- a/debian/grass-core.dirs
+++ b/debian/grass-core.dirs
@@ -4,3 +4,4 @@ usr/share/doc/grass-core
usr/share/man
usr/share/icons/hicolor/32x32/apps
usr/share/icons/hicolor/48x48/apps
+usr/share/icons/hicolor/64x64/apps
diff --git a/debian/grass-core.dirs.in b/debian/grass-core.dirs.in
index b639d94..629871b 100644
--- a/debian/grass-core.dirs.in
+++ b/debian/grass-core.dirs.in
@@ -4,3 +4,4 @@ usr/share/doc/grass-core
usr/share/man
usr/share/icons/hicolor/32x32/apps
usr/share/icons/hicolor/48x48/apps
+usr/share/icons/hicolor/64x64/apps
diff --git a/debian/grass-core.docs b/debian/grass-core.docs
index 9174f7d..fa5cb3d 100644
--- a/debian/grass-core.docs
+++ b/debian/grass-core.docs
@@ -2,10 +2,6 @@ README
AUTHORS
COPYING
SUBMITTING
-SUBMITTING_DOCS
-SUBMITTING_PYTHON
-SUBMITTING_SCRIPTS
-SUBMITTING_TCLTK
contributors.csv
contributors_extra.csv
translators.csv
diff --git a/debian/grass-core.install b/debian/grass-core.install
index fb97c6c..10aecc4 100644
--- a/debian/grass-core.install
+++ b/debian/grass-core.install
@@ -8,4 +8,5 @@ usr/lib/grass70/lib
usr/lib/grass70/locale
usr/share/icons/hicolor
usr/share/applications
+usr/share/appdata
usr/bin/x-grass
diff --git a/debian/grass-core.install.in b/debian/grass-core.install.in
index 4d1112d..f7ef8f9 100644
--- a/debian/grass-core.install.in
+++ b/debian/grass-core.install.in
@@ -8,4 +8,5 @@ usr/lib/grass@VERSION@/lib
usr/lib/grass@VERSION@/locale
usr/share/icons/hicolor
usr/share/applications
+usr/share/appdata
usr/bin/x-grass
diff --git a/debian/grass-doc.doc-base b/debian/grass-doc.doc-base
index a7708d9..7a095a3 100644
--- a/debian/grass-doc.doc-base
+++ b/debian/grass-doc.doc-base
@@ -10,4 +10,4 @@ Section: Science/Geoscience
Format: HTML
Index: /usr/share/doc/grass-doc/html/index.html
-Files: /usr/share/doc/grass-doc/html/*.html
/usr/share/doc/grass-doc/html/gem/*.html
/usr/share/doc/grass-doc/html/nviz/*.html
+Files: /usr/share/doc/grass-doc/html/*.html
diff --git a/debian/grass-gui.install b/debian/grass-gui.install
index fcc5668..b2b0442 100644
--- a/debian/grass-gui.install
+++ b/debian/grass-gui.install
@@ -1,16 +1,2 @@
-usr/lib/grass70/bwidget
-usr/lib/grass70/etc/dm
-usr/lib/grass70/etc/form
-usr/lib/grass70/etc/gui
-usr/lib/grass70/etc/gm
-usr/lib/grass70/etc/gtcltk
-usr/lib/grass70/etc/nviz2.2
-usr/lib/grass70/etc/v.digit
-usr/lib/grass70/etc/wxpython
-usr/lib/grass70/bin/v.digit
-usr/lib/grass70/bin/xganim
-usr/share/grass70/bwidget
-usr/share/grass70/etc/dm
-usr/share/grass70/etc/gm
-usr/share/grass70/etc/gui
-usr/share/grass70/etc/nviz2.2
+usr/lib/grass70/gui
+usr/share/grass70/gui
diff --git a/debian/grass-gui.install.in b/debian/grass-gui.install.in
index 901a003..a9c6e71 100644
--- a/debian/grass-gui.install.in
+++ b/debian/grass-gui.install.in
@@ -1,16 +1,2 @@
-usr/lib/grass@VERSION@/bwidget
-usr/lib/grass@VERSION@/etc/dm
-usr/lib/grass@VERSION@/etc/form
-usr/lib/grass@VERSION@/etc/gui
-usr/lib/grass@VERSION@/etc/gm
-usr/lib/grass@VERSION@/etc/gtcltk
-usr/lib/grass@VERSION@/etc/nviz2.2
-usr/lib/grass@VERSION@/etc/v.digit
-usr/lib/grass@VERSION@/etc/wxpython
-usr/lib/grass@VERSION@/bin/v.digit
-usr/lib/grass@VERSION@/bin/xganim
-usr/share/grass@VERSION@/bwidget
-usr/share/grass@VERSION@/etc/dm
-usr/share/grass@VERSION@/etc/gm
-usr/share/grass@VERSION@/etc/gui
-usr/share/grass@VERSION@/etc/nviz2.2
+usr/lib/grass@VERSION@/gui
+usr/share/grass@VERSION@/gui
diff --git a/debian/grass-gui.links b/debian/grass-gui.links
index 56b20b5..7a52469 100644
--- a/debian/grass-gui.links
+++ b/debian/grass-gui.links
@@ -1,43 +1,2 @@
-usr/share/grass70/bwidget/images usr/lib/grass70/bwidget/images
-usr/share/grass70/etc/dm/barscale.gif
[grass] 06/18: Use /usr/lib instead of /usr/bin for BINDIR.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit 3b0a9076be82080cb45bdde7a228017b59c1137f Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 20:15:24 2015 +0100 Use /usr/lib instead of /usr/bin for BINDIR. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 02471e4..dfde612 100755 --- a/debian/rules +++ b/debian/rules @@ -155,7 +155,7 @@ install-arch: build-arch $(MAKE) install \ INST_DIR=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ prefix=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ - BINDIR=$(CURDIR)/debian/tmp/usr/bin + BINDIR=$(CURDIR)/debian/tmp/usr/lib # make all the self-bootstrapping tcl/tk scripts executable and fully pathed #debian/fixscripts.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 13/18: Add lintian override for manpage-has-bad-whatis-entry manpage-has-errors-from-man.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit 42d7ebecb1b62c243cab6afd20fa353c702568b8 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 21:43:30 2015 +0100 Add lintian override for manpage-has-bad-whatis-entry manpage-has-errors-from-man. --- debian/grass-core.lintian-overrides | 3 +++ debian/grass-doc.lintian-overrides | 6 ++ 2 files changed, 9 insertions(+) diff --git a/debian/grass-core.lintian-overrides b/debian/grass-core.lintian-overrides index 9ba5f5d..f30017d 100644 --- a/debian/grass-core.lintian-overrides +++ b/debian/grass-core.lintian-overrides @@ -4,6 +4,9 @@ grass-core: image-file-in-usr-lib usr/lib/grass*/bin/r.out.png grass-core: image-file-in-usr-lib usr/lib/grass*/bin/r.out.tiff grass-core: image-file-in-usr-lib usr/lib/grass*/scripts/d.out.png +# html2man doesn't include NAME. +grass-core: manpage-has-bad-whatis-entry * + # Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports: # Fortify Source functions: no, only unprotected functions found! # unprotected: read diff --git a/debian/grass-doc.lintian-overrides b/debian/grass-doc.lintian-overrides new file mode 100644 index 000..97d8132 --- /dev/null +++ b/debian/grass-doc.lintian-overrides @@ -0,0 +1,6 @@ +# html2man doesn't include NAME. +grass-doc: manpage-has-bad-whatis-entry * + +# html2man deficiency +grass-doc: manpage-has-errors-from-man * + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 07/18: Delete all .pyc files using find.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit 55cbc8582574e1e375c6a2700e7b5f2b2e6ea325 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 20:17:42 2015 +0100 Delete all .pyc files using find. --- debian/rules | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/debian/rules b/debian/rules index dfde612..928772e 100755 --- a/debian/rules +++ b/debian/rules @@ -167,16 +167,7 @@ install-arch: build-arch rm -f debian/tmp/usr/lib/$(BASE_NAME)/etc/license # delete python compiled bytecode files (maybe dh_python2 takes care of this for us?) - for DIR in python/grass \ - python/grass/lib \ - python/grass/script \ - wxpython \ - wxpython/compat \ - wxpython/gui_modules \ - wxpython/icons ; \ -do \ - rm -f debian/tmp/usr/lib/$(BASE_NAME)/etc/$$DIR/*.pyc ; \ - done + find debian/tmp/ -type f -name *.pyc -delete # change section from 1 to .1grass mv debian/tmp/usr/lib/$(BASE_NAME)/docs/man/man1/grass7.1 debian/$(BASE_NAME).1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 02/18: Update man page name from grass6 to grass7.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit 1c28f7299d660e55882009335ab487359459d52e Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 16:14:00 2015 +0100 Update man page name from grass6 to grass7. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index cdc4068..7b02f0e 100755 --- a/debian/rules +++ b/debian/rules @@ -183,7 +183,7 @@ install-arch: build-arch done # change section from 1 to .1grass - mv debian/tmp/usr/lib/$(BASE_NAME)/man/man1/grass6.1 debian/$(BASE_NAME).1 + mv debian/tmp/usr/lib/$(BASE_NAME)/man/man1/grass7.1 debian/$(BASE_NAME).1 for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1; do \ n=`basename $$m .1`; mv $$m debian/tmp/usr/lib/$(BASE_NAME)/man/man1/$$n.1grass; done for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1grass; do \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 05/05: Fix desktop file with patch instead of d/rules.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit aa6cda18873c90dccd1bd6f43e7410125496894c Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jan 24 03:35:34 2015 +0100 Fix desktop file with patch instead of d/rules. --- debian/changelog | 1 + debian/patches/desktop.patch | 15 +++ debian/patches/series| 1 + debian/rules | 5 - 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index de84905..6f5f040 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ grass (7.0.0~rc1-1) UNRELEASED; urgency=medium - Group files by license - Remove unused license sections * Add patches for various typos. + * Fix desktop file with patch instead of d/rules. -- Bas Couwenberg sebas...@xs4all.nl Thu, 15 Jan 2015 01:15:41 +0100 diff --git a/debian/patches/desktop.patch b/debian/patches/desktop.patch new file mode 100644 index 000..f49d952 --- /dev/null +++ b/debian/patches/desktop.patch @@ -0,0 +1,15 @@ +Description: Add Keywords, and fix Exec Icon in desktop file. +Author: Bas Couwenberg sebas...@xs4all.nl + +--- a/gui/icons/grass.desktop b/gui/icons/grass.desktop +@@ -47,6 +47,7 @@ Comment[tr]=Coğrafi bilgi sistemi + Comment[uk]=Геоінформаційна система + Comment[uz]=Geografik axborot tizimi + Categories=Education;Science;Geoscience;Geography; +-Exec=grass7 +-Icon=grass ++Exec=grass70 ++Icon=grass70 + Terminal=true ++Keywords=wms;wfs;ogc;osgeo diff --git a/debian/patches/series b/debian/patches/series index 18b2e49..1b2b725 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,3 +16,4 @@ default-typo.patch extension-typo.patch preferred-typo.patch transferred-typo.patch +desktop.patch diff --git a/debian/rules b/debian/rules index a597f2a..c7dabb0 100755 --- a/debian/rules +++ b/debian/rules @@ -212,11 +212,6 @@ install-arch: build-arch debian/tmp/usr/share/icons/hicolor/64x64/apps/$(BASE_NAME).png install -m 644 gui/icons/grass.desktop \ debian/tmp/usr/share/applications/$(BASE_NAME).desktop - # n.b. 6.4.1 shipped with grass65 as the Exec target - sed -i -e 's+Exec=grass7+Exec=$(BASE_NAME)+' \ - debian/tmp/usr/share/applications/$(BASE_NAME).desktop - sed -i -e 's+Icon=grass+Icon=$(BASE_NAME)+' \ - debian/tmp/usr/share/applications/$(BASE_NAME).desktop # install AppStream metadata mkdir -p debian/tmp/usr/share/appdata/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 02/05: Fix license shortname for LGPL-2.0+.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit a10242bd58555368ee65104da44ed4b1a608833b Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jan 24 03:24:10 2015 +0100 Fix license shortname for LGPL-2.0+. --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 31a2532..7899aa6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -56,7 +56,7 @@ Files: imagery/i.landsat.toar/earth_sun.c imagery/i.landsat.toar/earth_sun.h Copyright: 2006, E. Jorge Tizado 2000-2005, Liam Girdwood -License: LGPL-2+ +License: LGPL-2.0+ Files: lib/external/ccmath/* Copyright: 2000, Daniel A. Atkinson -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 03/05: Add explicit python dependency for grass-dev.
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository grass.
commit 366dc753acf1e92705bae3d7a5f1763ecd0ecc3a
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sat Jan 24 03:25:20 2015 +0100
Add explicit python dependency for grass-dev.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 311ddd9..76c2ec9 100644
--- a/debian/control
+++ b/debian/control
@@ -173,8 +173,8 @@ Depends: grass-core (= ${binary:Version}),
libproj-dev,
libgdal-dev,
libfreetype6-dev,
+ python,
${shlibs:Depends},
- ${python:Depends},
${misc:Depends}
# Subversion is needed by g.extension, a primary motivator for installing the
grass-dev pkg
Recommends: subversion
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/grass.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 01/05: Add debian/* to copyright file.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit bbce07c6d9ef50bfeed520de94f981c39b7f22bb Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jan 24 03:12:40 2015 +0100 Add debian/* to copyright file. --- debian/copyright | 5 + 1 file changed, 5 insertions(+) diff --git a/debian/copyright b/debian/copyright index cb07692..31a2532 100644 --- a/debian/copyright +++ b/debian/copyright @@ -143,6 +143,11 @@ License: chull redistributed in its entirety provided that this copyright notice is not removed. +Files: debian/* +Copyright: 2006-2014, Francesco Paolo Lovergine fran...@debian.org + 2012-2014, M. Hamish Bowman hamis...@yahoo.com +License: GPL-2+ + License: GPL-1+ 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] branch experimental updated (7028543 - aa6cda1)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to branch experimental in repository grass. from 7028543 Update hardening-no-fortify-functions lintian overrides. new bbce07c Add debian/* to copyright file. new a10242b Fix license shortname for LGPL-2.0+. new 366dc75 Add explicit python dependency for grass-dev. new 5349ee4 Update parameter typo patch. new aa6cda1 Fix desktop file with patch instead of d/rules. The 5 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog| 1 + debian/control | 2 +- debian/copyright| 7 +++- debian/patches/desktop.patch| 15 +++ debian/patches/parameter-typo.patch | 79 - debian/patches/series | 1 + debian/rules| 5 --- 7 files changed, 102 insertions(+), 8 deletions(-) create mode 100644 debian/patches/desktop.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 18/18: Update hardening-no-fortify-functions lintian overrides.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit 702854374bfeaee11f59123ed7b572d0d285f9ab Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jan 24 03:02:03 2015 +0100 Update hardening-no-fortify-functions lintian overrides. --- debian/grass-core.lintian-overrides | 5 + 1 file changed, 5 insertions(+) diff --git a/debian/grass-core.lintian-overrides b/debian/grass-core.lintian-overrides index f30017d..0b48cc7 100644 --- a/debian/grass-core.lintian-overrides +++ b/debian/grass-core.lintian-overrides @@ -26,6 +26,8 @@ grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.richness grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.shannon grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.shape grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.simpson +grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.thin +grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/wximgview grass-core: hardening-no-fortify-functions usr/lib/grass*/etc/lock # Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports: @@ -33,6 +35,7 @@ grass-core: hardening-no-fortify-functions usr/lib/grass*/etc/lock # unprotected: fread grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.in.arc grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.in.bin +grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r3.in.bin # Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports: # Fortify Source functions: no, only unprotected functions found! @@ -59,8 +62,10 @@ grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/v.segment # Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports: # Fortify Source functions: no, only unprotected functions found! # unprotected: strncpy +grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/i.gensig grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.topidx grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r3.in.ascii +grass-core: hardening-no-fortify-functions usr/lib/grass*/driver/db/ogr grass-core: hardening-no-fortify-functions usr/lib/grass*/etc/modcats grass-core: hardening-no-fortify-functions usr/lib/grass*/etc/modcolr -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 12/18: Sort install files.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit 4ca212faf57452fcfaa39402ff75267847df9684 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 21:15:42 2015 +0100 Sort install files. --- debian/grass-core.install| 8 debian/grass-core.install.in | 8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/grass-core.install b/debian/grass-core.install index 10aecc4..a81f2a2 100644 --- a/debian/grass-core.install +++ b/debian/grass-core.install @@ -1,12 +1,12 @@ usr/bin/grass70 +usr/bin/x-grass usr/lib/grass70/bin usr/lib/grass70/driver usr/lib/grass70/etc usr/lib/grass70/fonts -usr/lib/grass70/scripts usr/lib/grass70/lib usr/lib/grass70/locale -usr/share/icons/hicolor -usr/share/applications +usr/lib/grass70/scripts usr/share/appdata -usr/bin/x-grass +usr/share/applications +usr/share/icons/hicolor diff --git a/debian/grass-core.install.in b/debian/grass-core.install.in index f7ef8f9..49539a3 100644 --- a/debian/grass-core.install.in +++ b/debian/grass-core.install.in @@ -1,12 +1,12 @@ usr/bin/grass@VERSION@ +usr/bin/x-grass usr/lib/grass@VERSION@/bin usr/lib/grass@VERSION@/driver usr/lib/grass@VERSION@/etc usr/lib/grass@VERSION@/fonts -usr/lib/grass@VERSION@/scripts usr/lib/grass@VERSION@/lib usr/lib/grass@VERSION@/locale -usr/share/icons/hicolor -usr/share/applications +usr/lib/grass@VERSION@/scripts usr/share/appdata -usr/bin/x-grass +usr/share/applications +usr/share/icons/hicolor -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 01/18: Fix install prefix, now lowercase.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit c12e10b0f04db3ff22708f623e16bff11c0aa54e Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 15:53:57 2015 +0100 Fix install prefix, now lowercase. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index b12064b..cdc4068 100755 --- a/debian/rules +++ b/debian/rules @@ -155,7 +155,7 @@ install-arch: build-arch $(MAKE) $(STRIP) $(MAKE) install \ INST_DIR=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ - PREFIX=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ + prefix=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ BINDIR=$(CURDIR)/debian/tmp/usr/bin # make all the self-bootstrapping tcl/tk scripts executable and fully pathed -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 04/18: Update helper scripts installation for Python rewrite.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit 6856576409a44bc7161db1d66cf73f5328e0280e Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 17:25:13 2015 +0100 Update helper scripts installation for Python rewrite. --- debian/rules | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 525efff..2fd2ce3 100755 --- a/debian/rules +++ b/debian/rules @@ -206,10 +206,20 @@ install-arch: build-arch debian/tmp/usr/lib/$(BASE_NAME)/include/Make/Platform.make # install helper scripts for building addon man pages - install -m 755 tools/mkhtml.sh \ - debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/mkhtml.sh - install -m 755 tools/g.html2man/g.html2man \ - debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/g.html2man + install -m 755 tools/mkhtml.py \ + debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/mkhtml.py + install -m 755 tools/mkrest.py \ + debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/mkrest.py + install -m 755 tools/thumbnails.py \ + debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/thumbnails.py + install -m 755 tools/g.html2man/g.html2man.py \ + debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/g.html2man.py + install -m 644 tools/g.html2man/groff.py \ + debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/groff.py + install -m 644 tools/g.html2man/html.py \ + debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/html.py + install -m 644 tools/g.html2man/rest.py \ + debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/rest.py # install pkg-config file install -m 644 grass.pc debian/$(PKG_NAME)-dev/usr/share/pkgconfig/$(BASE_NAME).pc -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 03/18: Update man page paths.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch experimental in repository grass. commit de3f1eebb948a6f2c1913002df84453e83630a4d Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 16:35:16 2015 +0100 Update man page paths. --- debian/grass-doc.install| 4 ++-- debian/grass-doc.install.in | 4 ++-- debian/rules| 10 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/grass-doc.install b/debian/grass-doc.install index 4b43fb7..8104095 100644 --- a/debian/grass-doc.install +++ b/debian/grass-doc.install @@ -1,2 +1,2 @@ -usr/lib/grass70/docs/html usr/share/doc/grass-doc -usr/lib/grass70/man/man1 usr/share/man +usr/lib/grass70/docs/html usr/share/doc/grass-doc +usr/lib/grass70/docs/man/man1 usr/share/man diff --git a/debian/grass-doc.install.in b/debian/grass-doc.install.in index a8b46d3..919d79f 100644 --- a/debian/grass-doc.install.in +++ b/debian/grass-doc.install.in @@ -1,2 +1,2 @@ -usr/lib/grass@VERSION@/docs/html usr/share/doc/grass-doc -usr/lib/grass@VERSION@/man/man1 usr/share/man +usr/lib/grass@VERSION@/docs/html usr/share/doc/grass-doc +usr/lib/grass@VERSION@/docs/man/man1 usr/share/man diff --git a/debian/rules b/debian/rules index 7b02f0e..525efff 100755 --- a/debian/rules +++ b/debian/rules @@ -183,14 +183,14 @@ install-arch: build-arch done # change section from 1 to .1grass - mv debian/tmp/usr/lib/$(BASE_NAME)/man/man1/grass7.1 debian/$(BASE_NAME).1 - for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1; do \ - n=`basename $$m .1`; mv $$m debian/tmp/usr/lib/$(BASE_NAME)/man/man1/$$n.1grass; done - for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1grass; do \ + mv debian/tmp/usr/lib/$(BASE_NAME)/docs/man/man1/grass7.1 debian/$(BASE_NAME).1 + for m in debian/tmp/usr/lib/$(BASE_NAME)/docs/man/man1/*.1; do \ + n=`basename $$m .1`; mv $$m debian/tmp/usr/lib/$(BASE_NAME)/docs/man/man1/$$n.1grass; done + for m in debian/tmp/usr/lib/$(BASE_NAME)/docs/man/man1/*.1grass; do \ sed -i -e 's/^.TH \(.*\) 1/.TH \1 1grass/' $$m; done # escape minus signs which are command line options not hyphens - for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1grass; do \ + for m in debian/tmp/usr/lib/$(BASE_NAME)/docs/man/man1/*.1grass; do \ sed -i -e 's/\([ ([]\)-\([a-z]\)/\1\\-\2/g' \ -e 's/\([ []\)--\([a-z]\)/\1\\-\\-\2/g' \ -e 's/\[-\\fB/[\\-\\fB/' \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] branch master updated (59571cc - 66483d8)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to branch master in repository grass. from 59571cc Disable Bug-Submit in metadata, requires login. new 66483d8 Update watch file to use lower case RC. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + debian/watch | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 01/01: Update watch file to use lower case RC.
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository grass.
commit 66483d813b51dc7614a28154ff8876e91f53721a
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Jan 11 01:17:23 2015 +0100
Update watch file to use lower case RC.
---
debian/changelog | 1 +
debian/watch | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1cc06a8..616a11c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
grass (6.4.4-2) UNRELEASED; urgency=medium
* Add upstream metadata.
+ * Update watch file to use lower case RC.
-- Bas Couwenberg sebas...@xs4all.nl Fri, 28 Nov 2014 23:25:44 +0100
diff --git a/debian/watch b/debian/watch
index c1a57e8..eac61ea 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
- http://grass.osgeo.org/grass64/source/grass-([\d\.]*(?:RC\d){0,1}).tar.gz
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/
\
+http://grass.osgeo.org/grass64/source/ \
+grass-([\d\.]*(?:(?:RC|rc|pre|dev|beta|alpha)?\d*)).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/grass.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 05/05: pristine-tar data for grass_7.0.0~rc1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch pristine-tar in repository grass. commit 8c316d83589d32f9e1b1c16619e1c2411decccb9 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Jan 14 22:19:28 2015 +0100 pristine-tar data for grass_7.0.0~rc1.orig.tar.gz --- grass_7.0.0~rc1.orig.tar.gz.delta | Bin 0 - 245493 bytes grass_7.0.0~rc1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/grass_7.0.0~rc1.orig.tar.gz.delta b/grass_7.0.0~rc1.orig.tar.gz.delta new file mode 100644 index 000..6b1295e Binary files /dev/null and b/grass_7.0.0~rc1.orig.tar.gz.delta differ diff --git a/grass_7.0.0~rc1.orig.tar.gz.id b/grass_7.0.0~rc1.orig.tar.gz.id new file mode 100644 index 000..4c37a7c --- /dev/null +++ b/grass_7.0.0~rc1.orig.tar.gz.id @@ -0,0 +1 @@ +5418978d354b049e3390bee226cb5238ba830641 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] annotated tag upstream/7.0.0_beta3 created (now fa755e0)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to annotated tag upstream/7.0.0_beta3 in repository grass. at fa755e0 (tag) tagging 0c3c1c5eb6ee60ca9475a667f43d6ce1b7d280bd (commit) replaces upstream/7.0.0_beta2 tagged by Bas Couwenberg on Sun Jan 11 01:20:46 2015 +0100 - Log - Upstream version 7.0.0~beta3 Bas Couwenberg (1): Imported Upstream version 7.0.0~beta3 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] annotated tag upstream/7.0.0_beta2 created (now 797b5aa)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to annotated tag upstream/7.0.0_beta2 in repository grass. at 797b5aa (tag) tagging e172a52d500029d413aaf86b2d8ef8b618b2ce23 (commit) replaces upstream/7.0.0_beta1 tagged by Bas Couwenberg on Sun Jan 11 01:20:14 2015 +0100 - Log - Upstream version 7.0.0~beta2 Bas Couwenberg (1): Imported Upstream version 7.0.0~beta2 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] annotated tag upstream/7.0.0_rc1 created (now f9fac5b)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to annotated tag upstream/7.0.0_rc1 in repository grass. at f9fac5b (tag) tagging 37a909bbd4db22a645315467f942b848e6b0ae72 (commit) replaces upstream/7.0.0_beta4 tagged by Bas Couwenberg on Wed Jan 14 22:19:28 2015 +0100 - Log - Upstream version 7.0.0~rc1 Bas Couwenberg (1): Imported Upstream version 7.0.0~rc1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] annotated tag upstream/7.0.0_beta4 created (now 56febfb)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to annotated tag upstream/7.0.0_beta4 in repository grass. at 56febfb (tag) tagging 584adc1c892c037f3235438d5750eae8abebc02b (commit) replaces upstream/7.0.0_beta3 tagged by Bas Couwenberg on Sun Jan 11 01:21:12 2015 +0100 - Log - Upstream version 7.0.0~beta4 Bas Couwenberg (1): Imported Upstream version 7.0.0~beta4 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] annotated tag upstream/7.0.0_beta1 created (now d4b29ef)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to annotated tag upstream/7.0.0_beta1 in repository grass. at d4b29ef (tag) tagging b5c82849d4ae1056b4b3c27ebed6fdd7c73cb13f (commit) replaces upstream/6.4.4 tagged by Bas Couwenberg on Sun Jan 11 01:19:34 2015 +0100 - Log - Upstream version 7.0.0~beta1 Bas Couwenberg (1): Imported Upstream version 7.0.0~beta1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 04/05: pristine-tar data for grass_7.0.0~beta4.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch pristine-tar in repository grass. commit 3bd733fd6d9c62dab8fd6be8811ff696aa3401d1 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jan 11 01:21:12 2015 +0100 pristine-tar data for grass_7.0.0~beta4.orig.tar.gz --- grass_7.0.0~beta4.orig.tar.gz.delta | Bin 0 - 251404 bytes grass_7.0.0~beta4.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/grass_7.0.0~beta4.orig.tar.gz.delta b/grass_7.0.0~beta4.orig.tar.gz.delta new file mode 100644 index 000..bc71245 Binary files /dev/null and b/grass_7.0.0~beta4.orig.tar.gz.delta differ diff --git a/grass_7.0.0~beta4.orig.tar.gz.id b/grass_7.0.0~beta4.orig.tar.gz.id new file mode 100644 index 000..4a746b6 --- /dev/null +++ b/grass_7.0.0~beta4.orig.tar.gz.id @@ -0,0 +1 @@ +3a0f18fd731eb8656296c3a6dc2684492292c2d5 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 02/05: pristine-tar data for grass_7.0.0~beta2.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch pristine-tar in repository grass. commit 481a3b34ce044058447f3ea7f1b3033abdea25ba Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jan 11 01:20:13 2015 +0100 pristine-tar data for grass_7.0.0~beta2.orig.tar.gz --- grass_7.0.0~beta2.orig.tar.gz.delta | Bin 0 - 260482 bytes grass_7.0.0~beta2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/grass_7.0.0~beta2.orig.tar.gz.delta b/grass_7.0.0~beta2.orig.tar.gz.delta new file mode 100644 index 000..84dd146 Binary files /dev/null and b/grass_7.0.0~beta2.orig.tar.gz.delta differ diff --git a/grass_7.0.0~beta2.orig.tar.gz.id b/grass_7.0.0~beta2.orig.tar.gz.id new file mode 100644 index 000..b4671d7 --- /dev/null +++ b/grass_7.0.0~beta2.orig.tar.gz.id @@ -0,0 +1 @@ +ed3059fa866eaafc6883fb654801d8dd54fbec4f -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 01/05: pristine-tar data for grass_7.0.0~beta1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch pristine-tar in repository grass. commit 2afe5ec2e6b9861e72145ce8677925c5c561acfa Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jan 11 01:19:33 2015 +0100 pristine-tar data for grass_7.0.0~beta1.orig.tar.gz --- grass_7.0.0~beta1.orig.tar.gz.delta | Bin 0 - 353679 bytes grass_7.0.0~beta1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/grass_7.0.0~beta1.orig.tar.gz.delta b/grass_7.0.0~beta1.orig.tar.gz.delta new file mode 100644 index 000..3257b46 Binary files /dev/null and b/grass_7.0.0~beta1.orig.tar.gz.delta differ diff --git a/grass_7.0.0~beta1.orig.tar.gz.id b/grass_7.0.0~beta1.orig.tar.gz.id new file mode 100644 index 000..65c3554 --- /dev/null +++ b/grass_7.0.0~beta1.orig.tar.gz.id @@ -0,0 +1 @@ +ab00619119af4331cc3ec3dee3beae3d64defa66 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[grass] 03/05: pristine-tar data for grass_7.0.0~beta3.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch pristine-tar in repository grass. commit 785935512e6f85dced1d83c83516d35135ce0e52 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Jan 11 01:20:46 2015 +0100 pristine-tar data for grass_7.0.0~beta3.orig.tar.gz --- grass_7.0.0~beta3.orig.tar.gz.delta | Bin 0 - 259941 bytes grass_7.0.0~beta3.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/grass_7.0.0~beta3.orig.tar.gz.delta b/grass_7.0.0~beta3.orig.tar.gz.delta new file mode 100644 index 000..e752fed Binary files /dev/null and b/grass_7.0.0~beta3.orig.tar.gz.delta differ diff --git a/grass_7.0.0~beta3.orig.tar.gz.id b/grass_7.0.0~beta3.orig.tar.gz.id new file mode 100644 index 000..a2341a0 --- /dev/null +++ b/grass_7.0.0~beta3.orig.tar.gz.id @@ -0,0 +1 @@ +9b4fb23545417f32226bce4749ae366dbc3c8bd1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mkgmap] tag debian/0.0.0+svn3419-1.exp1 created (now 9284a46)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to tag debian/0.0.0+svn3419-1.exp1 in repository mkgmap. at 9284a46 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mkgmap] 02/05: Merge tag 'upstream/0.0.0+svn3419'
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository mkgmap. commit 5c698fca14049f69663cda78db1536b30dde Merge: 6c09615 86db0cb Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 16:21:59 2015 +0100 Merge tag 'upstream/0.0.0+svn3419' Upstream version 0.0.0+svn3419 resources/mkgmap-version.properties| 4 +-- resources/styles/default/points| 2 +- resources/styles/default/polygons | 2 +- .../mkgmap/osmstyle/actions/EchoAction.java| 3 +- .../mkgmap/osmstyle/actions/EchoTagsAction.java| 3 +- .../osmstyle/actions/TransliterateFilter.java | 38 ++ .../mkgmap/osmstyle/actions/ValueBuilder.java | 14 ++-- .../mkgmap/reader/osm/CoastlineFileLoader.java | 3 +- src/uk/me/parabola/mkgmap/reader/osm/Element.java | 10 ++ .../mkgmap/reader/osm/LinkDestinationHook.java | 7 ++-- .../parabola/mkgmap/reader/osm/LocationHook.java | 3 +- .../mkgmap/reader/osm/MultiPolygonRelation.java| 14 +--- .../mkgmap/reader/osm/POIGeneratorHook.java| 3 +- .../parabola/mkgmap/reader/osm/SeaGenerator.java | 30 +++-- .../mkgmap/osmstyle/actions/ValueBuilderTest.java | 20 15 files changed, 126 insertions(+), 30 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of mkgmap_0.0.0+svn3419-1~exp1_amd64.changes
mkgmap_0.0.0+svn3419-1~exp1_amd64.changes uploaded successfully to localhost along with the files: mkgmap_0.0.0+svn3419-1~exp1.dsc mkgmap_0.0.0+svn3419.orig.tar.gz mkgmap_0.0.0+svn3419-1~exp1.debian.tar.xz mkgmap_0.0.0+svn3419-1~exp1_all.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#776070: RFS: mkgmap/0.0.0+svn3419-1~exp1
Package: sponsorship-requests Severity: normal Dear mentors, I am looking for a sponsor for my package mkgmap Package name: mkgmap Version : 0.0.0+svn3419-1~exp1 Upstream Author : Steve Ratcliffe s...@parabola.me.uk URL : http://www.mkgmap.org.uk License : GPL-2+ Section : utils It builds those binary packages: mkgmap - Generate Garmin maps from OpenStreetMap data To access further information about this package, please visit the following URL: http://mentors.debian.net/package/mkgmap Alternatively, one can download the package with dget using this command: dget -x http://mentors.debian.net/debian/pool/main/m/mkgmap/mkgmap_0.0.0+svn3419-1~exp1.dsc More information about mkgmap can be obtained from http://www.mkgmap.org.uk. Changes since the last upload: * New upstream SVN snapshot. * Update years in copyright file. Regards, Bas Couwenberg ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mkgmap] 05/05: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository mkgmap. commit 9284a46fba0a07be0da9b097a67ef4ffa9618945 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 16:26:02 2015 +0100 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b6cd2da..39bcc11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -mkgmap (0.0.0+svn3419-1) UNRELEASED; urgency=medium +mkgmap (0.0.0+svn3419-1~exp1) experimental; urgency=medium * New upstream SVN snapshot. * Update years in copyright file. - -- Bas Couwenberg sebas...@xs4all.nl Fri, 23 Jan 2015 16:22:06 +0100 + -- Bas Couwenberg sebas...@xs4all.nl Fri, 23 Jan 2015 16:25:49 +0100 mkgmap (0.0.0+svn3393-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mkgmap] branch upstream updated (1d1d617 - 86db0cb)
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a change to branch upstream
in repository mkgmap.
from 1d1d617 Imported Upstream version 0.0.0+svn3394
new 86db0cb Imported Upstream version 0.0.0+svn3419
The 1 revisions listed above as new are entirely new to this
repository and will be described in separate emails. The revisions
listed as adds were already present in the repository and have only
been added to this reference.
Summary of changes:
resources/mkgmap-version.properties| 4 +--
resources/styles/default/points| 2 +-
resources/styles/default/polygons | 2 +-
.../mkgmap/osmstyle/actions/EchoAction.java| 3 ++-
.../mkgmap/osmstyle/actions/EchoTagsAction.java| 3 ++-
...ntryISOFilter.java = TransliterateFilter.java} | 30 +++---
.../mkgmap/osmstyle/actions/ValueBuilder.java | 14 +++---
.../mkgmap/reader/osm/CoastlineFileLoader.java | 3 ++-
src/uk/me/parabola/mkgmap/reader/osm/Element.java | 10
.../mkgmap/reader/osm/LinkDestinationHook.java | 7 ++---
.../parabola/mkgmap/reader/osm/LocationHook.java | 3 ++-
.../mkgmap/reader/osm/MultiPolygonRelation.java| 14 ++
.../mkgmap/reader/osm/POIGeneratorHook.java| 3 ++-
.../parabola/mkgmap/reader/osm/SeaGenerator.java | 30 ++
.../mkgmap/osmstyle/actions/ValueBuilderTest.java | 20 +++
15 files changed, 103 insertions(+), 45 deletions(-)
copy src/uk/me/parabola/mkgmap/osmstyle/actions/{CountryISOFilter.java =
TransliterateFilter.java} (51%)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/mkgmap.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mkgmap] 03/05: New upstream SVN snapshot.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository mkgmap. commit f494e15d976304229f75d30734a02792b957f8f4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 16:22:14 2015 +0100 New upstream SVN snapshot. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c7789c..abd2510 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -mkgmap (0.0.0+svn3394-1) UNRELEASED; urgency=medium +mkgmap (0.0.0+svn3419-1) UNRELEASED; urgency=medium * New upstream SVN snapshot. - -- Bas Couwenberg sebas...@xs4all.nl Fri, 09 Jan 2015 16:59:36 +0100 + -- Bas Couwenberg sebas...@xs4all.nl Fri, 23 Jan 2015 16:22:06 +0100 mkgmap (0.0.0+svn3393-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mkgmap] 01/01: pristine-tar data for mkgmap_0.0.0+svn3419.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch pristine-tar in repository mkgmap. commit 43c1f29172c91ac4167833be906d6be2aa3dd7a5 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 16:21:59 2015 +0100 pristine-tar data for mkgmap_0.0.0+svn3419.orig.tar.gz --- mkgmap_0.0.0+svn3419.orig.tar.gz.delta | Bin 0 - 48066 bytes mkgmap_0.0.0+svn3419.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mkgmap_0.0.0+svn3419.orig.tar.gz.delta b/mkgmap_0.0.0+svn3419.orig.tar.gz.delta new file mode 100644 index 000..36233a5 Binary files /dev/null and b/mkgmap_0.0.0+svn3419.orig.tar.gz.delta differ diff --git a/mkgmap_0.0.0+svn3419.orig.tar.gz.id b/mkgmap_0.0.0+svn3419.orig.tar.gz.id new file mode 100644 index 000..0306a77 --- /dev/null +++ b/mkgmap_0.0.0+svn3419.orig.tar.gz.id @@ -0,0 +1 @@ +8944cc6a67f3da66d64a5de5e47ab898b7254ab4 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mkgmap] branch master updated (6c09615 - 9284a46)
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a change to branch master
in repository mkgmap.
from 6c09615 New upstream SVN snapshot.
new 86db0cb Imported Upstream version 0.0.0+svn3419
new 5c698fc Merge tag 'upstream/0.0.0+svn3419'
new f494e15 New upstream SVN snapshot.
new 90f49fd Update years in copyright file.
new 9284a46 Set distribution to experimental.
The 5 revisions listed above as new are entirely new to this
repository and will be described in separate emails. The revisions
listed as adds were already present in the repository and have only
been added to this reference.
Summary of changes:
debian/changelog | 5 ++--
debian/copyright | 2 +-
resources/mkgmap-version.properties| 4 +--
resources/styles/default/points| 2 +-
resources/styles/default/polygons | 2 +-
.../mkgmap/osmstyle/actions/EchoAction.java| 3 ++-
.../mkgmap/osmstyle/actions/EchoTagsAction.java| 3 ++-
...ntryISOFilter.java = TransliterateFilter.java} | 30 +++---
.../mkgmap/osmstyle/actions/ValueBuilder.java | 14 +++---
.../mkgmap/reader/osm/CoastlineFileLoader.java | 3 ++-
src/uk/me/parabola/mkgmap/reader/osm/Element.java | 10
.../mkgmap/reader/osm/LinkDestinationHook.java | 7 ++---
.../parabola/mkgmap/reader/osm/LocationHook.java | 3 ++-
.../mkgmap/reader/osm/MultiPolygonRelation.java| 14 ++
.../mkgmap/reader/osm/POIGeneratorHook.java| 3 ++-
.../parabola/mkgmap/reader/osm/SeaGenerator.java | 30 ++
.../mkgmap/osmstyle/actions/ValueBuilderTest.java | 20 +++
17 files changed, 107 insertions(+), 48 deletions(-)
copy src/uk/me/parabola/mkgmap/osmstyle/actions/{CountryISOFilter.java =
TransliterateFilter.java} (51%)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/mkgmap.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mkgmap] annotated tag upstream/0.0.0+svn3419 created (now 42d8594)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to annotated tag upstream/0.0.0+svn3419 in repository mkgmap. at 42d8594 (tag) tagging 86db0cb7115a670e0b6556b51308734cfe2cdb94 (commit) replaces upstream/0.0.0+svn3394 tagged by Bas Couwenberg on Fri Jan 23 16:21:59 2015 +0100 - Log - Upstream version 0.0.0+svn3419 Bas Couwenberg (1): Imported Upstream version 0.0.0+svn3419 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mkgmap] 01/05: Imported Upstream version 0.0.0+svn3419
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository mkgmap.
commit 86db0cb7115a670e0b6556b51308734cfe2cdb94
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Jan 23 16:21:57 2015 +0100
Imported Upstream version 0.0.0+svn3419
---
resources/mkgmap-version.properties| 4 +--
resources/styles/default/points| 2 +-
resources/styles/default/polygons | 2 +-
.../mkgmap/osmstyle/actions/EchoAction.java| 3 +-
.../mkgmap/osmstyle/actions/EchoTagsAction.java| 3 +-
.../osmstyle/actions/TransliterateFilter.java | 38 ++
.../mkgmap/osmstyle/actions/ValueBuilder.java | 14 ++--
.../mkgmap/reader/osm/CoastlineFileLoader.java | 3 +-
src/uk/me/parabola/mkgmap/reader/osm/Element.java | 10 ++
.../mkgmap/reader/osm/LinkDestinationHook.java | 7 ++--
.../parabola/mkgmap/reader/osm/LocationHook.java | 3 +-
.../mkgmap/reader/osm/MultiPolygonRelation.java| 14 +---
.../mkgmap/reader/osm/POIGeneratorHook.java| 3 +-
.../parabola/mkgmap/reader/osm/SeaGenerator.java | 30 +++--
.../mkgmap/osmstyle/actions/ValueBuilderTest.java | 20
15 files changed, 126 insertions(+), 30 deletions(-)
diff --git a/resources/mkgmap-version.properties
b/resources/mkgmap-version.properties
index 5f04cf4..0ad5766 100644
--- a/resources/mkgmap-version.properties
+++ b/resources/mkgmap-version.properties
@@ -1,2 +1,2 @@
-svn.version: 3394
-build.timestamp: 2015-01-07T05:52:25+
+svn.version: 3419
+build.timestamp: 2015-01-19T20:25:08+
diff --git a/resources/styles/default/points b/resources/styles/default/points
index e571d63..edfd825 100644
--- a/resources/styles/default/points
+++ b/resources/styles/default/points
@@ -187,7 +187,7 @@ amenity=zoo [0x2c07 resolution 24]
landuse=military [0x640b resolution 24]
landuse=village_green name=* [0x2c06 resolution 24]
-healthcare=hospital | amenity=hospital [0x3002 resolution 22]
+healthcare=hospital | amenity=hospital | amenity=clinic [0x3002 resolution 22]
healthcare=* | amenity=dentist | amenity=doctors [0x3002 resolution 24]
highway=motorway_junction [0x2100 resolution 24]
diff --git a/resources/styles/default/polygons
b/resources/styles/default/polygons
index d25da79..825c09c 100644
--- a/resources/styles/default/polygons
+++ b/resources/styles/default/polygons
@@ -28,7 +28,7 @@ amenity=school [0x0a resolution 22]
amenity=supermarket [0x08 resolution 22]
amenity=university [0x0a resolution 21]
-healthcare=hospital | amenity=hospital [0x0b resolution 22]
+healthcare=hospital | amenity=hospital | amenity=clinic [0x0b resolution 22]
healthcare=* | amenity=dentist | amenity=doctors | amenity=nursing_home
[0x0b resolution 23]
diff --git a/src/uk/me/parabola/mkgmap/osmstyle/actions/EchoAction.java
b/src/uk/me/parabola/mkgmap/osmstyle/actions/EchoAction.java
index e095be2..9b454bb 100644
--- a/src/uk/me/parabola/mkgmap/osmstyle/actions/EchoAction.java
+++ b/src/uk/me/parabola/mkgmap/osmstyle/actions/EchoAction.java
@@ -16,6 +16,7 @@
package uk.me.parabola.mkgmap.osmstyle.actions;
import uk.me.parabola.mkgmap.reader.osm.Element;
+import uk.me.parabola.mkgmap.reader.osm.FakeIdGenerator;
/**
* Sends a message to the console.
@@ -31,7 +32,7 @@ public class EchoAction implements Action {
public boolean perform(Element el) {
String e = value.build(el, el);
- System.err.println(el.getId() + : + e);
+ System.err.println(el.getId() +
(FakeIdGenerator.isFakeId(el.getId()) ? ( + el.getOriginalId() + ) : ) +
: + e);
return false;
}
}
diff --git a/src/uk/me/parabola/mkgmap/osmstyle/actions/EchoTagsAction.java
b/src/uk/me/parabola/mkgmap/osmstyle/actions/EchoTagsAction.java
index 6850f49..7ee0778 100644
--- a/src/uk/me/parabola/mkgmap/osmstyle/actions/EchoTagsAction.java
+++ b/src/uk/me/parabola/mkgmap/osmstyle/actions/EchoTagsAction.java
@@ -14,6 +14,7 @@
package uk.me.parabola.mkgmap.osmstyle.actions;
import uk.me.parabola.mkgmap.reader.osm.Element;
+import uk.me.parabola.mkgmap.reader.osm.FakeIdGenerator;
/**
* Sends a message including the tags of an element to System.err.
@@ -29,7 +30,7 @@ public class EchoTagsAction implements Action {
public boolean perform(Element el) {
String e = value.build(el, el);
- System.err.println(el.getId() + - + el.toTagString()+ +
e);
+ System.err.println(el.getId() +
(FakeIdGenerator.isFakeId(el.getId()) ? ( + el.getOriginalId() + ) : ) +
- + el.toTagString()+ + e);
return false;
}
diff --git
a/src/uk/me/parabola/mkgmap/osmstyle/actions/TransliterateFilter.java
b/src/uk/me/parabola/mkgmap/osmstyle/actions/TransliterateFilter.java
new file mode 100644
index 000..9e6c33d
--- /dev/null
+++
[mkgmap] branch pristine-tar updated (99c7dd4 - 43c1f29)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to branch pristine-tar in repository mkgmap. from 99c7dd4 pristine-tar data for mkgmap_0.0.0+svn3394.orig.tar.gz new 43c1f29 pristine-tar data for mkgmap_0.0.0+svn3419.orig.tar.gz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: mkgmap_0.0.0+svn3419.orig.tar.gz.delta | Bin 0 - 48066 bytes mkgmap_0.0.0+svn3419.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 mkgmap_0.0.0+svn3419.orig.tar.gz.delta create mode 100644 mkgmap_0.0.0+svn3419.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mkgmap] 04/05: Update years in copyright file.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository mkgmap. commit 90f49fda556b03f3520b2f9b56627c53aadb573d Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 23 16:24:56 2015 +0100 Update years in copyright file. --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index abd2510..b6cd2da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mkgmap (0.0.0+svn3419-1) UNRELEASED; urgency=medium * New upstream SVN snapshot. + * Update years in copyright file. -- Bas Couwenberg sebas...@xs4all.nl Fri, 23 Jan 2015 16:22:06 +0100 diff --git a/debian/copyright b/debian/copyright index 738296f..99a3b62 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Name: mkgmap Source: http://www.mkgmap.org.uk/download/ Files: * -Copyright: 2006-2014, Steve Ratcliffe s...@parabola.me.uk +Copyright: 2006-2015, Steve Ratcliffe s...@parabola.me.uk 2009, Bernhard Heibler 2009, Christian Gawron 2009, Clinton Gladstone -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
mkgmap_0.0.0+svn3419-1~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Fri, 23 Jan 2015 16:25:49 +0100 Source: mkgmap Binary: mkgmap Architecture: source all Version: 0.0.0+svn3419-1~exp1 Distribution: experimental Urgency: medium Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Bas Couwenberg sebas...@xs4all.nl Description: mkgmap - Generate Garmin maps from OpenStreetMap data Changes: mkgmap (0.0.0+svn3419-1~exp1) experimental; urgency=medium . * New upstream SVN snapshot. * Update years in copyright file. Checksums-Sha1: 9f36eee5329dc28f92ae13f082485d47fcc25e83 2143 mkgmap_0.0.0+svn3419-1~exp1.dsc 657b9ba152edcc8a23f340e54d5372a30eb83119 1627715 mkgmap_0.0.0+svn3419.orig.tar.gz dc328040aa57cfe24ef9e86a8820f4d2ae99d758 6216 mkgmap_0.0.0+svn3419-1~exp1.debian.tar.xz b35d511da0a72ddc55ce4772f8055a3acf39a320 1972232 mkgmap_0.0.0+svn3419-1~exp1_all.deb Checksums-Sha256: 934da857d5281e15ab00f5e0f6e10721232bae80d079dde6843a5e3628e2ce65 2143 mkgmap_0.0.0+svn3419-1~exp1.dsc 3a4cba6325ce8e4d07863533301ac2e1bf511532a2df2284177ce75872bf6a81 1627715 mkgmap_0.0.0+svn3419.orig.tar.gz 54f7a670a57d962017970c6109b16516678df4a3cab1d5d4182c10bbed3e1836 6216 mkgmap_0.0.0+svn3419-1~exp1.debian.tar.xz 237be3d960df22c7422eaacdfec079d3b9d7808bd10cbff358fd8e135dd9a24a 1972232 mkgmap_0.0.0+svn3419-1~exp1_all.deb Files: f06a51a7d85f488e3400f85d08e04b47 2143 utils optional mkgmap_0.0.0+svn3419-1~exp1.dsc 112a27c859505421ba814a7d4fe10109 1627715 utils optional mkgmap_0.0.0+svn3419.orig.tar.gz e25c865069e44ec2491e978c291ba7a0 6216 utils optional mkgmap_0.0.0+svn3419-1~exp1.debian.tar.xz d60e15f6a72157149e49b8be2a24f166 1972232 utils optional mkgmap_0.0.0+svn3419-1~exp1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCAAGBQJUwm1/AAoJEFeKBJTRxkbRIUsP/2109mX1PMa9ZvvRUdSbzUUY L63V1+2g2X3fS1pZ3Q2TEYVYpp91my1NTz95YYBH/donaCjNfbj/lE9QZIqqoUAD II6Jzd4ukys/HcwoU/OemXCIUsmpbSdezTXTPJEx2f900lt0NW6i5deyYPvUzfwT yicdstXwJUnVr6oZss5V02vZIJ03MWIZpQUieTF/Xf2GHZlKuKJVCdIfi4TIG5Kq ZN3SQxsYWxoo7K4X05kq0r9kwFmfROUm5bo1NIudMqtY3u5mmXvrGJZFBZ4/+CUI Fa0aXbx6Oz50zpxggD7Kcpe7PnAjnrZZC9FILD9DTY/A4Ju+IFolQCukASbeFbkL grl29NH4xthArc6BnI7RbmxUwqcY8+GSOx5S9ZqXtNdorKEsPSVBMOxenLIJtivt YrUHxWI2ucZuDl6MRjVJfjWpL31cJ21vx2AZNzAsW/e05KXGsZnYerORSjKgAdrT nuiXcx7VDGXy8Sa80hkd3SKxd82PgxAjgmhPzTVYYezkb+BXjRY9qxHya1D24vSv ocG6wPxNp1OksfLWZ5ETngmjI5LDRyxxWMespxU5+m8BnUSQIYbpPv8c+97bgrFj k+Oz7dk1/MvnfRLWHO3aVhby0WUFjUa72Y4Jb5Py0nOVT3Mnu+GMVbVO1KZOFSYY tba+aASHomrM0Tf2tsL3 =43fh -END PGP SIGNATURE- Thank you for your contribution to 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
