[Git][debian-gis-team/netcdf][master] 5 commits: Add patch by Helmut Grohne to fix cross building. (closes: #885845)

Sat Dec 30 11:19:08 UTC 2017

Sebastiaan Couwenberg pushed to branch master at Debian GIS Project / netcdf


Commits:
6c681928 by Bas Couwenberg at 2017-12-30T11:55:04+01:00
Add patch by Helmut Grohne to fix cross building. (closes: #885845)

- - - - -
87f7ff5a by Bas Couwenberg at 2017-12-30T11:55:34+01:00
Bump Standards-Version to 4.1.2, no changes.

- - - - -
a952875e by Bas Couwenberg at 2017-12-30T11:57:37+01:00
Add Multi-Arch fields suggested by Multiarch hinter.

- - - - -
46c1ee63 by Bas Couwenberg at 2017-12-30T11:59:31+01:00
Drop obsolete dbg package.

- - - - -
8cb72de9 by Bas Couwenberg at 2017-12-30T11:59:51+01:00
Set distribution to unstable.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/cross.patch
- debian/patches/series
- debian/rules


Changes:

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

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-netcdf (1:4.5.0-2) UNRELEASED; urgency=medium
+netcdf (1:4.5.0-2) unstable; urgency=medium
 
   * Strip trailing whitespace from changelog.
+  * Add patch by Helmut Grohne to fix cross building.
+    (closes: #885845)
+  * Bump Standards-Version to 4.1.2, no changes.
+  * Add Multi-Arch fields suggested by Multiarch hinter.
+  * Drop obsolete dbg package.
 
- -- Bas Couwenberg <sebastic at debian.org>  Wed, 15 Nov 2017 22:03:03 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 30 Dec 2017 11:59:33 +0100
 
 netcdf (1:4.5.0-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
            Bas Couwenberg <sebastic at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20160114),
                cmake (>= 2.8.12),
                chrpath,
                m4,
@@ -14,13 +14,14 @@ Build-Depends: debhelper (>= 9),
                libjs-jquery,
                libhdf5-dev (>= 1.8.6-1~),
                libcurl4-gnutls-dev | libcurl-ssl-dev
-Standards-Version: 4.1.1
+Standards-Version: 4.1.2
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/netcdf.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/netcdf.git
 Homepage: http://www.unidata.ucar.edu/software/netcdf/
 
 Package: netcdf-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: libjs-jquery,
          ${misc:Depends}
@@ -37,6 +38,7 @@ Description: Documentation for NetCDF
 
 Package: libnetcdf13
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -78,17 +80,6 @@ Description: creation, access, and sharing of scientific data
  .
  This package provides headers.
 
-Package: netcdf-dbg
-Architecture: any
-Section: debug
-Depends: libnetcdf13 (= ${binary:Version}),
-         ${misc:Depends}
-Suggests: gdb
-Description: debugging symbols for NetCDF
- This package contains the files that make it possible to debug the
- NetCDF binaries and programs that use the NetCDF libraries with a
- source-level debugger like gdb.
-
 Package: netcdf-bin
 Architecture: any
 Depends: ${shlibs:Depends},


=====================================
debian/patches/cross.patch
=====================================
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,34 @@
+Description: Fix cross build from source.
+Author: Helmut Grohne <helmut at subdivi.de>
+Bug-Debian: https://bugs.debian.org/885845
+Bug: https://github.com/Unidata/netcdf-c/issues/753
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,7 +93,6 @@ INCLUDE(${CMAKE_ROOT}/Modules/CheckTypeS
+ INCLUDE(${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
+ INCLUDE(${CMAKE_ROOT}/Modules/CheckCXXSourceCompiles.cmake)
+ INCLUDE(${CMAKE_ROOT}/Modules/CheckCSourceCompiles.cmake)
+-INCLUDE(${CMAKE_ROOT}/Modules/CheckCSourceRuns.cmake)
+ INCLUDE(${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
+ INCLUDE(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
+ INCLUDE(${CMAKE_ROOT}/Modules/GetPrerequisites.cmake)
+@@ -1194,14 +1193,12 @@ MARK_AS_ADVANCED(ENABLE_SHARED_LIBRARY_V
+ SET(SIGNED_TEST_SOURCE "\n
+   #include <stdlib.h>\n
+   int main(void) {\n
+-    char is_signed = (char) - 1;\n
+-    if(is_signed < 0)\n
+-      return 1;\n
+-    else\n
+-      return 0;\n
++    char error_if_char_is_signed[((char)-1) < 0 ? -1 : 1];\n
++    error_if_char_is_signed[0] = 0;
++    return 0;\n
+ }\n")
+ 
+-CHECK_C_SOURCE_RUNS("${SIGNED_TEST_SOURCE}" __CHAR_UNSIGNED__)
++CHECK_C_SOURCE_COMPILES("${SIGNED_TEST_SOURCE}" __CHAR_UNSIGNED__)
+ 
+ # Library include checks
+ CHECK_INCLUDE_FILE("math.h"      HAVE_MATH_H)


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ privacy-breach-logo.patch
 hdf5-library-path.patch
 tst_fileinfo-link-hdf5.patch
 reproducible-settings.patch
+cross.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ override_dh_installchangelogs:
 	dh_installchangelogs RELEASE_NOTES.md
 
 override_dh_strip:
-	dh_strip --dbg-package=netcdf-dbg
+	dh_strip --dbgsym-migration='netcdf-dbg (<< 1:4.5.0-2~)'
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -v$(UPSTREAM_VERSION)



View it on GitLab: https://salsa.debian.org/debian-gis-team/netcdf/compare/fd776dc017abd2372ddfb146d983c9d77621b63c...8cb72de90dd5288164f209f4622dffa796ee7ec5

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/netcdf/compare/fd776dc017abd2372ddfb146d983c9d77621b63c...8cb72de90dd5288164f209f4622dffa796ee7ec5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20171230/caf18b16/attachment-0001.html>
