[med-svn] r23073 - in trunk/packages/R/r-cran-xml2/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2016-11-16 10:16:43 +0000 (Wed, 16 Nov 2016)
New Revision: 23073

Modified:
   trunk/packages/R/r-cran-xml2/trunk/debian/changelog
   trunk/packages/R/r-cran-xml2/trunk/debian/control
   trunk/packages/R/r-cran-xml2/trunk/debian/copyright
   trunk/packages/R/r-cran-xml2/trunk/debian/patches/use_debian_packages_boost.patch
   trunk/packages/R/r-cran-xml2/trunk/debian/rules
   trunk/packages/R/r-cran-xml2/trunk/debian/watch
Log:
  * New upstream version
  * Convert to dh-r
  * Canonical homepage for CRAN
  * d/watch: version=4



Modified: trunk/packages/R/r-cran-xml2/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-xml2/trunk/debian/changelog	2016-11-16 10:04:44 UTC (rev 23072)
+++ trunk/packages/R/r-cran-xml2/trunk/debian/changelog	2016-11-16 10:16:43 UTC (rev 23073)
@@ -1,3 +1,12 @@
+r-cran-xml2 (1.0.0-1) unstable; urgency=medium
+
+  * New upstream version
+  * Convert to dh-r
+  * Canonical homepage for CRAN
+  * d/watch: version=4
+
+ -- Andreas Tille <tille at debian.org>  Wed, 16 Nov 2016 11:10:54 +0100
+
 r-cran-xml2 (0.1.2-2) unstable; urgency=medium
 
   * Add missing dependency: r-cran-rcpp

Modified: trunk/packages/R/r-cran-xml2/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-xml2/trunk/debian/control	2016-11-16 10:04:44 UTC (rev 23072)
+++ trunk/packages/R/r-cran-xml2/trunk/debian/control	2016-11-16 10:16:43 UTC (rev 23073)
@@ -4,7 +4,7 @@
 Section: gnu-r
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               cdbs,
+               dh-r,
                r-base-dev,
                r-cran-rcpp (>= 0.11.4.6),
                libxml2-dev,
@@ -13,14 +13,15 @@
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-xml2/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-xml2/trunk/
-Homepage: https://cran.r-project.org/web/packages/xml2/
+Homepage: https://cran.r-project.org/package=xml2
 
 Package: r-cran-xml2
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         ${R:Depends},
-         r-cran-rcpp (>= 0.11.4.6)
+         ${R:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: GNU R XML parser
  This GNU R package works with XML files using a simple, consistent
  interface. Built on top of the 'libxml2' C library.

Modified: trunk/packages/R/r-cran-xml2/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-xml2/trunk/debian/copyright	2016-11-16 10:04:44 UTC (rev 23072)
+++ trunk/packages/R/r-cran-xml2/trunk/debian/copyright	2016-11-16 10:16:43 UTC (rev 23073)
@@ -1,6 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xml2
 Upstream-Contact: Hadley Wickham <hadley at rstudio.com>
-Source: https://cran.r-project.org/web/packages/xml2/
+Source: https://cran.r-project.org/package=xml2
 
 Files: *
 Copyright: 2013-2016 Hadley Wickham <hadley at rstudio.com>, RStudio

Modified: trunk/packages/R/r-cran-xml2/trunk/debian/patches/use_debian_packages_boost.patch
===================================================================
--- trunk/packages/R/r-cran-xml2/trunk/debian/patches/use_debian_packages_boost.patch	2016-11-16 10:04:44 UTC (rev 23072)
+++ trunk/packages/R/r-cran-xml2/trunk/debian/patches/use_debian_packages_boost.patch	2016-11-16 10:16:43 UTC (rev 23073)
@@ -4,12 +4,12 @@
 
 --- a/DESCRIPTION
 +++ b/DESCRIPTION
-@@ -14,7 +14,7 @@ URL: https://github.com/hadley/xml2/issu
+@@ -15,7 +15,7 @@ URL: https://github.com/hadley/xml2/
  BugReports: https://github.com/hadley/xml2/issues/
  Depends: R (>= 3.1.0)
  Imports: Rcpp
 -LinkingTo: Rcpp (>= 0.11.4.6), BH
 +LinkingTo: Rcpp (>= 0.11.4.6)
- Suggests: testthat, curl
+ Suggests: testthat, curl, covr, knitr, rmarkdown, magrittr, httr
+ SystemRequirements: libxml2: libxml2-dev (deb), libxml2-devel (rpm)
  License: GPL (>= 2)
- NeedsCompilation: yes

Modified: trunk/packages/R/r-cran-xml2/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-xml2/trunk/debian/rules	2016-11-16 10:04:44 UTC (rev 23072)
+++ trunk/packages/R/r-cran-xml2/trunk/debian/rules	2016-11-16 10:16:43 UTC (rev 23073)
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/R/debian/r-cran.mk
+%:
+	dh $@ --buildsystem R
 
-install/$(package)::
-	sed -i -e 's|http.*/jquery.min.js|file://usr/share/javascript/jquery/jquery.min.js|' \
-		$(debRlib)/$(cranName)/extdata/r-project.html
+override_dh_install:
+	dh_install
+	find debian -name r-project.html -exec \
+		sed -i -e 's|http.*/jquery.min.js|file://usr/share/javascript/jquery/jquery.min.js|' \{\} \;

Modified: trunk/packages/R/r-cran-xml2/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-xml2/trunk/debian/watch	2016-11-16 10:04:44 UTC (rev 23072)
+++ trunk/packages/R/r-cran-xml2/trunk/debian/watch	2016-11-16 10:16:43 UTC (rev 23073)
@@ -1,3 +1,2 @@
-version=3
+version=4
 http://cran.r-project.org/src/contrib/xml2_([-0-9\.]*).tar.gz
-