Bug#757308: grass: Please update to use wxpython3.0

2014-09-03 Thread Francesco P. Lovergine
On Wed, Aug 20, 2014 at 05:53:18PM +1200, Hamish wrote:
 Hamish wrote:
   grass 6.4.4.packaging is currently (basically) ready in DebianGIS
   git.
 
 Sebastiaan:
  But not by using git-import-orig. The upstream branch hasn't been
  updated with the grass_6.4.4.orig.tar.gz contents.
 
 it was done in the master branch,
   
 http://git.linuxminded.nl/?p=pkg-grass/grass;a=commit;h=d183a32b883dbad88e0d751d030e177dd90926a0
 
 tagging is currently incomplete, but known todo and discussed privately.
 
 ...

Do you mind to discuss NOT privately? 


  You should run lintian showing all tags after your build to get an
  idea of what is left to fix before I would consider an upload.
 
 er, you really think we don't do that and know exactly what they are?
 We've been busy packaging this software for more than a dozen years!
 Not masking false positives and real but won't-fix in this major
 version lintian issues is not a bug IMHO.
 

Bas, the grass package has a long list of lintian issues due mainly to specific
choices of upstream team and historical reasons. It is quite pointless
trying to respect the full policy by patching at every new release,
and it would be also an heavy job (with no hopes of being accepted upstream
for merging). This is well expected for such a scientific program born in 
the 80s and having a very conservative and tiny development team.

 No doubt the main rules file could use a bit of a refresh here and there
 (supporting 'make -j' would be nice), but let's continue this
 conversation on the DebainGIS list, not in a ticket about transitioning
 to wxpython3.0.
 

I don't understand *why* the d-gis repo is not already up-to-date with an 
appropriate
branching and tagging for the proper support. It is quite annoying working
with yet-another-git-archive.

-- 
Francesco P. Lovergine

___
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 upstream updated (019c645 - f4aa610)

2014-09-03 Thread Francesco Lovergine
This is an automated email from the git hooks/post-receive script.

frankie pushed a change to branch upstream
in repository grass.

  from  019c645   Updated upstream branch for 6.4.3
   new  f4aa610   Imported Upstream version 6.4.4

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:
 AUTHORS| 6 +-
 COPYING| 5 +-
 ChangeLog_6.4.3.gz |   Bin 563795 - 0 bytes
 ChangeLog_6.4.4.gz |   Bin 0 - 577386 bytes
 INSTALL| 4 +-
 REQUIREMENTS.html  | 2 +-
 SUBMITTING | 2 +-
 SUBMITTING_SCRIPTS | 4 +-
 SUBMITTING_TCLTK   | 2 +-
 aclocal.m4 | 6 +-
 config.guess   |   192 +-
 config.sub |30 +-
 configure  |  1653 +-
 configure.in   |17 +-
 contributors.csv   | 1 +
 contributors_extra.csv |78 +-
 db/base/columns.c  | 6 +
 db/base/copy.c | 8 +
 db/base/db.columns.html| 2 +-
 db/base/db.connect.html|31 +-
 db/base/db.copy.html   | 2 +-
 db/base/db.createdb.html   | 2 +-
 db/base/db.databases.html  | 2 +-
 db/base/db.describe.html   | 2 +-
 db/base/db.drivers.html| 2 +-
 db/base/db.dropdb.html | 2 +-
 db/base/db.droptable.html  | 2 +-
 db/base/db.execute.html| 2 +-
 db/base/db.select.html | 2 +-
 db/base/db.tables.html | 2 +-
 db/base/select.c   |10 +-
 db/db.login/description.html   |30 +-
 db/db.login/main.c |20 +-
 db/drivers/dbf/dbfexe.c| 1 +
 db/drivers/dbf/grass-dbf.html  | 2 +-
 db/drivers/mysql/grass-mesql.html  |15 +-
 db/drivers/mysql/grass-mysql.html  |15 +-
 db/drivers/odbc/grass-odbc.html| 2 +-
 db/drivers/ogr/grass-ogr.html  | 2 +-
 db/drivers/postgres/grass-pg.html  |18 +-
 db/drivers/sqlite/execute.c|17 +-
 db/drivers/sqlite/grass-sqlite.html| 2 +-
 display/d.ask/description.html | 2 +-
 display/d.barscale/description.html| 2 +-
 display/d.barscale/main.c  |11 +-
 display/d.barscale/mouse.c | 3 +-
 display/d.colorlist/description.html   | 2 +-
 display/d.colors/description.html  | 2 +-
 display/d.colors/get_info.c|14 +-
 display/d.colortable/description.html  | 2 +-
 display/d.erase/description.html   | 2 +-
 display/d.extend/description.html  | 2 +-
 display/d.extract/description.html | 2 +-
 display/d.font.freetype/description.html   | 2 +-
 display/d.font/description.html| 2 +-
 display/d.frame/description.html   | 2 +-
 display/d.geodesic/description.html| 2 +-
 display/d.graph/description.html   | 6 +-
 display/d.grid/description.html| 2 +-
 display/d.his/description.html | 2 +-
 display/d.histogram/description.html   | 2 +-
 display/d.info/description.html| 2 +-
 display/d.legend/description.html  | 2 +-
 display/d.linegraph/description.html   | 2 +-
 display/d.linegraph/linegraph.c| 2 +-
 display/d.mapgraph/description.html| 2 +-
 display/d.measure/description.html | 2 +-
 display/d.menu/description.html| 2 +-
 display/d.menu/main.c  | 7 +-
 display/d.mon/cmd/description.html | 2 +-
 display/d.nviz/description.html| 2 +-
 

[grass] annotated tag upstream/6.4.4 created (now e0b39f6)

2014-09-03 Thread Francesco Lovergine
This is an automated email from the git hooks/post-receive script.

frankie pushed a change to annotated tag upstream/6.4.4
in repository grass.

at  e0b39f6   (tag)
   tagging  f4aa61070c940abebe756460873fc0dc32f557b6 (commit)
  replaces  upstream/6.4.1
 tagged by  Francesco Paolo Lovergine
on  Wed Sep 3 16:35:41 2014 +0200

- Log -
Upstream version 6.4.4

Francesco P. Lovergine (1):
  Imported Upstream version 6.4.2

Francesco Paolo Lovergine (3):
  Missing commit of 6.4.3 in upstream branch added.
  Updated upstream branch for 6.4.3
  Imported Upstream version 6.4.4

---

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


[hdf4] 01/04: Add rsync as build-dep

2014-09-03 Thread Johan Van de Wauw
This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch master
in repository hdf4.

commit 028fec20fbc655c57e254110f143fa4de456c311
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Wed Sep 3 21:21:44 2014 +0200

Add rsync as build-dep
---
 debian/control | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 7c8ea18..3c6a7f4 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Build-Depends: debhelper (= 7),
autotools-dev,
quilt,
chrpath,
-   gfortran
+   gfortran,
+   rsync
 Standards-Version: 3.8.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/hdf4.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/hdf4.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/hdf4.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


[hdf4] 02/04: Use libtoolize and autoreconf (closes: #639720)

2014-09-03 Thread Johan Van de Wauw
This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch master
in repository hdf4.

commit bec88f7a21f6a3fe6ae97d35bdae8fce40d2df61
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Wed Sep 3 22:35:20 2014 +0200

Use libtoolize and autoreconf (closes: #639720)
---
 debian/control | 5 -
 debian/rules   | 6 --
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 3c6a7f4..5e0ec03 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,10 @@ Build-Depends: debhelper (= 7),
quilt,
chrpath,
gfortran,
-   rsync
+   rsync,
+   libtool,
+   autoconf,
+   automake
 Standards-Version: 3.8.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/hdf4.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/hdf4.git
diff --git a/debian/rules b/debian/rules
index a3f4663..67d94d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,14 +78,16 @@ stamps/configure-stamp: patch
rm -f HDF4  ln -sf HDF$(RELEASE) HDF4
# build the 'regular' netcdf-clashing flavor.
cd HDF4 \
-cp /usr/share/misc/config.sub bin/.  cp 
/usr/share/misc/config.guess bin/. \
+libtoolize \
+autoreconf -i \
 F77=$(F77) CC=$(CC) CXX=$(CXX) ./configure 
--prefix=/usr --includedir=/usr/include/hdf \
 --enable-shared  
--enable-fortran
# ./hdf/fmpool/config.sub
#
# build a netcdf compatible flavor, without fortran functions.
cd HDF4_ALT \
-cp /usr/share/misc/config.sub bin/.  cp 
/usr/share/misc/config.guess bin/. \
+libtoolize \
+autoreconf -i \
 CC=$(CC) CXX=$(CXX) ./configure --prefix=/usr 
--includedir=/usr/include/hdf --disable-netcdf \
  --enable-shared 
--disable-fortran
touch $@

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/hdf4.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


[hdf4] 04/04: Update changelog

2014-09-03 Thread Johan Van de Wauw
This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch master
in repository hdf4.

commit 9954ba9633a9f832f39b41b8e8cc770d371a3fa9
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Wed Sep 3 23:21:28 2014 +0200

Update changelog
---
 debian/changelog | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 27f9d89..3800070 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libhdf4 (4.2.10-1) UNRELEASED; urgency=medium
+libhdf3 (4.2r10-1) UNRELEASED; urgency=medium
 
   * Add watchfile
   * Imported Upstream version 4.2.10
@@ -6,6 +6,14 @@ libhdf4 (4.2.10-1) UNRELEASED; urgency=medium
   * Fix package synopsis length
   * Rewrite control file using cme
   * Fix debian/control.in to match debian/control
+  * Import patches from debian 4.1r4-13
+  * Use original source tarball rather than a tarball containing this tarball
+  * Don't copy configufiles to fmpool (dir no longer exists)
+  * Enable dpkg-buildflags (hardening etc)
+  * Import ubuntu patches changes by doko (ubuntu) imported
+  * Add rsync as build-dep
+  * Use libtoolize and autoreconf (closes: #639720)
+  * Set debhelper version to 9
 
  -- Johan Van de Wauw johan.vandew...@gmail.com  Thu, 14 Aug 2014 22:19:24 
+0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/hdf4.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


[hdf4] branch master updated (b340bca - 9954ba9)

2014-09-03 Thread Johan Van de Wauw
This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a change to branch master
in repository hdf4.

  from  b340bca   Import ubuntu patches changes by doko (ubuntu) imported
   new  028fec2   Add rsync as build-dep
   new  bec88f7   Use libtoolize and autoreconf (closes: #639720)
   new  8fea8fd   Set debhelper version to 9
   new  9954ba9   Update changelog

The 4 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 | 10 +-
 debian/compat|  2 +-
 debian/control   |  8 ++--
 debian/rules |  6 --
 4 files changed, 20 insertions(+), 6 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/hdf4.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


[hdf4] 03/04: Set debhelper version to 9

2014-09-03 Thread Johan Van de Wauw
This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch master
in repository hdf4.

commit 8fea8fd8f43fe06931cf5eaef81dda3126d18473
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Wed Sep 3 21:26:12 2014 +0200

Set debhelper version to 9
---
 debian/compat  | 2 +-
 debian/control | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 5e0ec03..fb035cc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian GIS Project 
pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine fran...@debian.org
 Section: graphics
 Priority: optional
-Build-Depends: debhelper (= 7),
+Build-Depends: debhelper (= 9),
sharutils,
libjpeg-dev,
zlib1g-dev,

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/hdf4.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: pristine-tar data for grass_6.4.4.orig.tar.gz

2014-09-03 Thread Bas Couwenberg
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 a04dc2cc382f0ac54768184867f933ea93ad5785
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Aug 20 02:41:28 2014 +0200

pristine-tar data for grass_6.4.4.orig.tar.gz
---
 grass_6.4.4.orig.tar.gz.delta | Bin 0 - 234386 bytes
 grass_6.4.4.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/grass_6.4.4.orig.tar.gz.delta b/grass_6.4.4.orig.tar.gz.delta
new file mode 100644
index 000..ece8574
Binary files /dev/null and b/grass_6.4.4.orig.tar.gz.delta differ
diff --git a/grass_6.4.4.orig.tar.gz.id b/grass_6.4.4.orig.tar.gz.id
new file mode 100644
index 000..dc7c1e2
--- /dev/null
+++ b/grass_6.4.4.orig.tar.gz.id
@@ -0,0 +1 @@
+f4611bee52d2e10fa988d77cc210bf010393d756

-- 
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 pristine-tar created (now a04dc2c)

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch pristine-tar
in repository grass.

at  a04dc2c   pristine-tar data for grass_6.4.4.orig.tar.gz

This branch includes the following new commits:

   new  a04dc2c   pristine-tar data for grass_6.4.4.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.


-- 
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/20: Merge tag 'upstream/6.4.4'

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 7358d688d9c25950df74b9b4602c7b34d08c9b48
Merge: 3e122e8 f4aa610
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Sep 3 21:14:19 2014 +0200

Merge tag 'upstream/6.4.4'

Upstream version 6.4.4

 doc/.howto_release.txt.swp | Bin 0 - 16384 bytes
 .../docs/wxGUI.Attribute_Table_Manager.tmp.html|  73 +++
 gui/wxpython/docs/wxGUI.Components.tmp.html|  31 +
 gui/wxpython/docs/wxGUI.GCP_Manager.tmp.html   | 331 +++
 gui/wxpython/docs/wxGUI.Modeler.tmp.html   |  76 +++
 gui/wxpython/docs/wxGUI.Nviz.tmp.html  | 457 +++
 gui/wxpython/docs/wxGUI.PsMap.tmp.html | 221 +++
 gui/wxpython/docs/wxGUI.Vector_Digitizer.tmp.html  | 277 +
 gui/wxpython/docs/wxGUI.tmp.html   | 647 +
 9 files changed, 2113 insertions(+)

-- 
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 (3e122e8 - 4b48961)

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch master
in repository grass.

  from  3e122e8   add patch to fix help-about name parsing, change my email 
addr
  adds  2204d22   Missing commit of 6.4.3 in upstream branch added.
  adds  019c645   Updated upstream branch for 6.4.3
  adds  f4aa610   Imported Upstream version 6.4.4
   new  7358d68   Merge tag 'upstream/6.4.4'
   new  cd1c643   Add gbp.conf to use pristine-tar by default.
   new  286b7fc   Refresh patches.
   new  7a07c61   Restructure control file with cme, remove duplice section 
'science', add ${misc:Depends} for grass.
   new  c6a83fd   Remove obsolete ored build dependencies.
   new  cd4d422   Add myself to Uploaders.
   new  7ed2a72   Use {build,install}-arch targets in rules file.
   new  e4b4acd   Don't use hardening-includes, but dpkg-buildflags only.
   new  fb1f752   Pass CPPFLAGS and LDFLAGS to configure for their 
hardening flags.
   new  15d4418   Add lintian overrides for hardening-no-fortify-functions 
false positives.
   new  1efea68   Move image files to /usr/share, symlink them from 
/usr/lib.
   new  a4567cc   Add lintian overrides for image-file-in-usr-lib false 
positives.
   new  207512d   Set urgency to medium.
   new  55bbe45   Run dh_lintian in binary targets.
   new  79f92e9   Update copyright file using copyright-format 1.0.
   new  47d752b   Add wxpy3.0-compat.patch for wxPython 3.0 support, adapt 
for 6.4.4.
   new  dcc85f5   Remove extra license files.
   new  853db15   Add patch headers.
   new  a9866f3   Add patch to remove the sheband from animate.tcl which is 
source instead of executed.
   new  4b48961   Fix executable-not-elf-or-script issues with tcl files.

The 20 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   |  22 +-
 debian/control | 165 ++--
 debian/control.in  | 165 ++--
 debian/copyright   | 946 -
 debian/gbp.conf|  16 +
 debian/grass-core.lintian-overrides|  82 ++
 debian/grass-gui.dirs  |   1 +
 debian/grass-gui.dirs.in   |   1 +
 debian/grass-gui.install   |   5 +
 debian/grass-gui.install.in|   5 +
 debian/grass-gui.links |  43 +
 debian/grass-gui.links.in  |  43 +
 debian/patches/animate-wish.patch  |  12 +
 debian/patches/check4dev   |  11 +-
 debian/patches/help_about_names|  35 +-
 debian/patches/htmlgen-fakeroot|  11 +-
 debian/patches/instdir |  17 +-
 debian/patches/pager   |  11 +-
 debian/patches/series  |   2 +
 debian/patches/www-browser |  11 +-
 debian/patches/wxpy3.0-compat.patch| 304 +++
 debian/patches/xterm   |   9 +-
 debian/rules   |  70 +-
 doc/.howto_release.txt.swp | Bin 0 - 16384 bytes
 ...html = wxGUI.Attribute_Table_Manager.tmp.html} |  17 +
 gui/wxpython/docs/wxGUI.Components.tmp.html|  31 +
 ...GCP_Manager.html = wxGUI.GCP_Manager.tmp.html} |  17 +
 .../{wxGUI.Modeler.html = wxGUI.Modeler.tmp.html} |  17 +
 .../docs/{wxGUI.Nviz.html = wxGUI.Nviz.tmp.html}  |  17 +
 .../{wxGUI.PsMap.html = wxGUI.PsMap.tmp.html} |  17 +
 ...itizer.html = wxGUI.Vector_Digitizer.tmp.html} |  17 +
 gui/wxpython/docs/{wxGUI.html = wxGUI.tmp.html}   |  17 +
 32 files changed, 1872 insertions(+), 265 deletions(-)
 create mode 100644 debian/gbp.conf
 create mode 100644 debian/grass-core.lintian-overrides
 create mode 100644 debian/grass-gui.dirs
 create mode 100644 debian/grass-gui.dirs.in
 create mode 100644 debian/grass-gui.links
 create mode 100644 debian/grass-gui.links.in
 create mode 100644 debian/patches/animate-wish.patch
 create mode 100644 debian/patches/wxpy3.0-compat.patch
 create mode 100644 doc/.howto_release.txt.swp
 copy gui/wxpython/docs/{wxGUI.Attribute_Table_Manager.html = 
wxGUI.Attribute_Table_Manager.tmp.html} (71%)
 create mode 100644 gui/wxpython/docs/wxGUI.Components.tmp.html
 copy gui/wxpython/docs/{wxGUI.GCP_Manager.html = wxGUI.GCP_Manager.tmp.html} 
(94%)
 copy gui/wxpython/docs/{wxGUI.Modeler.html = wxGUI.Modeler.tmp.html} (73%)
 copy gui/wxpython/docs/{wxGUI.Nviz.html = wxGUI.Nviz.tmp.html} (96%)
 copy gui/wxpython/docs/{wxGUI.PsMap.html = 

[grass] 07/20: Use {build,install}-arch targets in rules file.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 7ed2a728ba0d25448116c5b22eb12d77643121ba
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Thu Aug 21 19:58:00 2014 +0200

Use {build,install}-arch targets in rules file.
---
 debian/changelog |  1 +
 debian/rules | 14 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a5adc5..97764ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low
   * Restructure control file with cme, remove duplice section 'science',
 add ${misc:Depends} for grass, remove obsolete ored build dependencies.
   * Add myself to Uploaders.
+  * Use {build,install}-arch targets in rules file.
 
  -- M. Hamish Bowman hamish.webm...@gmail.com  Mon, 11 Aug 2014 18:09:42 
+1200
 
diff --git a/debian/rules b/debian/rules
index ffe2bff..40023af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,10 +94,12 @@ config.status:
 
touch $@
 
+build: build-arch build-indep
+
 # This target generates arch-dep stuff, unfortunately most doc requires 
working bins to 
 # be properly generated...
-build: configure build-stamp
-build-stamp:  
+build-arch: configure build-arch-stamp
+build-arch-stamp:  
dh_testdir
$(MAKE) 
chmod 755 debian/fixpaths.sh debian/fixscripts.sh
@@ -152,7 +154,9 @@ true-clean:
rm -rf lib/$$LIBRARY/html lib/$$LIBRARY/latex ; \
done
 
-install: build
+install: install-arch install-indep
+
+install-arch: build-arch
dh_testdir
dh_testroot
dh_prep
@@ -252,7 +256,7 @@ install-indep: build-indep
-rm -f debian/tmp/programming-manual/html/jquery.js
 
 # Build architecture-independent files here.
-binary-indep: install install-indep 
+binary-indep: install-arch install-indep 
dh_testdir -i
dh_testroot -i
dh_installchangelogs -i CHANGES
@@ -268,7 +272,7 @@ binary-indep: install install-indep
dh_builddeb -i
 
 # Build architecture-dependent files here.
-binary-arch: install
+binary-arch: install-arch
dh_testdir -a
dh_testroot  -a
dh_installchangelogs -a CHANGES

-- 
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/20: Add lintian overrides for image-file-in-usr-lib false positives.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit a4567cc1e1dc76cd67131e2b319cbecc3f98e2f0
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Aug 23 17:34:29 2014 +0200

Add lintian overrides for image-file-in-usr-lib false positives.
---
 debian/changelog| 1 +
 debian/grass-core.lintian-overrides | 5 +
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d402d77..e87731a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low
   * Pass CPPFLAGS and LDFLAGS to configure for their hardening flags.
   * Add lintian overrides for hardening-no-fortify-functions false positives.
   * Move image files to /usr/share, symlink them from /usr/lib.
+  * Add lintian overrides for image-file-in-usr-lib false positives.
 
  -- M. Hamish Bowman hamish.webm...@gmail.com  Mon, 11 Aug 2014 18:09:42 
+1200
 
diff --git a/debian/grass-core.lintian-overrides 
b/debian/grass-core.lintian-overrides
index 6777223..1f57717 100644
--- a/debian/grass-core.lintian-overrides
+++ b/debian/grass-core.lintian-overrides
@@ -1,3 +1,8 @@
+# False positive, file is an executable not an image
+grass-core: image-file-in-usr-lib usr/lib/grass64/bin/r.out.png
+grass-core: image-file-in-usr-lib usr/lib/grass64/bin/r.out.tiff
+grass-core: image-file-in-usr-lib usr/lib/grass64/scripts/d.out.png
+
 # Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
 #  Fortify Source functions: no, only unprotected functions found!
 # unprotected: read

-- 
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] 08/20: Don't use hardening-includes, but dpkg-buildflags only.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit e4b4acde2d010224902d690883b17991640587b7
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Thu Aug 21 20:04:46 2014 +0200

Don't use hardening-includes, but dpkg-buildflags only.
---
 debian/changelog  |  1 +
 debian/control|  3 +--
 debian/control.in |  3 +--
 debian/rules  | 13 +
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97764ce..cd9c929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low
 add ${misc:Depends} for grass, remove obsolete ored build dependencies.
   * Add myself to Uploaders.
   * Use {build,install}-arch targets in rules file.
+  * Don't use hardening-includes, but dpkg-buildflags only.
 
  -- M. Hamish Bowman hamish.webm...@gmail.com  Mon, 11 Aug 2014 18:09:42 
+1200
 
diff --git a/debian/control b/debian/control
index b67bc89..20efa68 100644
--- a/debian/control
+++ b/debian/control
@@ -39,8 +39,7 @@ Build-Depends: autoconf2.13,
python-dev,
tcl-dev (= 8.5),
tk-dev (= 8.5),
-   unixodbc-dev,
-   hardening-includes
+   unixodbc-dev
 Build-Conflicts: wx2.6-headers
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/grass.git
diff --git a/debian/control.in b/debian/control.in
index 044f8eb..d60bd97 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -39,8 +39,7 @@ Build-Depends: autoconf2.13,
python-dev,
tcl-dev (= 8.5),
tk-dev (= 8.5),
-   unixodbc-dev,
-   hardening-includes
+   unixodbc-dev
 Build-Conflicts: wx2.6-headers
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/grass.git
diff --git a/debian/rules b/debian/rules
index 40023af..5fffdca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,20 +14,9 @@ ABI=$(shell echo `head -3 $(CURDIR)/include/VERSION` | sed 
-e 's/ //g' -e 's/RC/
 BASE_NAME=grass$(VERSION)
 PKG_NAME=grass
 
-include /usr/share/hardening-includes/hardening.make
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-# in Wheezy (and Jessie ia64) -fPIE conflicts with -fPIC. See example in
-# the hardening.make file.
-ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH_CPU),ia64)
-CFLAGS += $(HARDENING_CFLAGS_PIC) \
-$(filter-out 
$(HARDENING_DISABLE_PIE_CFLAGS_FILTER),$(HARDENING_CFLAGS))
-LDFLAGS+=$(HARDENING_LDFLAGS)
-else
-# in Jessie  Sid the problem seems fixed so we can proceed normally
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
-endif
+CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
 
 # TODO: fix these
 CFLAGS+=-Wno-error=format-security

-- 
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/20: Add gbp.conf to use pristine-tar by default.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit cd1c643b422efdd24eb8711ff619b96044ea4a3b
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Aug 20 02:48:35 2014 +0200

Add gbp.conf to use pristine-tar by default.
---
 debian/changelog |  3 +++
 debian/gbp.conf  | 16 
 2 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f35cb4e..57d0ed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ grass (6.4.4-1) UNRELEASED; urgency=low
   * Debhelper level set to 9. 
   * Vcs-* fields are now canonical to make lintian happy.
 
+  [ Bas Couwenberg ]
+  * Add gbp.conf to use pristine-tar by default.
+
  -- M. Hamish Bowman hamish.webm...@gmail.com  Mon, 11 Aug 2014 18:09:42 
+1200
 
 grass (6.4.3-3) unstable; urgency=medium
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..21d0417
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,16 @@
+[DEFAULT]
+
+# The default name for the upstream branch is upstream.
+# Change it if the name is different (for instance, master).
+upstream-branch = upstream
+
+# The default name for the Debian branch is master.
+# Change it if the name is different (for instance, debian/unstable).
+debian-branch = master
+
+# git-import-orig uses the following names for the upstream tags.
+# Change the value if you are not using git-import-orig
+upstream-tag = upstream/%(version)s
+
+# Always use pristine-tar.
+pristine-tar = True

-- 
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] 06/20: Add myself to Uploaders.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit cd4d4225a2f96872683b615be4db94cc6de16cd4
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Aug 20 05:09:11 2014 +0200

Add myself to Uploaders.
---
 debian/changelog  | 1 +
 debian/control| 3 ++-
 debian/control.in | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b1a737..9a5adc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low
   * Add gbp.conf to use pristine-tar by default.
   * Restructure control file with cme, remove duplice section 'science',
 add ${misc:Depends} for grass, remove obsolete ored build dependencies.
+  * Add myself to Uploaders.
 
  -- M. Hamish Bowman hamish.webm...@gmail.com  Mon, 11 Aug 2014 18:09:42 
+1200
 
diff --git a/debian/control b/debian/control
index 1a65c9a..b67bc89 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: grass
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: Francesco Paolo Lovergine fran...@debian.org
+Uploaders: Francesco Paolo Lovergine fran...@debian.org,
+   Bas Couwenberg sebas...@xs4all.nl
 Section: science
 Priority: optional
 Build-Depends: autoconf2.13,
diff --git a/debian/control.in b/debian/control.in
index ec960dd..044f8eb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,6 +1,7 @@
 Source: grass
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: Francesco Paolo Lovergine fran...@debian.org
+Uploaders: Francesco Paolo Lovergine fran...@debian.org,
+   Bas Couwenberg sebas...@xs4all.nl
 Section: science
 Priority: optional
 Build-Depends: autoconf2.13,

-- 
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/20: Restructure control file with cme, remove duplice section 'science', add ${misc:Depends} for grass.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 7a07c611fcef9512a1375f545978db14a4a5caf6
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Aug 20 05:00:57 2014 +0200

Restructure control file with cme, remove duplice section 'science', add 
${misc:Depends} for grass.
---
 debian/changelog  |   2 +
 debian/control| 166 --
 debian/control.in | 166 --
 3 files changed, 176 insertions(+), 158 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57d0ed8..7315753 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ grass (6.4.4-1) UNRELEASED; urgency=low
 
   [ Bas Couwenberg ]
   * Add gbp.conf to use pristine-tar by default.
+  * Restructure control file with cme, remove duplice section 'science',
+add ${misc:Depends} for grass.
 
  -- M. Hamish Bowman hamish.webm...@gmail.com  Mon, 11 Aug 2014 18:09:42 
+1200
 
diff --git a/debian/control b/debian/control
index 3f02cb5..1f52030 100644
--- a/debian/control
+++ b/debian/control
@@ -1,51 +1,57 @@
 Source: grass
-Section: science
-Priority: optional
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine fran...@debian.org
-Build-depends:
-  autoconf2.13, autotools-dev,
-  debhelper (= 9), 
-  doxygen,
-  fakeroot,
-  flex, bison,
-  graphviz,
-  libmotif-dev | lesstif2-dev,
-  libcairo2-dev,
-  libfftw3-dev,
-  libfreetype6-dev,
-  libgdal-dev,
-  libgeos-dev,
-  libglu1-mesa-dev | libglu1-xorg-dev, 
-  libjpeg-dev,
-  libpng-dev | libpng12-dev,
-  libtiff5-dev | libtiff-dev,
-  libmysqlclient-dev | libmysqlclient15-dev,
-  libncurses5-dev,
-  libpq-dev,
+Section: science
+Priority: optional
+Build-Depends: autoconf2.13,
+   autotools-dev,
+   debhelper (= 9),
+   doxygen,
+   fakeroot,
+   flex,
+   bison,
+   graphviz,
+   libmotif-dev | lesstif2-dev,
+   libcairo2-dev,
+   libfftw3-dev,
+   libfreetype6-dev,
+   libgdal-dev,
+   libgeos-dev,
+   libglu1-mesa-dev | libglu1-xorg-dev,
+   libjpeg-dev,
+   libpng-dev,
+   libtiff5-dev | libtiff-dev,
+   libmysqlclient-dev | libmysqlclient15-dev,
+   libncurses5-dev,
+   libpq-dev,
+   libproj-dev,
 # proj-bin needed for nad2bin during config
-  libproj-dev, proj-bin,
-  libreadline-dev | libreadline6-dev,
-  libsqlite3-dev,
-  libxmu-dev,
-#install optipng if compressing the PNG images in the programmers' manual
-#  optipng,
-  python (= 2.6.6-3~),
-  python-wxgtk2.8, libwxgtk2.8-dev,
-  python-dev,
-  tcl-dev (= 8.5), tk-dev (= 8.5),
-  unixodbc-dev,
-  hardening-includes
-Standards-Version: 3.9.5
+   proj-bin,
+   libreadline-dev | libreadline6-dev,
+   libsqlite3-dev,
+   libxmu-dev,
+# install optipng if compressing the PNG images in the programmers' manual
+#  optipng,
+   python,
+   python-wxgtk2.8,
+   libwxgtk2.8-dev,
+   python-dev,
+   tcl-dev (= 8.5),
+   tk-dev (= 8.5),
+   unixodbc-dev,
+   hardening-includes
 Build-Conflicts: wx2.6-headers
-Homepage: http://grass.osgeo.org/
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/grass.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/grass.git
+Homepage: http://grass.osgeo.org/
 
 Package: grass
-Section: metapackages
 Architecture: all
-Depends: grass-core, grass-gui
+Section: metapackages
+Depends: grass-core,
+ grass-gui,
+ ${misc:Depends}
 Recommends: grass-doc
 Suggests: grass-dev
 Description: Geographic Resources Analysis Support System (GRASS GIS)
@@ -59,38 +65,38 @@ Description: Geographic Resources Analysis Support System 
(GRASS GIS)
  Install this virtual package to get a full GRASS system.
 
 Package: grass-core
-Section: science
 Architecture: any
-Replaces: grass ( 6.4.2-1~)
-Breaks: grass ( 6.4.2-1~)
-Depends:
-  ${shlibs:Depends},
-  ${python:Depends},
+Depends: ${shlibs:Depends},
+ ${python:Depends},
 # numpy used by the GRASS Python Library
-  python-numpy,
-  ${misc:Depends}
-Recommends:
+ python-numpy,
+ ${misc:Depends}
+Recommends: gdal-bin,
 # cs2cs used by m.proj, gdalinfo+gdal_translate used by a number of scripts
-  gdal-bin, proj-bin
-Suggests:
-  grass-doc, grass-gui, grass-dev,
+proj-bin
+Suggests: grass-doc,
+  grass-gui,
+  grass-dev,
 # used by v.in.e00
-  e00compr, avce00,
+  e00compr,
+  avce00,
 # used by i.spectral
-  gnuplot,
+  gnuplot,
 # used by v.in.gpsbabel
-  gpsbabel,
+  

[grass] 09/20: Pass CPPFLAGS and LDFLAGS to configure for their hardening flags.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit fb1f7529f9563e29d3c48cb5d64afc174102a28d
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Thu Aug 21 20:38:15 2014 +0200

Pass CPPFLAGS and LDFLAGS to configure for their hardening flags.
---
 debian/changelog | 1 +
 debian/rules | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cd9c929..fac3680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low
   * Add myself to Uploaders.
   * Use {build,install}-arch targets in rules file.
   * Don't use hardening-includes, but dpkg-buildflags only.
+  * Pass CPPFLAGS and LDFLAGS to configure for their hardening flags.
 
  -- M. Hamish Bowman hamish.webm...@gmail.com  Mon, 11 Aug 2014 18:09:42 
+1200
 
diff --git a/debian/rules b/debian/rules
index 5fffdca..fc72e07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ config.status:

dh_autotools-dev_updateconfig
# Add here commands to configure the package.
-   CFLAGS=$(CFLAGS) ./configure \
+   CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) LDFLAGS=$(LDFLAGS) 
./configure \
 --host=$(DEB_HOST_GNU_TYPE) \
 --build=$(DEB_BUILD_GNU_TYPE) \
 --prefix=/usr/lib \

-- 
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/20: Refresh patches.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 286b7fc2f9d08e3b59740dd4111798488cd1ce12
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Aug 20 02:50:02 2014 +0200

Refresh patches.
---
 debian/patches/check4dev|  8 +++-
 debian/patches/help_about_names | 32 +++-
 debian/patches/htmlgen-fakeroot |  8 +++-
 debian/patches/instdir  | 14 +-
 debian/patches/pager|  8 +++-
 debian/patches/www-browser  |  8 +++-
 debian/patches/xterm|  6 ++
 7 files changed, 30 insertions(+), 54 deletions(-)

diff --git a/debian/patches/check4dev b/debian/patches/check4dev
index 0c905e5..7386cf2 100644
--- a/debian/patches/check4dev
+++ b/debian/patches/check4dev
@@ -1,8 +1,6 @@
-Index: grass/scripts/g.extension/g.extension
-===
 grass.orig/scripts/g.extension/g.extension 2012-02-24 18:06:25.980494464 
+1300
-+++ grass/scripts/g.extension/g.extension  2012-02-24 18:08:03.756783834 
+1300
-@@ -75,6 +75,14 @@
+--- a/scripts/g.extension/g.extension
 b/scripts/g.extension/g.extension
+@@ -75,6 +75,14 @@ if [ $1 != @ARGS_PARSED@ ] ; then
exec g.parser $0 $@
  fi
  
diff --git a/debian/patches/help_about_names b/debian/patches/help_about_names
index 713d260..0caced4 100644
--- a/debian/patches/help_about_names
+++ b/debian/patches/help_about_names
@@ -1,21 +1,11 @@
-Index: grass/gui/wxpython/gui_core/ghelp.py
-===
 grass.orig/gui/wxpython/gui_core/ghelp.py  (revision 58704)
-+++ grass/gui/wxpython/gui_core/ghelp.py   (revision 61335)
-@@ -605,15 +605,15 @@
- contribFile = codecs.open(contribfile, encoding = 'utf-8', mode = 
'r')
- contribs = list()
- errLines = list()
- for line in contribFile.readlines()[1:]:
- line = line.rstrip('\n')
- try:
- if extra:
--name, email, rfc2_agreed = line.split(',')
-+name, email, country, rfc2_agreed = line.split(',')
- else:
- cvs_id, name, email, country, osgeo_id, rfc2_agreed = 
line.split(',')
- except ValueError:
- errLines.append(line)
- continue
- if extra:
- contribs.append((name, email))
+--- a/gui/wxpython/gui_core/ghelp.py
 b/gui/wxpython/gui_core/ghelp.py
+@@ -609,7 +609,7 @@ class AboutWindow(wx.Frame):
+ line = line.rstrip('\n')
+ try:
+ if extra:
+-name, email, rfc2_agreed = line.split(',')
++name, email, country, rfc2_agreed = line.split(',')
+ else:
+ cvs_id, name, email, country, osgeo_id, rfc2_agreed = 
line.split(',')
+ except ValueError:
diff --git a/debian/patches/htmlgen-fakeroot b/debian/patches/htmlgen-fakeroot
index e61af5f..e4fd4ab 100644
--- a/debian/patches/htmlgen-fakeroot
+++ b/debian/patches/htmlgen-fakeroot
@@ -1,8 +1,6 @@
-Index: grass/include/Make/Html.make
-===
 grass.orig/include/Make/Html.make  2011-02-14 17:15:01.0 +0100
-+++ grass/include/Make/Html.make   2011-02-14 17:27:03.0 +0100
-@@ -34,7 +34,7 @@
+--- a/include/Make/Html.make
 b/include/Make/Html.make
+@@ -34,7 +34,7 @@ htmldesc = \
GISBASE=$(RUN_GISBASE) \
PATH=$(BIN):$$PATH \

$(LD_LIBRARY_PATH_VAR)=$(BIN):$(ARCH_LIBDIR):$($(LD_LIBRARY_PATH_VAR)) \
diff --git a/debian/patches/instdir b/debian/patches/instdir
index 755172b..d88a4ae 100644
--- a/debian/patches/instdir
+++ b/debian/patches/instdir
@@ -1,8 +1,6 @@
-Index: grass/configure
-===
 grass.orig/configure   2011-02-14 17:15:00.0 +0100
-+++ grass/configure2011-02-14 17:28:52.0 +0100
-@@ -1392,7 +1392,7 @@
+--- a/configure
 b/configure
+@@ -1432,7 +1432,7 @@ fi
  if test -n $MACOSX_APP ; then
  
INSTDIR='${prefix}'/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS
  else
@@ -11,10 +9,8 @@ Index: grass/configure
  fi
  
  
-Index: grass/grass.pc.in
-===
 grass.orig/grass.pc.in 2011-02-14 17:15:00.0 +0100
-+++ grass/grass.pc.in  2011-02-14 17:28:52.0 +0100
+--- a/grass.pc.in
 b/grass.pc.in
 @@ -1,12 +1,12 @@
  # Package Information for pkg-config
  
diff --git a/debian/patches/pager b/debian/patches/pager
index 379b8cd..2eeecd4 100644
--- a/debian/patches/pager
+++ b/debian/patches/pager
@@ -1,8 +1,6 @@
-Index: grass/lib/init/init.sh

[grass] 05/20: Remove obsolete ored build dependencies.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit c6a83fdb5774d799672cd34c2d49853f287bc1dd
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Aug 20 05:05:41 2014 +0200

Remove obsolete ored build dependencies.
---
 debian/changelog  | 2 +-
 debian/control| 8 
 debian/control.in | 8 
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7315753..8b1a737 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low
   [ Bas Couwenberg ]
   * Add gbp.conf to use pristine-tar by default.
   * Restructure control file with cme, remove duplice section 'science',
-add ${misc:Depends} for grass.
+add ${misc:Depends} for grass, remove obsolete ored build dependencies.
 
  -- M. Hamish Bowman hamish.webm...@gmail.com  Mon, 11 Aug 2014 18:09:42 
+1200
 
diff --git a/debian/control b/debian/control
index 1f52030..1a65c9a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,17 +17,17 @@ Build-Depends: autoconf2.13,
libfreetype6-dev,
libgdal-dev,
libgeos-dev,
-   libglu1-mesa-dev | libglu1-xorg-dev,
+   libglu1-mesa-dev,
libjpeg-dev,
libpng-dev,
-   libtiff5-dev | libtiff-dev,
-   libmysqlclient-dev | libmysqlclient15-dev,
+   libtiff-dev,
+   libmysqlclient-dev,
libncurses5-dev,
libpq-dev,
libproj-dev,
 # proj-bin needed for nad2bin during config
proj-bin,
-   libreadline-dev | libreadline6-dev,
+   libreadline-dev,
libsqlite3-dev,
libxmu-dev,
 # install optipng if compressing the PNG images in the programmers' manual
diff --git a/debian/control.in b/debian/control.in
index 9dfeb28..ec960dd 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -17,17 +17,17 @@ Build-Depends: autoconf2.13,
libfreetype6-dev,
libgdal-dev,
libgeos-dev,
-   libglu1-mesa-dev | libglu1-xorg-dev,
+   libglu1-mesa-dev,
libjpeg-dev,
libpng-dev,
-   libtiff5-dev | libtiff-dev,
-   libmysqlclient-dev | libmysqlclient15-dev,
+   libtiff-dev,
+   libmysqlclient-dev,
libncurses5-dev,
libpq-dev,
libproj-dev,
 # proj-bin needed for nad2bin during config
proj-bin,
-   libreadline-dev | libreadline6-dev,
+   libreadline-dev,
libsqlite3-dev,
libxmu-dev,
 # install optipng if compressing the PNG images in the programmers' manual

-- 
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] 10/20: Add lintian overrides for hardening-no-fortify-functions false positives.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 15d44183d93f09993819ef0fadf7a11e48d2fb23
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Aug 22 01:24:23 2014 +0200

Add lintian overrides for hardening-no-fortify-functions false positives.
---
 debian/changelog|  1 +
 debian/grass-core.lintian-overrides | 77 +
 2 files changed, 78 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fac3680..b54cc04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low
   * Use {build,install}-arch targets in rules file.
   * Don't use hardening-includes, but dpkg-buildflags only.
   * Pass CPPFLAGS and LDFLAGS to configure for their hardening flags.
+  * Add lintian overrides for hardening-no-fortify-functions false positives.
 
  -- M. Hamish Bowman hamish.webm...@gmail.com  Mon, 11 Aug 2014 18:09:42 
+1200
 
diff --git a/debian/grass-core.lintian-overrides 
b/debian/grass-core.lintian-overrides
new file mode 100644
index 000..6777223
--- /dev/null
+++ b/debian/grass-core.lintian-overrides
@@ -0,0 +1,77 @@
+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
+#  Fortify Source functions: no, only unprotected functions found!
+# unprotected: read
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.grow.distance
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.dominance
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.edgedensity
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.mpa
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.mps
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.padcv
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.padrange
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.padsd
+grass-core: hardening-no-fortify-functions 
usr/lib/grass64/bin/r.li.patchdensity
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.patchnum
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.pielou
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.renyi
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.richness
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.shannon
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.shape
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.simpson
+grass-core: hardening-no-fortify-functions usr/lib/grass64/etc/lock
+
+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
+#  Fortify Source functions: no, only unprotected functions found!
+# unprotected: fread
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.in.arc
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.in.bin
+
+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
+#  Fortify Source functions: no, only unprotected functions found!
+# unprotected: fgets
+# unprotected: fread
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.in.ascii
+
+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
+#  Fortify Source functions: no, only unprotected functions found!
+# unprotected: strcat
+# unprotected: read
+# unprotected: strcpy
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.li.cwed
+
+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
+#  Fortify Source functions: no, only unprotected functions found!
+# unprotected: fgets
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r.null
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r3.mask
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/v.extract
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/v.lrs.segment
+grass-core: hardening-no-fortify-functions usr/lib/grass64/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/grass64/bin/r.topidx
+grass-core: hardening-no-fortify-functions usr/lib/grass64/bin/r3.in.ascii
+grass-core: hardening-no-fortify-functions usr/lib/grass64/etc/modcats
+grass-core: hardening-no-fortify-functions usr/lib/grass64/etc/modcolr
+
+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
+#  Fortify Source functions: no, only unprotected functions found!
+# unprotected: strcpy
+grass-core: hardening-no-fortify-functions usr/lib/grass64/etc/lister/cell
+grass-core: hardening-no-fortify-functions usr/lib/grass64/etc/lister/vector
+grass-core: hardening-no-fortify-functions usr/lib/grass64/etc/modhist
+
+# Build uses 

[grass] 20/20: Fix executable-not-elf-or-script issues with tcl files.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 4b4896169048a44328490f698f143cd5656d308e
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Sep 3 23:57:23 2014 +0200

Fix executable-not-elf-or-script issues with tcl files.
---
 debian/rules | 16 
 1 file changed, 16 insertions(+)

diff --git a/debian/rules b/debian/rules
index 032c151..248e54f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,6 +182,22 @@ install-arch: build-arch
rm -f debian/tmp/usr/lib/$(BASE_NAME)/etc/$$DIR/*.pyc ; \
done
 
+   # Fix permissions
+   chmod 775 debian/tmp/usr/lib/$(BASE_NAME)/etc/gm/tksys.tcl
+   chmod 644 debian/tmp/usr/lib/$(BASE_NAME)/etc/gm/animate.tcl
+   chmod 644 
debian/tmp/usr/lib/$(BASE_NAME)/etc/nviz2.2/scripts/ACS_utils.tcl
+   chmod 644 
debian/tmp/usr/lib/$(BASE_NAME)/etc/nviz2.2/scripts/configIndex
+   chmod 644 
debian/tmp/usr/lib/$(BASE_NAME)/etc/nviz2.2/scripts/flythrough.tcl
+   chmod 644 
debian/tmp/usr/lib/$(BASE_NAME)/etc/nviz2.2/scripts/nviz_params
+   chmod 644 
debian/tmp/usr/lib/$(BASE_NAME)/etc/nviz2.2/scripts/panel_arrow.tcl
+   chmod 644 
debian/tmp/usr/lib/$(BASE_NAME)/etc/nviz2.2/scripts/panel_legend.tcl
+   chmod 644 
debian/tmp/usr/lib/$(BASE_NAME)/etc/nviz2.2/scripts/panel_resize.tcl
+   chmod 644 
debian/tmp/usr/lib/$(BASE_NAME)/etc/nviz2.2/scripts/panel_fringe.tcl
+   chmod 644 
debian/tmp/usr/lib/$(BASE_NAME)/etc/nviz2.2/scripts/site_attr.tcl
+   chmod 644 
debian/tmp/usr/lib/$(BASE_NAME)/etc/r.li.setup/r.li.windows.tcl
+   chmod 644 
debian/tmp/usr/lib/$(BASE_NAME)/etc/r.li.setup/r.li.setup.procedures.tcl
+   chmod 644 debian/tmp/usr/lib/$(BASE_NAME)/etc/file_option.tcl
+
# change section from 1 to .1grass 
mv debian/tmp/usr/lib/$(BASE_NAME)/man/man1/grass6.1 
debian/$(BASE_NAME).1
for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1; 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] 13/20: Set urgency to medium.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 207512d38e30ad0540ce5b5bbce9bd4fedbf3331
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Aug 23 17:37:44 2014 +0200

Set urgency to medium.
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e87731a..7c52c47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-grass (6.4.4-1) UNRELEASED; urgency=low
+grass (6.4.4-1) UNRELEASED; urgency=medium
 
   [ M. Hamish Bowman ]
   * Packaged new upstream version, drop redundant patches.
@@ -21,7 +21,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low
   * Move image files to /usr/share, symlink them from /usr/lib.
   * Add lintian overrides for image-file-in-usr-lib false positives.
 
- -- M. Hamish Bowman hamish.webm...@gmail.com  Mon, 11 Aug 2014 18:09:42 
+1200
+ -- Bas Couwenberg sebas...@xs4all.nl  Sat, 23 Aug 2014 17:37:14 +0200
 
 grass (6.4.3-3) unstable; urgency=medium
 

-- 
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/20: Remove extra license files.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit dcc85f5b5bdc5b9e4fd4a5f5ad3aa72d2baed02d
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Sep 3 23:24:29 2014 +0200

Remove extra license files.
---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/rules b/debian/rules
index 64cfe3f..032c151 100755
--- a/debian/rules
+++ b/debian/rules
@@ -166,6 +166,9 @@ install-arch: build-arch

# delete extra license files
rm -f debian/tmp/usr/lib/$(BASE_NAME)/bwidget/LICENSE.txt
+   rm -f debian/tmp/usr/lib/$(BASE_NAME)/bwidget/LGPL-2.1.txt
+   rm -f debian/tmp/usr/lib/$(BASE_NAME)/etc/gem/skeleton/license
+   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 \

-- 
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] 11/20: Move image files to /usr/share, symlink them from /usr/lib.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 1efea680e0edd3e6f6a5e0bc4c3be209b0f1b8fd
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Aug 23 12:50:14 2014 +0200

Move image files to /usr/share, symlink them from /usr/lib.
---
 debian/changelog|  1 +
 debian/grass-gui.dirs   |  1 +
 debian/grass-gui.dirs.in|  1 +
 debian/grass-gui.install|  5 +
 debian/grass-gui.install.in |  5 +
 debian/grass-gui.links  | 43 +++
 debian/grass-gui.links.in   | 43 +++
 debian/rules| 20 +++-
 8 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b54cc04..d402d77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low
   * Don't use hardening-includes, but dpkg-buildflags only.
   * Pass CPPFLAGS and LDFLAGS to configure for their hardening flags.
   * Add lintian overrides for hardening-no-fortify-functions false positives.
+  * Move image files to /usr/share, symlink them from /usr/lib.
 
  -- M. Hamish Bowman hamish.webm...@gmail.com  Mon, 11 Aug 2014 18:09:42 
+1200
 
diff --git a/debian/grass-gui.dirs b/debian/grass-gui.dirs
new file mode 100644
index 000..badba4a
--- /dev/null
+++ b/debian/grass-gui.dirs
@@ -0,0 +1 @@
+usr/share/grass64
diff --git a/debian/grass-gui.dirs.in b/debian/grass-gui.dirs.in
new file mode 100644
index 000..f9ab983
--- /dev/null
+++ b/debian/grass-gui.dirs.in
@@ -0,0 +1 @@
+usr/share/grass@VERSION@
diff --git a/debian/grass-gui.install b/debian/grass-gui.install
index 8d4aa01..a0bb9b5 100644
--- a/debian/grass-gui.install
+++ b/debian/grass-gui.install
@@ -9,3 +9,8 @@ usr/lib/grass64/etc/v.digit
 usr/lib/grass64/etc/wxpython
 usr/lib/grass64/bin/v.digit
 usr/lib/grass64/bin/xganim
+usr/share/grass64/bwidget
+usr/share/grass64/etc/dm
+usr/share/grass64/etc/gm
+usr/share/grass64/etc/gui
+usr/share/grass64/etc/nviz2.2
diff --git a/debian/grass-gui.install.in b/debian/grass-gui.install.in
index 046ab8f..901a003 100644
--- a/debian/grass-gui.install.in
+++ b/debian/grass-gui.install.in
@@ -9,3 +9,8 @@ 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
diff --git a/debian/grass-gui.links b/debian/grass-gui.links
new file mode 100644
index 000..28abf0b
--- /dev/null
+++ b/debian/grass-gui.links
@@ -0,0 +1,43 @@
+usr/share/grass64/bwidget/images usr/lib/grass64/bwidget/images
+usr/share/grass64/etc/dm/barscale.gif usr/lib/grass64/etc/dm/barscale.gif
+usr/share/grass64/etc/dm/chart.gif usr/lib/grass64/etc/dm/chart.gif
+usr/share/grass64/etc/dm/cmd.gif usr/lib/grass64/etc/dm/cmd.gif
+usr/share/grass64/etc/dm/columns.gif usr/lib/grass64/etc/dm/columns.gif
+usr/share/grass64/etc/dm/copy.gif usr/lib/grass64/etc/dm/copy.gif
+usr/share/grass64/etc/dm/cut.gif usr/lib/grass64/etc/dm/cut.gif
+usr/share/grass64/etc/dm/dig.gif usr/lib/grass64/etc/dm/dig.gif
+usr/share/grass64/etc/dm/display.all.gif usr/lib/grass64/etc/dm/display.all.gif
+usr/share/grass64/etc/dm/display.gif usr/lib/grass64/etc/dm/display.gif
+usr/share/grass64/etc/dm/display.region.gif 
usr/lib/grass64/etc/dm/display.region.gif
+usr/share/grass64/etc/dm/dtext.gif usr/lib/grass64/etc/dm/dtext.gif
+usr/share/grass64/etc/dm/erase.gif usr/lib/grass64/etc/dm/erase.gif
+usr/share/grass64/etc/dm/fly.gif usr/lib/grass64/etc/dm/fly.gif
+usr/share/grass64/etc/dm/frames.gif usr/lib/grass64/etc/dm/frames.gif
+usr/share/grass64/etc/dm/fttext.gif usr/lib/grass64/etc/dm/fttext.gif
+usr/share/grass64/etc/dm/grass.gif usr/lib/grass64/etc/dm/grass.gif
+usr/share/grass64/etc/dm/grid.gif usr/lib/grass64/etc/dm/grid.gif
+usr/share/grass64/etc/dm/group.gif usr/lib/grass64/etc/dm/group.gif
+usr/share/grass64/etc/dm/intro.gif usr/lib/grass64/etc/dm/intro.gif
+usr/share/grass64/etc/dm/labels.gif usr/lib/grass64/etc/dm/labels.gif
+usr/share/grass64/etc/dm/legend.gif usr/lib/grass64/etc/dm/legend.gif
+usr/share/grass64/etc/dm/measure.gif usr/lib/grass64/etc/dm/measure.gif
+usr/share/grass64/etc/dm/new.gif usr/lib/grass64/etc/dm/new.gif
+usr/share/grass64/etc/dm/nviz.gif usr/lib/grass64/etc/dm/nviz.gif
+usr/share/grass64/etc/dm/open.gif usr/lib/grass64/etc/dm/open.gif
+usr/share/grass64/etc/dm/pan.gif usr/lib/grass64/etc/dm/pan.gif
+usr/share/grass64/etc/dm/position.gif usr/lib/grass64/etc/dm/position.gif
+usr/share/grass64/etc/dm/print.gif usr/lib/grass64/etc/dm/print.gif
+usr/share/grass64/etc/dm/query.gif usr/lib/grass64/etc/dm/query.gif
+usr/share/grass64/etc/dm/raster.gif usr/lib/grass64/etc/dm/raster.gif
+usr/share/grass64/etc/dm/rgbhis.gif 

[grass] 15/20: Update copyright file using copyright-format 1.0.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 79f92e99c008b4ab2288c7a89644ecc2b8b85c3f
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Sep 3 21:07:31 2014 +0200

Update copyright file using copyright-format 1.0.
---
 debian/changelog |   1 +
 debian/copyright | 946 +--
 2 files changed, 915 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c52c47..f84da54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ grass (6.4.4-1) UNRELEASED; urgency=medium
   * Add lintian overrides for hardening-no-fortify-functions false positives.
   * Move image files to /usr/share, symlink them from /usr/lib.
   * Add lintian overrides for image-file-in-usr-lib false positives.
+  * Update copyright file using copyright-format 1.0.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sat, 23 Aug 2014 17:37:14 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 819b681..12fee07 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,42 +1,924 @@
-This package was debianized by Markus Neteler nete...@itc.it on
-Mon, 10 Nov 2003 17:59:04 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: GRASS GIS
+Upstream-Contact: GRASS Development Team grass-...@lists.osgeo.org
+Source: http://grass.osgeo.org/
 
-It was downloaded from http://grass.osgeo.org
+Files: *
+Copyright: 1994-2014, GRASS Development Team
+License: GPL-2.0+
 
-The upstream contributors are listed in the AUTHORS file.
+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+
 
-The Geographic Resources Analysis and Support System (GRASS)
-Geographic Information System (GIS) is Copyright by members
-of the GRASS Development Team.
+Files: gui/scripts/v.type_wrapper.py
+Copyright: 2007-2008, Hamish Bowman, and the GRASS Development Team
+License: GPL-2.0+
 
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
+Files: doc/python/m.distance.py
+Copyright: 2008-2011, Hamish Bowman, and the GRASS Development Team
+License: GPL-2.0+
 
-Parts of GRASS are not copyright by the GRASS development team.
-The original authors hold the copyrights and you have to abide
-to their licensing terms where noted.
-(Keep in mind that code linking into GRASS can only be distributed
-if compatible with the GPL.)
+Files: lib/display/symbol.c
+Copyright: 2005-2007, M. Hamish Bowman, and the GRASS Development Team
+License: GPL-2.0+
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License (GPL) for more details.
+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+
 
-On Debian systems, the complete text of the GNU General Public
-License can be found in the /usr/share/common-licenses/GPL file.
+Files: gem/reg_entries.c
+ gem/reg_entries.h
+ gem/reg_html.c
+ gem/reg_html.h
+Copyright: 2005, User
+License: GPL-2.0+
 
-Questions regarding GRASS GIS should be directed to the
-GRASS Development Team at the following address:
+Files: gui/scripts/g.extension.rebuild.all.py
+Copyright: 2011, Martin Landa, and the GRASS Development Team
+License: GPL-2.0+
 
- GRASS Development Team
- c/o M. Neteler
- Fondazione Mach - Centre for Alpine Ecology
- 38100 Viote del Monte Bondone (Trento)
- Italy
- neteler AT cealp.it
+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: 

[grass] 18/20: Add patch headers.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 853db15903a9ab2d68acb01b63e4f4d99a1adabe
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Sep 3 23:40:50 2014 +0200

Add patch headers.
---
 debian/patches/check4dev| 3 +++
 debian/patches/help_about_names | 3 +++
 debian/patches/htmlgen-fakeroot | 3 +++
 debian/patches/instdir  | 3 +++
 debian/patches/pager| 3 +++
 debian/patches/www-browser  | 3 +++
 debian/patches/xterm| 3 +++
 7 files changed, 21 insertions(+)

diff --git a/debian/patches/check4dev b/debian/patches/check4dev
index 7386cf2..aac7bf5 100644
--- a/debian/patches/check4dev
+++ b/debian/patches/check4dev
@@ -1,3 +1,6 @@
+Description: Check if we have the grass include and Make files
+Author: M. Hamish Bowman hamish.webm...@gmail.com
+
 --- a/scripts/g.extension/g.extension
 +++ b/scripts/g.extension/g.extension
 @@ -75,6 +75,14 @@ if [ $1 != @ARGS_PARSED@ ] ; then
diff --git a/debian/patches/help_about_names b/debian/patches/help_about_names
index 0caced4..7ebc5e4 100644
--- a/debian/patches/help_about_names
+++ b/debian/patches/help_about_names
@@ -1,3 +1,6 @@
+Description: Fix help-about name parsingix help-about name parsing.
+Author: M. Hamish Bowman hamish.webm...@gmail.com
+
 --- a/gui/wxpython/gui_core/ghelp.py
 +++ b/gui/wxpython/gui_core/ghelp.py
 @@ -609,7 +609,7 @@ class AboutWindow(wx.Frame):
diff --git a/debian/patches/htmlgen-fakeroot b/debian/patches/htmlgen-fakeroot
index e4fd4ab..52625f6 100644
--- a/debian/patches/htmlgen-fakeroot
+++ b/debian/patches/htmlgen-fakeroot
@@ -1,3 +1,6 @@
+Description: Use fakeroot to run htmlgen
+Author: Steve Halasz
+
 --- a/include/Make/Html.make
 +++ b/include/Make/Html.make
 @@ -34,7 +34,7 @@ htmldesc = \
diff --git a/debian/patches/instdir b/debian/patches/instdir
index d88a4ae..4bb6436 100644
--- a/debian/patches/instdir
+++ b/debian/patches/instdir
@@ -1,3 +1,6 @@
+Description: Don't include GRASS_VERSION_RELEASE in path.
+Author: Francesco Paolo Lovergine fran...@debian.org
+
 --- a/configure
 +++ b/configure
 @@ -1432,7 +1432,7 @@ fi
diff --git a/debian/patches/pager b/debian/patches/pager
index 2eeecd4..598eae5 100644
--- a/debian/patches/pager
+++ b/debian/patches/pager
@@ -1,3 +1,6 @@
+Description: Perfer pager over more.
+Author: Francesco Paolo Lovergine fran...@debian.org
+
 --- a/lib/init/init.sh
 +++ b/lib/init/init.sh
 @@ -301,10 +301,12 @@ export GRASS_LD_LIBRARY_PATH
diff --git a/debian/patches/www-browser b/debian/patches/www-browser
index f452d98..ce196ff 100644
--- a/debian/patches/www-browser
+++ b/debian/patches/www-browser
@@ -1,3 +1,6 @@
+Description: Prefer xdg-open and x-www-browser for HTML browser.
+Author: Francesco Paolo Lovergine fran...@debian.org
+
 --- a/lib/init/init.sh
 +++ b/lib/init/init.sh
 @@ -350,53 +350,13 @@ fi
diff --git a/debian/patches/xterm b/debian/patches/xterm
index 12f6acf..990c335 100644
--- a/debian/patches/xterm
+++ b/debian/patches/xterm
@@ -1,3 +1,6 @@
+Description: Prefer x-terminal-emulator as terminal.
+Author: Francesco Paolo Lovergine fran...@debian.org
+
 --- a/lib/init/grass-xterm-wrapper
 +++ b/lib/init/grass-xterm-wrapper
 @@ -3,7 +3,7 @@

-- 
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/20: Run dh_lintian in binary targets.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 55bbe45b9881321ce3fb4dda3728d2a8abe7c3a1
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Aug 23 17:41:56 2014 +0200

Run dh_lintian in binary targets.
---
 debian/rules | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/rules b/debian/rules
index a2005b9..64cfe3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -269,6 +269,7 @@ binary-indep: install-arch install-indep
dh_installchangelogs -i CHANGES
dh_installdocs -i
dh_install -i
+   dh_lintian -i
dh_link -i
dh_strip -i
dh_compress -i
@@ -302,6 +303,7 @@ binary-arch: install-arch
done
dh_installmenu -a
dh_installman -p$(PKG_NAME) debian/$(BASE_NAME).1 -a
+   dh_lintian -a
dh_link -a
dh_python2
dh_python2 /usr/lib/$(BASE_NAME)/etc

-- 
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] 19/20: Add patch to remove the sheband from animate.tcl which is source instead of executed.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit a9866f307b6c560c87750f01c2782968cf4c2294
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Sep 3 23:49:12 2014 +0200

Add patch to remove the sheband from animate.tcl which is source instead of 
executed.
---
 debian/changelog  |  2 ++
 debian/patches/animate-wish.patch | 12 
 debian/patches/series |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 72b9379..b498d4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ grass (6.4.4-1) UNRELEASED; urgency=medium
   * Add wxpy3.0-compat.patch for wxPython 3.0 support, adapt for 6.4.4.
 Thanks to Olly Betts for the patch.
 (closes: #757308)
+  * Add patch to remove the sheband from animate.tcl which is source instead
+of executed.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sat, 23 Aug 2014 17:37:14 +0200
 
diff --git a/debian/patches/animate-wish.patch 
b/debian/patches/animate-wish.patch
new file mode 100644
index 000..14a651e
--- /dev/null
+++ b/debian/patches/animate-wish.patch
@@ -0,0 +1,12 @@
+Description: Remove shebang, tcl file is sourced not executed.
+Author: Bas Couwenberg sebas...@xs4all.nl
+
+--- a/gui/tcltk/gis.m/animate.tcl
 b/gui/tcltk/gis.m/animate.tcl
+@@ -1,6 +1,3 @@
+-#!/bin/sh
+-# the next line restarts using wish \
+-# exec $GRASS_WISH $0 $@
+ ##
+ #
+ # animate.tcl
diff --git a/debian/patches/series b/debian/patches/series
index fdce13e..0809401 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ instdir
 check4dev
 help_about_names
 wxpy3.0-compat.patch
+animate-wish.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] 16/20: Add wxpy3.0-compat.patch for wxPython 3.0 support, adapt for 6.4.4.

2014-09-03 Thread Bas Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository grass.

commit 47d752b068bd9af26f976f9625e280f1c79307c3
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Wed Sep 3 22:39:26 2014 +0200

Add wxpy3.0-compat.patch for wxPython 3.0 support, adapt for 6.4.4.
---
 debian/changelog|   3 +
 debian/control  |   7 +-
 debian/control.in   |   7 +-
 debian/patches/series   |   1 +
 debian/patches/wxpy3.0-compat.patch | 304 
 5 files changed, 314 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f84da54..72b9379 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,9 @@ grass (6.4.4-1) UNRELEASED; urgency=medium
   * Move image files to /usr/share, symlink them from /usr/lib.
   * Add lintian overrides for image-file-in-usr-lib false positives.
   * Update copyright file using copyright-format 1.0.
+  * Add wxpy3.0-compat.patch for wxPython 3.0 support, adapt for 6.4.4.
+Thanks to Olly Betts for the patch.
+(closes: #757308)
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sat, 23 Aug 2014 17:37:14 +0200
 
diff --git a/debian/control b/debian/control
index 20efa68..205cdf9 100644
--- a/debian/control
+++ b/debian/control
@@ -30,17 +30,16 @@ Build-Depends: autoconf2.13,
proj-bin,
libreadline-dev,
libsqlite3-dev,
+   libwxgtk3.0-dev,
libxmu-dev,
 # install optipng if compressing the PNG images in the programmers' manual
 #  optipng,
python,
-   python-wxgtk2.8,
-   libwxgtk2.8-dev,
+   python-wxgtk3.0,
python-dev,
tcl-dev (= 8.5),
tk-dev (= 8.5),
unixodbc-dev
-Build-Conflicts: wx2.6-headers
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/grass.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/grass.git
@@ -112,7 +111,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
  grass-core,
  ${python:Depends},
- python-wxgtk2.8,
+ python-wxgtk3.0,
 # pyGL needed for wxNviz
  python-opengl,
  xterm | x-terminal-emulator,
diff --git a/debian/control.in b/debian/control.in
index d60bd97..b6d2c41 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -30,17 +30,16 @@ Build-Depends: autoconf2.13,
proj-bin,
libreadline-dev,
libsqlite3-dev,
+   libwxgtk3.0-dev,
libxmu-dev,
 # install optipng if compressing the PNG images in the programmers' manual
 #  optipng,
python,
-   python-wxgtk2.8,
-   libwxgtk2.8-dev,
+   python-wxgtk3.0,
python-dev,
tcl-dev (= 8.5),
tk-dev (= 8.5),
unixodbc-dev
-Build-Conflicts: wx2.6-headers
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/grass.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/grass.git
@@ -112,7 +111,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
  grass-core,
  ${python:Depends},
- python-wxgtk2.8,
+ python-wxgtk3.0,
 # pyGL needed for wxNviz
  python-opengl,
  xterm | x-terminal-emulator,
diff --git a/debian/patches/series b/debian/patches/series
index 05819e4..fdce13e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ xterm
 instdir
 check4dev
 help_about_names
+wxpy3.0-compat.patch
diff --git a/debian/patches/wxpy3.0-compat.patch 
b/debian/patches/wxpy3.0-compat.patch
new file mode 100644
index 000..34ed29d
--- /dev/null
+++ b/debian/patches/wxpy3.0-compat.patch
@@ -0,0 +1,304 @@
+Description: Fix to work with wxPython 3.0
+Author: Olly Betts o...@survex.com
+Last-Update: 2014-08-16
+
+--- a/gui/wxpython/wxplot/profile.py
 b/gui/wxpython/wxplot/profile.py
+@@ -332,7 +332,7 @@ class ProfileFrame(BasePlotFrame):
+ dlg = wx.FileDialog(parent = self,
+ message = _(Choose prefix for file(s) where to 
save profile values...),
+ defaultDir = os.getcwd(), 
+-wildcard = _(Comma separated value 
(*.csv)|*.csv), style = wx.SAVE)
++wildcard = _(Comma separated value 
(*.csv)|*.csv), style = wx.FD_SAVE)
+ pfile = []
+ if dlg.ShowModal() == wx.ID_OK:
+ path = dlg.GetPath()
+--- a/gui/wxpython/psmap/frame.py
 b/gui/wxpython/psmap/frame.py
+@@ -392,7 +392,7 @@ class PsMapFrame(wx.Frame):
+ filename = ''
+ dlg = wx.FileDialog(self, message = _(Save file as), defaultDir = 
, 
+ defaultFile = mapName, wildcard = wildcard,
+-style =