The following commit has been merged in the master branch:
commit 72ed954b193eacb885544cb496d9b830bf5e0d42
Merge: 7e6c12966be02831bc5fd38a2a6dd02d99f7ad41 
282cd7d1384987d8d39b4a11df4d41483eb23898
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date:   Mon Jul 1 15:16:01 2013 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal
    
    Conflicts:
        debian/changelog

diff --combined debian/patches/series
index f827348,5045b36..b8f3b9a
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,4 +1,4 @@@
  ogdi
- doc
  rubymakefile
  man
  gdalpaths
@@@ -10,5 -9,3 +9,5 @@@ mrsid-plugi
  symver
  spatialite
  force-ruby1.8
 +java.opt
 +java-make

-- 
GDAL/OGR library and tools

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

Reply via email to