[med-svn] r23810 - in trunk/packages/R/r-cran-xml2/branches/jessie-backports: . 1.1.0-1~bpo8+1 1.1.0-1~bpo8+1/patches

Andreas Tille tille at moszumanska.debian.org
Fri Jun 9 13:28:50 UTC 2017


Author: tille
Date: 2017-06-09 13:28:49 +0000 (Fri, 09 Jun 2017)
New Revision: 23810

Added:
   trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/
Modified:
   trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/changelog
   trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/compat
   trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/control
   trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/copyright
   trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/patches/use_debian_packages_boost.patch
   trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/rules
   trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/watch
Log:
Tagged 1.1.0-1~bpo8+1


Modified: trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/changelog
===================================================================
--- trunk/packages/R/r-cran-xml2/branches/jessie-backports/0.1.2-1~bpo8+1/changelog	2017-06-07 10:58:40 UTC (rev 23790)
+++ trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/changelog	2017-06-09 13:28:49 UTC (rev 23810)
@@ -1,3 +1,32 @@
+r-cran-xml2 (1.1.0-1~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+
+ -- Andreas Tille <tille at debian.org>  Fri, 09 Jun 2017 15:14:21 +0200
+
+r-cran-xml2 (1.1.0-1) unstable; urgency=medium
+
+  * New upstream version
+  * debhelper 10
+
+ -- Andreas Tille <tille at debian.org>  Wed, 11 Jan 2017 09:02:13 +0100
+
+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
+  * cme fix dpkg-control
+
+ -- Andreas Tille <tille at debian.org>  Thu, 28 Apr 2016 08:26:49 +0200
+
 r-cran-xml2 (0.1.2-1~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.

Modified: trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/compat
===================================================================
--- trunk/packages/R/r-cran-xml2/branches/jessie-backports/0.1.2-1~bpo8+1/compat	2017-06-07 10:58:40 UTC (rev 23790)
+++ trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/compat	2017-06-09 13:28:49 UTC (rev 23810)
@@ -1 +1 @@
-9
+10

Modified: trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/control
===================================================================
--- trunk/packages/R/r-cran-xml2/branches/jessie-backports/0.1.2-1~bpo8+1/control	2017-06-07 10:58:40 UTC (rev 23790)
+++ trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/control	2017-06-09 13:28:49 UTC (rev 23810)
@@ -3,23 +3,25 @@
 Uploaders: Andreas Tille <tille at debian.org>
 Section: gnu-r
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               cdbs,
+Build-Depends: debhelper (>= 10),
+               dh-r,
                r-base-dev,
                r-cran-rcpp (>= 0.11.4.6),
                libxml2-dev,
                libboost-dev,
                libjs-jquery
-Standards-Version: 3.9.7
+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}
+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/branches/jessie-backports/1.1.0-1~bpo8+1/copyright
===================================================================
--- trunk/packages/R/r-cran-xml2/branches/jessie-backports/0.1.2-1~bpo8+1/copyright	2017-06-07 10:58:40 UTC (rev 23790)
+++ trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/copyright	2017-06-09 13:28:49 UTC (rev 23810)
@@ -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/branches/jessie-backports/1.1.0-1~bpo8+1/patches/use_debian_packages_boost.patch
===================================================================
--- trunk/packages/R/r-cran-xml2/branches/jessie-backports/0.1.2-1~bpo8+1/patches/use_debian_packages_boost.patch	2017-06-07 10:58:40 UTC (rev 23790)
+++ trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/patches/use_debian_packages_boost.patch	2017-06-09 13:28:49 UTC (rev 23810)
@@ -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/branches/jessie-backports/1.1.0-1~bpo8+1/rules
===================================================================
--- trunk/packages/R/r-cran-xml2/branches/jessie-backports/0.1.2-1~bpo8+1/rules	2017-06-07 10:58:40 UTC (rev 23790)
+++ trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/rules	2017-06-09 13:28:49 UTC (rev 23810)
@@ -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/branches/jessie-backports/1.1.0-1~bpo8+1/watch
===================================================================
--- trunk/packages/R/r-cran-xml2/branches/jessie-backports/0.1.2-1~bpo8+1/watch	2017-06-07 10:58:40 UTC (rev 23790)
+++ trunk/packages/R/r-cran-xml2/branches/jessie-backports/1.1.0-1~bpo8+1/watch	2017-06-09 13:28:49 UTC (rev 23810)
@@ -1,3 +1,2 @@
-version=3
+version=4
 http://cran.r-project.org/src/contrib/xml2_([-0-9\.]*).tar.gz
-




More information about the debian-med-commit mailing list