[R-pkg-team] Bug#985281: [RFS] r-cran-dt 0.17+dfsg-3

Andreas Tille andreas at fam-tille.de
Sun Mar 28 12:51:21 BST 2021


Upload permissions granted.
Thanks a lot for your work on this, Andreas.

On Sun, Mar 28, 2021 at 12:58:50PM +0200, Étienne Mollier wrote:
> Control: tag -1 pending
> 
> Étienne Mollier, on 2021-03-28 11:14:31 +0200:
> > I think we are in agreement indeed.  I check Salsa CI, and ready
> > the package for upload (which will need sponsoring, or I will
> > need dm grants).
> 
> Said changes are pushed on Salsa.  Since there does not seem to
> be CI runners at t time, I manually ran the checks ; they all
> pass except reprotest, which is expected apparently.  I attached
> a debdiff describing changes since 0.17+dfsg-2.
> 
> Kind Regards,
> -- 
> Étienne Mollier <etienne.mollier at mailoo.org>
> Fingerprint:  8f91 b227 c7d6 f2b1 948c  8236 793c f67e 8f0d 11da
> Sent from /dev/pts/4, please excuse my verbosity.

> diff -Nru r-cran-dt-0.17+dfsg/debian/changelog r-cran-dt-0.17+dfsg/debian/changelog
> --- r-cran-dt-0.17+dfsg/debian/changelog	2021-02-12 08:11:25.000000000 +0100
> +++ r-cran-dt-0.17+dfsg/debian/changelog	2021-03-28 11:38:02.000000000 +0200
> @@ -1,3 +1,20 @@
> +r-cran-dt (0.17+dfsg-3) unstable; urgency=medium
> +
> +  * Team upload
> +
> +  [ Andreas Tille ]
> +  * Fix unhandled symlink to directory conversion
> +  * Allow failure in salsa-ci reprotest
> +
> +  [ Nilesh Patra ]
> +  * Defer linking to d/links
> +
> +  [ Étienne Mollier ]
> +  * adjust d/maintscript to fix upgrade from Buster
> +    Closes: #985281
> +
> + -- Étienne Mollier <etienne.mollier at mailoo.org>  Sun, 28 Mar 2021 11:38:02 +0200
> +
>  r-cran-dt (0.17+dfsg-2) unstable; urgency=medium
>  
>    * No test via vignette needed any more since there is a real test suite
> diff -Nru r-cran-dt-0.17+dfsg/debian/links r-cran-dt-0.17+dfsg/debian/links
> --- r-cran-dt-0.17+dfsg/debian/links	2021-02-12 08:11:25.000000000 +0100
> +++ r-cran-dt-0.17+dfsg/debian/links	2021-03-28 11:10:13.000000000 +0200
> @@ -10,5 +10,44 @@
>  usr/share/javascript/jquery-datatables-extensions/pdfmake/build/vfs_fonts.js	usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/vfs_fonts.js
>  usr/share/javascript/jquery-datatables-extensions/Buttons/css			usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/css
>  usr/share/javascript/jquery-datatables-extensions/Buttons/swf			usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/swf
> +usr/share/javascript/jquery-datatables-extensions/Scroller              usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Scroller
> +usr/share/javascript/jquery-datatables-extensions/FixedColumns			usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/FixedColumns
> +usr/share/javascript/jquery-datatables-extensions/ColReorder	        usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/ColReorder
> +usr/share/javascript/jquery-datatables-extensions/Select                usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Select
> +usr/share/javascript/jquery-datatables-extensions/Responsive            usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Responsive
> +usr/share/javascript/jquery-datatables-extensions/RowReorder            usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/RowReorder
> +usr/share/javascript/jquery-datatables-extensions/KeyTable              usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/KeyTable
> +usr/share/javascript/jquery-datatables-extensions/FixedHeader           usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/FixedHeader
> +usr/share/javascript/jquery-datatables-extensions/AutoFill              usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/AutoFill
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.bootstrap.js     usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.bootstrap.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.bootstrap.min.js usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.bootstrap.min.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.colVis.js        usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.colVis.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.colVis.min.js    usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.colVis.min.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.foundation.js    usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.foundation.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.foundation.min.js usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.foundation.min.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.html5.js          usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.html5.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.html5.min.js      usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.html5.min.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.jqueryui.js       usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.jqueryui.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.jqueryui.min.js   usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.jqueryui.min.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.print.js          usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.print.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/buttons.print.min.js      usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/buttons.print.min.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/dataTables.buttons.js     usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/dataTables.buttons.js
> +usr/share/javascript/jquery-datatables-extensions/Buttons/js/dataTables.buttons.min.js usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions/Buttons/js/dataTables.buttons.min.js
> +usr/share/javascript/jquery-datatables/css/dataTables.bootstrap4.css                   usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.bootstrap4.css
> +usr/share/javascript/jquery-datatables/css/dataTables.bootstrap4.min.css               usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.bootstrap4.min.css
> +usr/share/javascript/jquery-datatables/css/dataTables.bootstrap.css                    usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.bootstrap.css
> +usr/share/javascript/jquery-datatables/css/dataTables.bootstrap.min.css                usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.bootstrap.min.css
> +usr/share/javascript/jquery-datatables/css/dataTables.foundation.css                   usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.foundation.css
> +usr/share/javascript/jquery-datatables/css/dataTables.foundation.min.css               usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.foundation.min.css
> +usr/share/javascript/jquery-datatables/css/dataTables.jqueryui.css                     usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.jqueryui.css
> +usr/share/javascript/jquery-datatables/css/dataTables.jqueryui.min.css                 usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.jqueryui.min.css
> +usr/share/javascript/jquery-datatables/css/dataTables.material.css                     usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.material.css
> +usr/share/javascript/jquery-datatables/css/dataTables.material.min.css                 usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.material.min.css
> +usr/share/javascript/jquery-datatables/css/dataTables.semanticui.css                   usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.semanticui.css
> +usr/share/javascript/jquery-datatables/css/dataTables.semanticui.min.css               usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.semanticui.min.css
> +usr/share/javascript/jquery-datatables/css/dataTables.uikit.css                        usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.uikit.css
> +usr/share/javascript/jquery-datatables/css/dataTables.uikit.min.css                    usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/dataTables.uikit.min.css
> +usr/share/javascript/jquery-datatables/css/jquery.dataTables.css                       usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/query.dataTables.css
> +usr/share/javascript/jquery-datatables/css/jquery.dataTables.min.css                   usr/lib/R/site-library/DT/htmlwidgets/lib/datatables/css/jquery.dataTables.min.css
>  usr/lib/R/site-library/DT/htmlwidgets/lib/nouislider/nouislider.min.js          usr/lib/R/site-library/DT/htmlwidgets/lib/nouislider/jquery.nouislider.min.js
>  usr/lib/R/site-library/DT/htmlwidgets/lib/nouislider/nouislider.min.css          usr/lib/R/site-library/DT/htmlwidgets/lib/nouislider/jquery.nouislider.min.css
> diff -Nru r-cran-dt-0.17+dfsg/debian/maintscript r-cran-dt-0.17+dfsg/debian/maintscript
> --- r-cran-dt-0.17+dfsg/debian/maintscript	2021-02-12 08:11:25.000000000 +0100
> +++ r-cran-dt-0.17+dfsg/debian/maintscript	2021-03-27 22:07:29.000000000 +0100
> @@ -1,2 +1,2 @@
> -#symlink_to_dir /usr/lib/R/site-library/DT/htmlwidgets/lib/datatables		/usr/share/javascript/jquery-datatables		0.5+dfsg-1
> -#symlink_to_dir /usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions	/usr/share/javascript/jquery-datatables-extensions	0.5+dfsg-1
> +symlink_to_dir /usr/lib/R/site-library/DT/htmlwidgets/lib/datatables            ../../../../../../share/javascript/jquery-datatables            0.17+dfsg-3~
> +symlink_to_dir /usr/lib/R/site-library/DT/htmlwidgets/lib/datatables-extensions ../../../../../../share/javascript/jquery-datatables-extensions 0.17+dfsg-3~
> diff -Nru r-cran-dt-0.17+dfsg/debian/rules r-cran-dt-0.17+dfsg/debian/rules
> --- r-cran-dt-0.17+dfsg/debian/rules	2021-02-12 08:11:25.000000000 +0100
> +++ r-cran-dt-0.17+dfsg/debian/rules	2021-03-27 22:06:00.000000000 +0100
> @@ -14,21 +14,5 @@
>  
>  override_dh_link:
>  	mkdir -p debian/$(DEB_SOURCE)/$(debRdir)/$(cranNameOrig)/DT/htmlwidgets/lib/datatables-extensions/
> -	dh_link
> -	
> -	# Add symlinks to all css files into css subdirectory
> -	for css in /usr/share/javascript/jquery-datatables/css/* ; do \
> -	   dh_link $${css} $(debRdir)/$(cranNameOrig)/htmlwidgets/lib/datatables/css/`basename $${css}` ; \
> -	done
> -	
> -	# let all be symlinks
> -	for dte in $$(find /usr/share/javascript/jquery-datatables-extensions -mindepth 1 -maxdepth 1 -type d|grep -v Buttons); do \
> -	    dtedir=$$( basename $${dte} ) ; \
> -	    dh_link $$dte $(debRdir)/$(cranNameOrig)/htmlwidgets/lib/datatables-extensions/$${dtedir} ; \
> -	done
>  	mkdir -p debian/$(DEB_SOURCE)/$(debRdir)/$(cranNameOrig)/htmlwidgets/lib/datatables-extensions/Buttons/js
> -
> -	# Fix links that are broken in upstream source
> -	for dtebuttons in `ls /usr/share/javascript/jquery-datatables-extensions/Buttons/js` ; do \
> -	    dh_link usr/share/javascript/jquery-datatables-extensions/Buttons/js/$${dtebuttons} $(debRdir)/$(cranNameOrig)/htmlwidgets/lib/datatables-extensions/Buttons/js/$${dtebuttons} ; \
> -	done
> +	dh_link
> diff -Nru r-cran-dt-0.17+dfsg/debian/salsa-ci.yml r-cran-dt-0.17+dfsg/debian/salsa-ci.yml
> --- r-cran-dt-0.17+dfsg/debian/salsa-ci.yml	2021-02-12 08:11:25.000000000 +0100
> +++ r-cran-dt-0.17+dfsg/debian/salsa-ci.yml	2021-03-27 22:06:00.000000000 +0100
> @@ -2,3 +2,9 @@
>  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
> +reprotest:
> +  allow_failure: true
> +




-- 
http://fam-tille.de



More information about the R-pkg-team mailing list