The following commit has been merged in the master branch: commit 5c9cc358b5f081db34a1f7b8bd542f9fdb553447 Merge: 8691cdeb746f5e989493a54e7669f03d2803c22a 3f8b88ec3f7ab0234b6e5fb136a7007ec1b2fdce Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Tue Jan 7 11:44:18 2014 +0100
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/liblas Conflicts: debian/changelog debian/control diff --combined debian/changelog index a2f8320,ecf6530..dfb44aa --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,23 +1,31 @@@ +liblas (1.7.0-2) UNRELEASED; urgency=medium + + * Changed libgdal1-dev b-d in libgdal-dev. + * Policy bumped to 3.9.5. + * Revised Vcs* fields in debian/control. + + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 11 Dec 2013 17:54:59 +0100 ++======= + liblas (1.7.0+dfsg-2) unstable; urgency=medium + + * Fixed missing linking of system boost component. + (closes: #733282) + + -- Francesco Paolo Lovergine <fran...@debian.org> Sun, 05 Jan 2014 17:00:29 +0100 + + liblas (1.7.0+dfsg-1) unstable; urgency=medium + + * Merged change accepted upstream to substitute the non-free SHA1 + implementation with a MIT/X11 implementation as provided by + http://tamale.net/sha1 + (closes: #730754) + * Revised debian/copyright to reflect changes and missing licenses. + (closes: #730755) + * Policy bumped to 3.9.5, no changes required. + * Moved to new libgdal-dev b-d. + * Moved to canonical Vcs-* fields. + + -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 27 Dec 2013 18:31:02 +0100 liblas (1.7.0-1) experimental; urgency=low diff --combined debian/control index 191f9b1,ad93ad4..edf96c3 --- a/debian/control +++ b/debian/control @@@ -1,6 -1,6 +1,6 @@@ Source: liblas Section: science -Priority: extra +Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> , David Paleino <da...@debian.org> @@@ -18,7 -18,6 +18,6 @@@ Homepage: http://liblas.org Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/liblas.git Vcs-Git: git://anonscm.debian.org/pkg-grass/liblas.git - Package: liblas2 Architecture: any Section: libs -- ASPRS LiDAR data translation library _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel