[med-svn] [r-cran-xml2] 10/14: * New upstream version * Convert to dh-r * Canonical homepage for CRAN * d/watch: version=4

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-xml2.

commit 2f32d34c1904702e7b17ec8bb0554c2853bce1a1
Author: Andreas Tille <tille at debian.org>
Date:   Wed Nov 16 10:16:43 2016 +0000

      * New upstream version
      * Convert to dh-r
      * Canonical homepage for CRAN
      * d/watch: version=4
---
 debian/changelog                               |  9 +++++++++
 debian/control                                 |  9 +++++----
 debian/copyright                               |  5 +++--
 debian/patches/use_debian_packages_boost.patch |  6 +++---
 debian/rules                                   | 10 ++++++----
 debian/watch                                   |  3 +--
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 728a373..ce9fdbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index c638953..147682e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Andreas Tille <tille at debian.org>
 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 @@ Build-Depends: debhelper (>= 9),
 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.
diff --git a/debian/copyright b/debian/copyright
index 2fa5948..4b851d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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
diff --git a/debian/patches/use_debian_packages_boost.patch b/debian/patches/use_debian_packages_boost.patch
index c037665..22ab9a9 100644
--- a/debian/patches/use_debian_packages_boost.patch
+++ b/debian/patches/use_debian_packages_boost.patch
@@ -4,12 +4,12 @@ Description: Use Debian packaged boost library
 
 --- 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
diff --git a/debian/rules b/debian/rules
index 7833277..1a3fd9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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|' \{\} \;
diff --git a/debian/watch b/debian/watch
index 1436619..eff2bcb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
-version=3
+version=4
 http://cran.r-project.org/src/contrib/xml2_([-0-9\.]*).tar.gz
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-xml2.git