[Git][debian-gis-team/liblas][experimental] 11 commits: Revert "Update branch in gbp.conf & Vcs-Git URL."

Sat Apr 21 19:47:22 BST 2018

Bas Couwenberg pushed to branch experimental at Debian GIS Project / liblas


Commits:
93c21c38 by Bas Couwenberg at 2017-12-17T12:36:04+01:00
Revert "Update branch in gbp.conf & Vcs-Git URL."

This reverts commit fcdca9311b79693e85dd9610667e3dcfc1fb7ac2.

- - - - -
1a92dce5 by Bas Couwenberg at 2017-12-17T12:36:31+01:00
Move from experimental to unstable.

- - - - -
b4d7eb65 by Bas Couwenberg at 2018-01-20T22:08:30+01:00
Update copyright-format URL to use HTTPS.

- - - - -
82444d05 by Bas Couwenberg at 2018-02-10T11:40:43+01:00
Fix deprecated source override location.

- - - - -
17969043 by Bas Couwenberg at 2018-02-17T17:46:29+01:00
Update watch file to use HTTPS.

- - - - -
4120f53d by Bas Couwenberg at 2018-03-31T12:09:57+02:00
Update Vcs-* URLs for Salsa.

- - - - -
9929c57d by Bas Couwenberg at 2018-03-31T18:17:28+02:00
Bump Standards-Versiont to 4.1.3, no changes.

- - - - -
63d7ae00 by Bas Couwenberg at 2018-04-18T20:14:46+02:00
Bump Standards-Version to 4.1.4, no changes.

- - - - -
0132ead2 by Bas Couwenberg at 2018-04-21T19:09:40+02:00
Update branch in gbp.conf & Vcs-Git URL.

- - - - -
ee6cd2f1 by Bas Couwenberg at 2018-04-21T19:10:25+02:00
Require at least libgdal-dev 2.3.0~ for experimental builds.

- - - - -
9b84a821 by Bas Couwenberg at 2018-04-21T20:47:11+02:00
Add patch to use C++11 for compatibility with GDAL 2.3.0.

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/gdal-c++11.patch
- + debian/patches/series
- debian/source.lintian-overrides → debian/source/lintian-overrides
- debian/watch


Changes:

=====================================
debian/changelog
=====================================

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+liblas (1.8.1-7) UNRELEASED; urgency=medium
+
+  * Update copyright-format URL to use HTTPS.
+  * Fix deprecated source override location.
+  * Update watch file to use HTTPS.
+  * Update Vcs-* URLs for Salsa.
+  * Bump Standards-Versiont to 4.1.4, no changes.
+  * Require at least libgdal-dev 2.3.0~ for experimental builds.
+  * Add patch to use C++11 for compatibility with GDAL 2.3.0.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 20 Jan 2018 22:08:28 +0100
+
+liblas (1.8.1-6) unstable; urgency=medium
+
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 17 Dec 2017 12:36:23 +0100
+
 liblas (1.8.1-6~exp1) experimental; urgency=medium
 
   * Strip trailing whitespace from changelog.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9),
                cmake,
                chrpath,
                libgeotiff-dev,
-               libgdal-dev (>= 2.2.3),
+               libgdal-dev (>= 2.3.0~),
                libtiff-dev,
                libboost-dev,
                libboost-filesystem-dev,
@@ -25,9 +25,9 @@ Build-Depends: debhelper (>= 9),
                docbook-xsl,
                docbook-xml,
                xsltproc
-Standards-Version: 4.1.2
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/liblas.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/liblas.git -b experimental
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/liblas
+Vcs-Git: https://salsa.debian.org/debian-gis-team/liblas.git -b experimental
 Homepage: http://liblas.org/
 X-Python-Version: >= 2.5
 


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: LibLAS
 Upstream-Contact: libLAS developers <liblas-devel at lists.osgeo.org>
-Source: http://download.osgeo.org/liblas/
+Source: https://download.osgeo.org/liblas/
 
 Files: *
 Copyright: 2007, Martin Isenburg <isenburg at cs.unc.edu>


=====================================
debian/patches/gdal-c++11.patch
=====================================
--- /dev/null
+++ b/debian/patches/gdal-c++11.patch
@@ -0,0 +1,14 @@
+Description: Use C++11 for compatibility with GDAL 2.3.0.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -155,7 +155,7 @@ else()
+ 
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}")
+     if (CMAKE_COMPILER_IS_GNUCXX)
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -ansi")
++      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+     endif()
+ 
+   elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gdal-c++11.patch


=====================================
debian/source.lintian-overrides → debian/source/lintian-overrides
=====================================
--- a/debian/source.lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,6 +1,3 @@
-# download.osgeo.org is not available via HTTPS
-liblas source: debian-watch-uses-insecure-uri *
-
 # Only a single Python version is supported during the build
 liblas source: python-foo-but-no-python3-foo python-liblas
 


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -2,5 +2,5 @@ version=3
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|b|beta|alpha)\d*)$/$1~$2/;s/RC/rc/ \
-http://download.osgeo.org/liblas/ \
+https://download.osgeo.org/liblas/ \
 (?:.*?/)?(?:libLAS)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))



View it on GitLab: https://salsa.debian.org/debian-gis-team/liblas/compare/91cad03beb07f53b8278b961503cf83bfe7ce1e3...9b84a8212d59725f50bdad34292e73cb86032c7a

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/liblas/compare/91cad03beb07f53b8278b961503cf83bfe7ce1e3...9b84a8212d59725f50bdad34292e73cb86032c7a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180421/51362c06/attachment-0001.html>
