Run of fresh-releases for r-cran-xslt

Try this locally (using the lintian-brush package):

debcheckout r-cran-xslt
cd r-cran-xslt
new-upstream --refresh-patches

Merge these changes:

git pull https://janitor.debian.net/git/r-cran-xslt fresh-releases/main
git pull https://janitor.debian.net/git/r-cran-xslt fresh-releases/pristine-tar
git pull https://janitor.debian.net/git/r-cran-xslt fresh-releases/upstream

Summary

Merged new upstream version: 1.4.3 (was: 1.4.2).

Diff

Branch: main

diff --git a/DESCRIPTION b/DESCRIPTION
index 4dbd06f..fd2ed80 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,12 +1,12 @@
 Package: xslt
-Version: 1.4.2
+Version: 1.4.3
 Title: Extensible Style-Sheet Language Transformations
 Description: An extension for the 'xml2' package to transform XML documents
     by applying an 'xslt' style-sheet.
 Authors@R: person("Jeroen", "Ooms", role = c("aut", "cre"), email = "jeroen@berkeley.edu",
       comment = c(ORCID = "0000-0002-4035-0289"))
 Maintainer: Jeroen Ooms <jeroen@berkeley.edu>
-URL: https://docs.ropensci.org/xslt (website)
+URL: https://docs.ropensci.org/xslt/ (website)
         https://github.com/ropensci/xslt (devel)
 BugReports: https://github.com/ropensci/xslt/issues
 Depends: xml2 (>= 1.3.0)
@@ -17,7 +17,7 @@ License: GPL (>= 2)
 RoxygenNote: 6.0.1
 Suggests: testthat
 NeedsCompilation: yes
-Packaged: 2020-05-16 10:42:00 UTC; jeroen
+Packaged: 2021-05-05 13:38:26 UTC; jeroen
 Author: Jeroen Ooms [aut, cre] (<https://orcid.org/0000-0002-4035-0289>)
 Repository: CRAN
-Date/Publication: 2020-05-17 05:00:02 UTC
+Date/Publication: 2021-05-05 14:00:03 UTC
diff --git a/MD5 b/MD5
index e955b40..0af7113 100644
--- a/MD5
+++ b/MD5
@@ -1,10 +1,10 @@
-a09657dea5e2fe851164a2ff1d375305 *DESCRIPTION
+1731337088a4c77c3f7a2d587831f1c2 *DESCRIPTION
 c74a7e20d534b588a75e4b808e16d2d2 *NAMESPACE
-92a446850bb8e3c7bb07018804c76a41 *NEWS
+da647678a246b6335bb25567ccc612c0 *NEWS
 8bbfe7f75278c94f56fde811cfd4917c *R/RcppExports.R
 5460c4461bca804279b4c13fa4d1e1bb *R/xml_xslt.R
 6071edd604dbeb75308cfbedc7790398 *cleanup
-d92a926165888d4ba39f1620fd896390 *configure
+748d4770c2d2d7da9c3bd8313a9dd16d *configure
 d41d8cd98f00b204e9800998ecf8427e *configure.win
 8729e9322e3522ac59acfc5f7c4f5f6e *inst/examples/cd_catalog.xml
 d68c4c1a791db9a8770d38e3eac3b1d4 *inst/examples/cd_catalog.xsl
@@ -12,7 +12,8 @@ d68c4c1a791db9a8770d38e3eac3b1d4 *inst/examples/cd_catalog.xsl
 7107144ffe722c93b0fb1998bb976247 *inst/examples/list.xsl
 3476778133a6ef688ffaaf7c4f1f8035 *man/xslt.Rd
 5b7e45551afb537a5882cdcf6ff01790 *src/Makevars.in
-0935c77170200802dc1a5cbf28d48d6d *src/Makevars.win
+2cec33791efd347cbcb051402d7cf9c4 *src/Makevars.ucrt
+ab1e6db9bc50e53022794897bf7e0f5e *src/Makevars.win
 e82645f27f37a0447dddbfd5c925426a *src/RcppExports.cpp
 b76992e12f7a78dd47642de4f8745f96 *src/xslt.cpp
 80353992a0cbf0b684c96e5913366f2f *src/xslt_init.cpp
diff --git a/NEWS b/NEWS
index ab8de22..ae4282a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
+1.4.3
+  - Windows: update to libxml2 2.9.10 and libxslt 1.1.34
+
 1.4.2
   - Explicitly link to liblzma on MacOS to fix problem on CRAN.
-  
+
 1.4.1
   - Fix build on CRAN MacOS (without pkg-config)
 
@@ -15,13 +18,13 @@
 
 1.2
   - Add support for setting custom xslt parameters
-  
+
 1.1
   - For stylesheets with output method="text" return a string instead of xml object
   - Fix a crash on Windows by making copies of the input docs before transforming
   - More stress testing in unit tests
   - Export xslt_version() function
   - Update maintainer details
-  
+
 1.0
   - Initial release
diff --git a/configure b/configure
index ad16614..6db9c89 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
 # Anticonf (tm) script by Jeroen Ooms (2020)
 # This script will query 'pkg-config' for the required cflags and ldflags.
 # If pkg-config is unavailable or does not find the library, try setting
@@ -15,15 +14,15 @@ PKG_CFLAGS="-I/usr/include/libxml2"
 PKG_LIBS="-lexslt -lxslt -lxml2"
 
 # Use pkg-config if available
-if [ $(command -v pkg-config) ]; then
-  PKGCONFIG_CFLAGS=$(pkg-config --cflags --silence-errors $PKG_CONFIG_NAME)
-  PKGCONFIG_LIBS=$(pkg-config --libs $PKG_CONFIG_NAME)
+if [ `command -v pkg-config` ]; then
+  PKGCONFIG_CFLAGS=`pkg-config --cflags --silence-errors $PKG_CONFIG_NAME`
+  PKGCONFIG_LIBS=`pkg-config --libs $PKG_CONFIG_NAME`
 fi
 
 # Workaround: add SDK path on MacOS
 # Only -I include the libxml2 subdir, otherwise we can get header conflicts!
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  XML2DIR=$(xml2-config --cflags | sed 's#/usr/include$#/usr/include/libxml2#g')
+if [ `uname` = "Darwin" ]; then
+  XML2DIR=`xml2-config --cflags | sed 's#/usr/include$#/usr/include/libxml2#g'`
   PKGCONFIG_CFLAGS="${XML2DIR} ${PKGCONFIG_CFLAGS}"
   PKGCONFIG_LIBS="${PKGCONFIG_LIBS:-$PKG_LIBS} -llzma"
 fi
@@ -40,9 +39,9 @@ elif [ "$PKGCONFIG_LIBS" ]; then
 fi
 
 # Find compiler
-CC=$(${R_HOME}/bin/R CMD config CC)
-CFLAGS=$(${R_HOME}/bin/R CMD config CFLAGS)
-CPPFLAGS=$(${R_HOME}/bin/R CMD config CPPFLAGS)
+CC=`${R_HOME}/bin/R CMD config CC`
+CFLAGS=`${R_HOME}/bin/R CMD config CFLAGS`
+CPPFLAGS=`${R_HOME}/bin/R CMD config CPPFLAGS`
 
 # For debugging
 echo "Using PKG_CFLAGS=$PKG_CFLAGS"
diff --git a/debian/changelog b/debian/changelog
index 372b63d..2b5c327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+r-cran-xslt (1.4.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 24 May 2021 21:18:15 -0000
+
 r-cran-xslt (1.4.2-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
new file mode 100644
index 0000000..1a2e101
--- /dev/null
+++ b/src/Makevars.ucrt
@@ -0,0 +1,2 @@
+CRT=-ucrt
+include Makevars.win
diff --git a/src/Makevars.win b/src/Makevars.win
index 104226d..20923c0 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -1,9 +1,9 @@
-VERSION=2.9.8
+VERSION=2.9.10
 RWINLIB=../windows/libxml2-$(VERSION)
 PKG_CPPFLAGS=-I$(RWINLIB)/include -I$(RWINLIB)/include/libxml2 \
 	-DLIBXML_STATIC -DSTRICT_R_HEADERS
 
-PKG_LIBS=-L$(RWINLIB)/lib${R_ARCH} -lexslt -lxslt -lxml2 -llzma -liconv -lz -lws2_32
+PKG_LIBS=-L$(RWINLIB)/lib${R_ARCH}${CRT} -lexslt -lxslt -lxml2 -llzma -liconv -lz -lws2_32
 
 all: clean winlibs
 

Branch: pristine-tar

diff --git a/r-cran-xslt_1.4.3.orig.tar.gz.delta b/r-cran-xslt_1.4.3.orig.tar.gz.delta
new file mode 100644
index 0000000..d2b4e6f
Binary files /dev/null and b/r-cran-xslt_1.4.3.orig.tar.gz.delta differ
diff --git a/r-cran-xslt_1.4.3.orig.tar.gz.id b/r-cran-xslt_1.4.3.orig.tar.gz.id
new file mode 100644
index 0000000..7dac857
--- /dev/null
+++ b/r-cran-xslt_1.4.3.orig.tar.gz.id
@@ -0,0 +1 @@
+b6eb48a7b41d145a58af1c816ded43f50e0fd6be

Branch: upstream

Tag: upstream/1.4.3

Diff is too long (more than 200 lines). Download the raw diff.

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/f6/ce234e6459029ca445512e3d96deed5f82129b.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/bf/ba8037af9a4de7bb31b37b604bf0a073691e14.debug

Control files of package r-cran-xslt: lines which differ (wdiff format)

  • Depends: r-base-core (>= 4.0.2-1), 4.0.4-1), r-api-4.0, r-cran-xml2 (>= 1.3.0), r-cran-rcpp, libc6 (>= 2.14), libgcc-s1 (>= 3.0), libstdc++6 (>= 5.2), libxml2 (>= 2.7.4), libxslt1.1 (>= 1.1.25)

Control files of package r-cran-xslt-dbgsym: lines which differ (wdiff format)

  • Build-Ids: bfba8037af9a4de7bb31b37b604bf0a073691e14 f6ce234e6459029ca445512e3d96deed5f82129b

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases r-cran-xslt-dbgsym
apt install -t fresh-releases r-cran-xslt

Lintian Result

Full worker log Full build log