[SCM] liblas branch, master, updated. debian/1.2.1-1-27-g29d6c30
Francesco P. Lovergine
francesco at lovergine.com
Fri Dec 27 18:34:13 UTC 2013
The following commit has been merged in the master branch:
commit 29d6c30dfd424bdaa721bc6c3e3e00e37427ea6f
Author: Francesco P. Lovergine <francesco at lovergine.com>
Date: Fri Dec 27 19:02:19 2013 +0100
More revisions to copyright and minor policy changes.
diff --git a/debian/changelog b/debian/changelog
index c550879..be06f34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ liblas (1.7.0+dfsg-1) unstable; urgency=medium
(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 <frankie at debian.org> Fri, 27 Dec 2013 18:31:02 +0100
diff --git a/debian/control b/debian/control
index 351882a..ad93ad4 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Build-Depends:
, libboost-thread-dev
Standards-Version: 3.9.5
Homepage: http://liblas.org/
-Vcs-Browser: http://git.debian.org/?p=pkg-grass/liblas.git
-Vcs-Git: git://git.debian.org/git/pkg-grass/liblas.git
+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
diff --git a/debian/copyright b/debian/copyright
index aaa516e..bb5142d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,26 +10,37 @@ Copyright: © 1999, Frank Warmerdam <warmerdam at pobox.com>
© 2008, Mateusz Loskot <mateusz at loskot.net>
© 2008, Philippe Vachon <philippe at cowpig.ca>
© 2008, Xiuguang Zhou (ESRI)
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted under the terms of the BSD License.
+License:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following
+ conditions are met:
.
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of the Martin Isenburg or Iowa Department
+ of Natural Resources nor the names of its contributors may be
+ used to endorse or promote products derived from this software
+ without specific prior written permission.
.
- On Debian systems, the complete text of the BSD License can be
- found in `/usr/share/common-licenses/BSD'.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ OF SUCH DAMAGE.
-Files: include/liblas/detail/sha1.hpp src/detail/sha1.cpp
+Files: include/liblas/detail/sha1.hpp
+ src/detail/sha1.cpp
Copyright: © 2005 Michael Leonhard
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy of
--
ASPRS LiDAR data translation library
More information about the Pkg-grass-devel
mailing list