The following commit has been merged in the master branch:
commit 87891c69d897c8085b1ddd1e5440c93469b0df50
Merge: 6207bebccc707a43fd48bdcfbe5e754e17d092b4
f0550d3946aa13dbaffacde1b0e045d190548d09
Author: Francesco P. Lovergine <[email protected]>
Date: Sun Mar 4 11:35:39 2012 +0100
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal
diff --combined debian/changelog
index 4b54c52,10ceb40..49a33ac
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,8 -2,9 +2,9 @@@ gdal (1.9.0-1~exp3) experimental; urgen
* Added b-deps and enabled a few new supports:
Poppler, Armadillo, OpenJPEG, FreeXL and libZMA.
+ * Revised copyright file for format 1.0.
- -- Francesco Paolo Lovergine <[email protected]> Thu, 23 Feb 2012 12:40:19
+0100
+ -- Francesco Paolo Lovergine <[email protected]> Sun, 26 Feb 2012 17:24:24
+0100
gdal (1.9.0-1~exp2) experimental; urgency=low
@@@ -40,11 -41,6 +41,11 @@@ gdal (1.8.1-2~exp3) experimental; urgen
gdal (1.8.1-2~exp2) experimental; urgency=low
+<<<<<<< HEAD
+ * Now including per arch symbol files truly.
+
+ -- Francesco Paolo Lovergine <[email protected]> Wed, 28 Sep 2011 20:07:22
+0200
+=======
* Changed organization of symbol files in one common file and
multiple .symbols.arch file.
* Now normalized to conventional GDAL library name and dropping the Debian
@@@ -57,7 -53,6 +58,7 @@@
* Now avoid installing superfluous stuff in libgdal-perl. Thanks lintian.
-- Francesco Paolo Lovergine <[email protected]> Tue, 11 Oct 2011 14:41:31
+0200
+>>>>>>> 72ed289fc96f87ebdc3af15373cb4d3dc2d855bf
gdal (1.8.1-2~exp1) experimental; urgency=low
--
GDAL/OGR library and tools
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
