Import r-cran-s2_1.1.4-1.debian.tar.xz

[dgit import tarball r-cran-s2 1.1.4-1 r-cran-s2_1.1.4-1.debian.tar.xz]

diff --git a/README.source b/README.source
new file mode 100644 (file)
index 0000000..51e4e96
--- /dev/null
+++ b/README.source
@@ -0,0 +1,16 @@
+Explanation for binary files inside source package according to
+  https://lists.debian.org/debian-devel/2013/09/msg00332.html
+
+Files: data/s2_data_tbl_cities.rda
+Documented: man/s2_data_tbl_countries.Rd
+  Low-resolution world boundaries, timezones, and cities
+
+Files: data/s2_data_tbl_countries.rda
+Documented: man/s2_data_tbl_countries.Rd
+  Low-resolution world boundaries, timezones, and cities
+
+Files: data/s2_data_tbl_timezones.rda
+Documented: man/s2_data_tbl_countries.Rd
+  Low-resolution world boundaries, timezones, and cities
+
+ -- Andreas Tille <tille@debian.org>  Tue, 22 Sep 2020 09:33:00 +0200

diff --git a/changelog b/changelog
new file mode 100644 (file)
index 0000000..3ffc2a3
--- /dev/null
+++ b/changelog
@@ -0,0 +1,93 @@
+r-cran-s2 (1.1.4-1) unstable; urgency=medium
+
+  * New upstream version
+  * Test-Depends as per Suggests
+
+ -- Andreas Tille <tille@debian.org>  Fri, 30 Jun 2023 21:49:50 +0200
+
+r-cran-s2 (1.1.2-1) unstable; urgency=medium
+
+  * New upstream version
+  * Standards-Version: 4.6.2 (routine-update)
+
+ -- Andreas Tille <tille@debian.org>  Mon, 16 Jan 2023 13:49:37 +0100
+
+r-cran-s2 (1.1.1-1) unstable; urgency=medium
+
+  * New upstream version
+
+ -- Andreas Tille <tille@debian.org>  Mon, 28 Nov 2022 15:28:30 +0100
+
+r-cran-s2 (1.1.0-1) unstable; urgency=medium
+
+  * New upstream version
+  * Standards-Version: 4.6.1 (routine-update)
+  * Reorder sequence of d/control fields by cme (routine-update)
+
+ -- Andreas Tille <tille@debian.org>  Thu, 21 Jul 2022 17:46:21 +0200
+
+r-cran-s2 (1.0.7-3) unstable; urgency=medium
+
+  * d/p/fix-armel-ftbfs.patch
+    + Extend patch to fix FTBFS on mipsel, m68k, powerpc and riscv64
+  * Add myself to uploaders
+  * [skip ci] d/salsa-ci.yml: Disable reprotest
+
+ -- Nilesh Patra <nilesh@debian.org>  Wed, 06 Oct 2021 16:08:58 +0530
+
+r-cran-s2 (1.0.7-2) unstable; urgency=medium
+
+  * Team Upload.
+  * Add patch to fix FTBFS on armel
+
+ -- Nilesh Patra <nilesh@debian.org>  Tue, 05 Oct 2021 16:34:37 +0530
+
+r-cran-s2 (1.0.7-1) unstable; urgency=medium
+
+  [ Nilesh Patra ]
+  * Team upload.
+  * New upstream version 1.0.7
+  * d/control: Update versioned B-D
+  * d/copyright: Fix copyright files for absl to right location
+
+  [ Étienne Mollier ]
+  * add fix-ftbfs-on-32bit.patch from Konstantin Podsirov
+
+ -- Étienne Mollier <emollier@debian.org>  Mon, 04 Oct 2021 21:37:06 +0200
+
+r-cran-s2 (1.0.6-1) unstable; urgency=medium
+
+  * New upstream version
+  * Standards-Version: 4.6.0 (routine-update)
+
+ -- Andreas Tille <tille@debian.org>  Thu, 26 Aug 2021 12:48:38 +0200
+
+r-cran-s2 (1.0.4-1) unstable; urgency=medium
+
+  * New upstream version
+
+ -- Andreas Tille <tille@debian.org>  Sat, 16 Jan 2021 17:30:37 +0100
+
+r-cran-s2 (1.0.3-2) unstable; urgency=medium
+
+  * change uint64 to uint64_t in unaligned_access
+    Closes: #976473
+  * Standards-Version: 4.5.1 (routine-update)
+
+ -- Andreas Tille <tille@debian.org>  Thu, 10 Dec 2020 08:26:41 +0100
+
+r-cran-s2 (1.0.3-1) unstable; urgency=medium
+
+  * New upstream version
+  * debhelper-compat 13 (routine-update)
+  * Trim trailing whitespace.
+  * Set upstream metadata fields: Archive, Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+
+ -- Andreas Tille <tille@debian.org>  Sun, 18 Oct 2020 23:03:45 +0200
+
+r-cran-s2 (1.0.2-1) unstable; urgency=medium
+
+  * Initial release (closes: #970713)
+
+ -- Andreas Tille <tille@debian.org>  Tue, 22 Sep 2020 11:28:09 +0200

diff --git a/control b/control
new file mode 100644 (file)
index 0000000..56177ed
--- /dev/null
+++ b/control
@@ -0,0 +1,32 @@
+Source: r-cran-s2
+Section: gnu-r
+Priority: optional
+Maintainer: Debian R Packages Maintainers <r-pkg-team@alioth-lists.debian.net>
+Uploaders: Andreas Tille <tille@debian.org>, Nilesh Patra <nilesh@debian.org>
+Vcs-Browser: https://salsa.debian.org/r-pkg-team/r-cran-s2
+Vcs-Git: https://salsa.debian.org/r-pkg-team/r-cran-s2.git
+Homepage: https://cran.r-project.org/package=s2
+Standards-Version: 4.6.2
+Rules-Requires-Root: no
+Build-Depends: debhelper-compat (= 13),
+               dh-r,
+               r-base-dev,
+               r-cran-rcpp,
+               r-cran-wk (>= 0.6.0),
+               libssl-dev
+Testsuite: autopkgtest-pkg-r
+
+Package: r-cran-s2
+Architecture: any
+Depends: ${R:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
+Description: GNU R spherical geometry operators using the S2 geometry library
+ Provides R bindings for Google's s2 library for geometric calculations
+ on the sphere. High-performance constructors and exporters provide high
+ compatibility with existing spatial packages, transformers construct new
+ geometries from existing geometries, predicates provide a means to
+ select geometries based on spatial relationships, and accessors extract
+ information about geometries.

diff --git a/copyright b/copyright
new file mode 100644 (file)
index 0000000..7a585d3
--- /dev/null
+++ b/copyright
@@ -0,0 +1,30 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: s2
+Upstream-Contact: Edzer Pebesma <edzer.pebesma@uni-muenster.de>
+Source: https://cran.r-project.org/package=s2
+
+Files: *
+Copyright: 2015-2020 Dewey Dunnington,
+ Edzer Pebesma,
+ Ege Rubak,
+License: Apache-2.0
+
+Files: configure
+Copyright: 2020  Jeroen Ooms
+License: Apache-2.0
+
+Files: src/s2/*
+Copyright: 2009-2019 Google, Inc. (Original s2geometry.io source code)
+License: Apache-2.0
+
+Files: src/absl/*
+Copyright: 2017 The Abseil Authors
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2020 Andreas Tille <tille@debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems you can find the full text of the Apache License at
+ /usr/share/common-licenses/Apache-2.0.

diff --git a/docs b/docs
new file mode 100644 (file)
index 0000000..67ce40b
--- /dev/null
+++ b/docs
@@ -0,0 +1,2 @@
+debian/tests/run-unit-test
+tests

diff --git a/patches/fix-armel-ftbfs.patch b/patches/fix-armel-ftbfs.patch
new file mode 100644 (file)
index 0000000..fcf9992
--- /dev/null
+++ b/patches/fix-armel-ftbfs.patch
@@ -0,0 +1,16 @@
+Description: Manually pass in -latomic on armel to fix FTBFS
+Author: Nilesh Patra <nilesh@debian.org>
+Last-Update: 2021-10-05
+--- a/src/Makevars.in
++++ b/src/Makevars.in
+@@ -4,6 +4,10 @@ PKG_CXXFLAGS = @cflags@ -pthread
+ 
+ CXX_STD = CXX11
+ 
++ifneq (,$(filter $(DEB_HOST_ARCH),armel mipsel riscv64 m68k powerpc))
++PKG_LIBS += -latomic
++endif
++
+ ABSL_LIBS = absl/base/internal/cycleclock.o \
+     absl/base/internal/low_level_alloc.o \
+     absl/base/internal/raw_logging.o \

diff --git a/patches/fix-ftbfs-on-32bit.patch b/patches/fix-ftbfs-on-32bit.patch
new file mode 100644 (file)
index 0000000..646a450
--- /dev/null
+++ b/patches/fix-ftbfs-on-32bit.patch
@@ -0,0 +1,37 @@
+Description: Fix BN_ext_get_uint64 for OpenSSL >= 1.1 32bit
+ Suggested changes fix compilation error with OpenSSL >= 1.0 for 32bit target.
+ The algorithm is similar to what is currently being done in BN_ext_set_uint64,
+ but in the opposite direction.
+Author: Konstantin Podsirov
+Origin: upstream
+Bug: https://github.com/google/s2geometry/pull/183
+Forwarded: no
+Reviewed-by: Étienne Mollier <emollier@debian.org>
+Last-Update: 2021-10-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/s2/util/math/exactfloat/exactfloat.cc
++++ b/src/s2/util/math/exactfloat/exactfloat.cc
+@@ -75,6 +75,22 @@ inline static uint64 BN_ext_get_uint64(c
+   return u64;
+ }
+ 
++// Return the absolute value of a BIGNUM as a 64-bit unsigned integer.
++// Requires that BIGNUM fits into 64 bits.
++inline static uint64 BN_ext_get_uint64(const BIGNUM* bn) {
++  uint64 r;
++#ifdef IS_LITTLE_ENDIAN
++  S2_CHECK_EQ(BN_bn2lebinpad(bn, reinterpret_cast<unsigned char*>(&r),
++              sizeof(r)), sizeof(r));
++#elif IS_BIG_ENDIAN
++  S2_CHECK_EQ(BN_bn2binpad(bn, reinterpret_cast<unsigned char*>(&r),
++              sizeof(r)), sizeof(r));
++#else
++#error one of IS_LITTLE_ENDIAN or IS_BIG_ENDIAN should be defined!
++#endif
++  return r;
++}
++
+ static int BN_ext_count_low_zero_bits(const BIGNUM* bn) {
+   return BN_count_low_zero_bits(bn);
+ }

diff --git a/patches/series b/patches/series
new file mode 100644 (file)
index 0000000..e6fa256
--- /dev/null
+++ b/patches/series
@@ -0,0 +1,2 @@
+fix-ftbfs-on-32bit.patch
+fix-armel-ftbfs.patch

diff --git a/rules b/rules
new file mode 100755 (executable)
index 0000000..68d9a36
--- /dev/null
+++ b/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+       dh $@ --buildsystem R

diff --git a/salsa-ci.yml b/salsa-ci.yml
new file mode 100644 (file)
index 0000000..7d69497
--- /dev/null
+++ b/salsa-ci.yml
@@ -0,0 +1,11 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+
+# R creates .rdb files and .rds with some randomness.
+# https://tests.reproducible-builds.org/debian/issues/unstable/randomness_in_r_rdb_rds_databases_issue.html
+# Thus reprotest is disabled here
+variables:
+  SALSA_CI_DISABLE_REPROTEST: 1

diff --git a/source/format b/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/tests/control b/tests/control
new file mode 100644 (file)
index 0000000..18a3f9f
--- /dev/null
+++ b/tests/control
@@ -0,0 +1,7 @@
+Tests: run-unit-test
+Depends: @,
+         r-cran-bit64,
+         r-cran-testthat,
+         r-cran-vctrs
+Restrictions: allow-stderr
+

diff --git a/tests/run-unit-test b/tests/run-unit-test
new file mode 100644 (file)
index 0000000..4f96f77
--- /dev/null
+++ b/tests/run-unit-test
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+debname=r-cran-s2
+
+if [ "$AUTOPKGTEST_TMP" = "" ] ; then
+    AUTOPKGTEST_TMP=`mktemp -d /tmp/${debname}-test.XXXXXX`
+    trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM
+fi
+cd $AUTOPKGTEST_TMP
+cp -a /usr/share/doc/$debname/tests/* $AUTOPKGTEST_TMP
+gunzip -r *
+for testfile in *.R; do
+    echo "BEGIN TEST $testfile"
+    LC_ALL=C.UTF-8 R --no-save < $testfile
+done
+

diff --git a/upstream/metadata b/upstream/metadata
new file mode 100644 (file)
index 0000000..9107b9d
--- /dev/null
+++ b/upstream/metadata
@@ -0,0 +1,6 @@
+---
+Archive: CRAN
+Bug-Database: https://github.com/r-spatial/s2/issues
+Bug-Submit: https://github.com/r-spatial/s2/issues/new
+Repository: https://github.com/r-spatial/s2.git
+Repository-Browse: https://github.com/r-spatial/s2

diff --git a/watch b/watch
new file mode 100644 (file)
index 0000000..c4d3be8
--- /dev/null
+++ b/watch
@@ -0,0 +1,2 @@
+version=4
+https://cloud.r-project.org/src/contrib/s2_([-\d.]*)\.tar\.gz