[med-svn] r21602 - trunk/packages/R/r-cran-shiny/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-03-25 22:55:31 +0000 (Fri, 25 Mar 2016)
New Revision: 21602

Added:
   trunk/packages/R/r-cran-shiny/trunk/debian/linktrees
Modified:
   trunk/packages/R/r-cran-shiny/trunk/debian/changelog
   trunk/packages/R/r-cran-shiny/trunk/debian/control
   trunk/packages/R/r-cran-shiny/trunk/debian/copyright
   trunk/packages/R/r-cran-shiny/trunk/debian/rules
   trunk/packages/R/r-cran-shiny/trunk/debian/watch
Log:
Start removing minimized JS


Modified: trunk/packages/R/r-cran-shiny/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-shiny/trunk/debian/changelog	2016-03-25 07:00:42 UTC (rev 21601)
+++ trunk/packages/R/r-cran-shiny/trunk/debian/changelog	2016-03-25 22:55:31 UTC (rev 21602)
@@ -1,4 +1,4 @@
-r-cran-shiny (0.13.1-1) UNRELEASED; urgency=low
+r-cran-shiny (0.13.1+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #???)
 

Modified: trunk/packages/R/r-cran-shiny/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-shiny/trunk/debian/control	2016-03-25 07:00:42 UTC (rev 21601)
+++ trunk/packages/R/r-cran-shiny/trunk/debian/control	2016-03-25 22:55:31 UTC (rev 21602)
@@ -5,6 +5,10 @@
 Priority: optional
 Build-Depends: debhelper (>= 9),
                cdbs,
+               dh-linktree,
+               libjs-bootstrap,
+               libjs-twitter-bootstrap,
+               libjs-json,
                r-base-dev,
                r-cran-rcpp,
                r-cran-httpuv,
@@ -23,6 +27,7 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${R:Depends},
+         ${js:Depends},
          r-cran-httpuv,
          r-cran-mime,
          r-cran-jsonlite,

Modified: trunk/packages/R/r-cran-shiny/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-shiny/trunk/debian/copyright	2016-03-25 07:00:42 UTC (rev 21601)
+++ trunk/packages/R/r-cran-shiny/trunk/debian/copyright	2016-03-25 22:55:31 UTC (rev 21602)
@@ -1,6 +1,11 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Winston Chang <winston at rstudio.com>
 Source: https://cran.r-project.org/web/packages/shiny/
+Files-Excluded: */bootstrap/css
+                */bootstrap/fonts
+                */bootstrap/js
+                */html5shiv.min.js
+                */json2-min.js
 
 Files: *
 Copyright: 2013-2016 Winston Chang <winston at rstudio.com>

Added: trunk/packages/R/r-cran-shiny/trunk/debian/linktrees
===================================================================
--- trunk/packages/R/r-cran-shiny/trunk/debian/linktrees	                        (rev 0)
+++ trunk/packages/R/r-cran-shiny/trunk/debian/linktrees	2016-03-25 22:55:31 UTC (rev 21602)
@@ -0,0 +1,5 @@
+embed 		usr/share/javascript/bootstrap/css				usr/lib/R/site-library/shiny/www/shared/bootstrap/css
+embed		usr/share/javascript/bootstrap/fonts				usr/lib/R/site-library/shiny/www/shared/bootstrap/fonts
+embed		usr/share/javascript/bootstrap/js				usr/lib/R/site-library/shiny/www/shared/bootstrap/js
+embed		usr/share/twitter-bootstrap/files/html5shiv/html5shiv.min.js	usr/lib/R/site-library/shiny/www/shared/bootstrap/shim/html5shiv.min.js
+replace		usr/share/javascript/json/json2.min.js				usr/lib/R/site-library/shiny/www/shared/json2-min.js
\ No newline at end of file

Modified: trunk/packages/R/r-cran-shiny/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-shiny/trunk/debian/rules	2016-03-25 07:00:42 UTC (rev 21601)
+++ trunk/packages/R/r-cran-shiny/trunk/debian/rules	2016-03-25 22:55:31 UTC (rev 21602)
@@ -1,3 +1,9 @@
 #!/usr/bin/make -f
 
 include /usr/share/R/debian/r-cran.mk
+
+install/$(package)::
+	dh_linktree replace usr/share/javascript/bootstrap/css/bootstrap-theme.css		usr/lib/R/site-library/shiny/www/shared/bootstrap/css/bootstrap-theme.css
+	dh_linktree replace usr/share/javascript/bootstrap/fonts                            usr/lib/R/site-library/shiny/www/shared/bootstrap/fonts
+	dh_linktree replace usr/share/javascript/bootstrap/js                               usr/lib/R/site-library/shiny/www/shared/bootstrap/js
+	dh_linktree replace usr/share/twitter-bootstrap/files/html5shiv/html5shiv.min.js	usr/lib/R/site-library/shiny/www/shared/bootstrap/shim/html5shiv.min.js

Modified: trunk/packages/R/r-cran-shiny/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-shiny/trunk/debian/watch	2016-03-25 07:00:42 UTC (rev 21601)
+++ trunk/packages/R/r-cran-shiny/trunk/debian/watch	2016-03-25 22:55:31 UTC (rev 21602)
@@ -1,3 +1,4 @@
 version=3
-http://cran.r-project.org/src/contrib/shiny_([-0-9\.]*).tar.gz
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
+   http://cran.r-project.org/src/contrib/shiny_([-0-9\.]*).tar.gz