[SCM] grass branch, master, updated. upstream/6.4.0-23-g3a56bef
The following commit has been merged in the master branch:
commit 3a56befd7c53594c281bd2990222bbce9896817d
Author: Francesco Paolo Lovergine
Date: Wed Apr 13 17:09:41 2011 +0200
Regenerated templates.
diff --git a/debian/changelog b/debian/changelog
index 6d5585d..02cee17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-grass (6.4.1~rc2-1) unstable; urgency=low
+grass (6.4.1-1) unstable; urgency=low
- * New upstream release candidate.
+ * New upstream version.
* Now build-dep on libjpeg-dev and current libreadline6-dev.
* Removed patch swig: obsolete.
* Policy bumped to 3.9.2, without changes.
- -- Francesco Paolo Lovergine Tue, 12 Apr 2011 22:51:13
+0200
+ -- Francesco Paolo Lovergine Wed, 13 Apr 2011 17:08:41
+0200
grass (6.4.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8019652..1b69f71 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Depends: ${shlibs:Depends}, xterm | x-terminal-emulator,
python (>= 2.5), python
Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
gnuplot, xml2, wget | curl, netpbm
Recommends: ghostscript
-Provides: grass641-2
+Provides: grass641
Description: Geographic Resources Analysis Support System
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
--
Geographic Resources Analysis Support System
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.0-23-g3a56bef
The following commit has been merged in the master branch: commit 897dbdaa8ce339953e76f6102b0868a7effb86cb Merge: bf4822eec23f51cebd4999c095b2fbef2c9f8d93 62d9cea37b737adbf97d82f63c12643f91668bbf Author: Francesco Paolo Lovergine Date: Wed Apr 13 17:07:49 2011 +0200 Merge commit 'upstream/6.4.1' Conflicts: include/VERSION -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.0-23-g3a56bef
The following commit has been merged in the master branch: commit bf4822eec23f51cebd4999c095b2fbef2c9f8d93 Author: Francesco Paolo Lovergine Date: Wed Apr 13 17:05:47 2011 +0200 Removed again vdigit support. diff --git a/debian/rules b/debian/rules index 2882a55..d599d1a 100755 --- a/debian/rules +++ b/debian/rules @@ -88,8 +88,6 @@ build-stamp: dh_testdir $(MAKE) chmod 755 debian/fixpaths.sh debian/fixscripts.sh - # build vdigit too - $(MAKE) -C gui/wxpython/vdigit touch $@ # This target generates truly arch-indep stuff @@ -153,12 +151,6 @@ install: build INST_DIR=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ PREFIX=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ BINDIR=$(CURDIR)/debian/tmp/usr/bin - # install vdigit - $(MAKE) -C gui/wxpython/vdigit install \ - INST_DIR=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ - PREFIX=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ - BINDIR=$(CURDIR)/debian/tmp/usr/bin - # fix all the braindead scripts debian/fixscripts.sh -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.0-23-g3a56bef
The following commit has been merged in the master branch: commit 36f9d25cb85087ef422c38ca1e62f7f3388d484e Author: Francesco Paolo Lovergine Date: Wed Apr 13 16:42:56 2011 +0200 Added wxvdigit support still missing in 6.4.0+ diff --git a/debian/rules b/debian/rules index d34a75e..2882a55 100755 --- a/debian/rules +++ b/debian/rules @@ -88,6 +88,8 @@ build-stamp: dh_testdir $(MAKE) chmod 755 debian/fixpaths.sh debian/fixscripts.sh + # build vdigit too + $(MAKE) -C gui/wxpython/vdigit touch $@ # This target generates truly arch-indep stuff @@ -147,9 +149,16 @@ install: build # install grass core into debian/tmp $(MAKE) $(STRIP) - $(MAKE) install INST_DIR=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ + $(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 + # install vdigit + $(MAKE) -C gui/wxpython/vdigit install \ + INST_DIR=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ + PREFIX=$(CURDIR)/debian/tmp/usr/lib/$(BASE_NAME) \ + BINDIR=$(CURDIR)/debian/tmp/usr/bin + # fix all the braindead scripts debian/fixscripts.sh -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] grass branch, master, updated. upstream/6.4.0-23-g3a56bef
The following commit has been merged in the master branch: commit 707006688c803a0064d906e509c686bb6a2b5ec7 Author: Francesco Paolo Lovergine Date: Wed Apr 13 15:28:23 2011 +0200 Fixed template diff --git a/debian/control b/debian/control index 27aa713..8019652 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-depends: flex, bison,libreadline-dev | libreadline6-dev, libncurses5-dev, libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0), libproj-dev, proj-bin, libjpeg-dev, libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8, libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5), swig -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Build-Conflicts: wx2.6-headers Homepage: http://grass.osgeo.org/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/grass.git -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
