The following commit has been merged in the master branch:
commit 73a69e56b76f311d29e6dd1f10c39e414846d1a8
Merge: bed8af5a5926b4588835a76ef8ed844618d0e4b9 
7916329b642b4b749a8ac39850cc94be05dd5d4d
Author: Markus Wanner <mar...@bluegap.ch>
Date:   Wed Oct 2 21:01:25 2013 +0200

    Merge branch 'fix-NMU-676094'
    
    Conflicts:
        debian/changelog
        debian/control

diff --combined debian/changelog
index 1a927c3,c164639..1390592
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
 +geos (3.3.8-1) unstable; urgency=low
 +
 +  * New Upstream release 3.3.8
 +
 + -- Jerome Villeneuve Larouche <jlarou...@mapgears.com>  Thu, 25 Apr 2013 
14:21:01 -0400
 +
+ geos (3.3.3-1.1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Build-depend on ruby/ruby-dev1.8 and build-conflict on ruby/ruby-dev1.9 to
+     ensure the package continues to be built using ruby1.8 (Closes: #676094)
+     - Thanks to Peter Green and Raspbian for the patch
+ 
+  -- Scott Kitterman <sc...@kitterman.com>  Tue, 10 Jul 2012 23:39:07 -0400
+ 
  geos (3.3.3-1) unstable; urgency=low
  
    * New upstream bugfixing version. This is useful because correctly
@@@ -14,13 -17,6 +23,13 @@@
  
   -- Francesco Paolo Lovergine <fran...@debian.org>  Wed, 23 May 2012 15:30:33 
+0200
  
 +geos (3.3.2-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Dropped geos-config patch, merged upstream.
 +
 + -- Francesco Paolo Lovergine <fran...@debian.org>  Sun, 26 Feb 2012 23:29:37 
+0100
 +
  geos (3.3.1-1) unstable; urgency=low
  
    * New upstream major release.

-- 
Geometry engine for Geographic Information Systems

_______________________________________________
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