[med-svn] [r-cran-tikzdevice] 03/09: * Rebuild against new R version Closes: #863369 * debhelper 10 * Use dh-r instead of cdbs * Standards-Version: 4.1.0 (no changes needed) * 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-tikzdevice.

commit a55b83d92c4f53e3db21d6a96ed9ca7229ebc2f5
Author: Andreas Tille <tille at debian.org>
Date:   Sun Aug 27 12:41:01 2017 +0000

      * Rebuild against new R version
        Closes: #863369
      * debhelper 10
      * Use dh-r instead of cdbs
      * Standards-Version: 4.1.0 (no changes needed)
      * d/watch: version=4
---
 debian/changelog | 11 +++++++++++
 debian/compat    |  2 +-
 debian/control   | 16 ++++++++--------
 debian/copyright |  3 ++-
 debian/rules     | 23 +++++++++++++----------
 debian/watch     |  2 +-
 6 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e121fc5..4182ef8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+r-cran-tikzdevice (0.10-1-2) unstable; urgency=medium
+
+  * Rebuild against new R version
+    Closes: #863369
+  * debhelper 10
+  * Use dh-r instead of cdbs
+  * Standards-Version: 4.1.0 (no changes needed)
+  * d/watch: version=4
+
+ -- Andreas Tille <tille at debian.org>  Sun, 27 Aug 2017 14:29:31 +0200
+
 r-cran-tikzdevice (0.10-1-1) unstable; urgency=low
 
   * Initial release (closes: #837347)
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index aa9b1d3..383c82f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,23 +3,23 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 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-filehash,
                r-cran-png
-Standards-Version: 3.9.8
+Standards-Version: 4.1.0
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-tikzdevice/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-tikzdevice/trunk/
-Homepage: http://cran.r-project.org/web/packages/tikzDevice
+Homepage: https://cran.r-project.org/package=tikzDevice
 
 Package: r-cran-tikzdevice
 Architecture: any
-Depends: ${R:Depends},
+Depends: ${misc:Depends},
          ${shlibs:Depends},
-         ${misc:Depends},
-         r-cran-filehash,
-         r-cran-png
+         ${R:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: GNU R graphics output in LaTeX format
  This GNU R package provides a graphics output device for R that records
  plots in a LaTeX-friendly format. The device transforms plotting
diff --git a/debian/copyright b/debian/copyright
index 1039c60..a9386b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: tikzDevice
 Upstream-Contact: Kirill Müller <krlmlr+r at mailbox.org>
-Source: https://cran.r-project.org/web/packages/tikzDevice
+Source: https://cran.r-project.org/package=tikzDevice
 
 Files: *
 Copyright: 2014-2016 Charlie Sharpsteen, Cameron Bracken, Kirill Müller, Yihui Xie 
diff --git a/debian/rules b/debian/rules
index e2bc9e7..b0e20cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,18 @@
 #!/usr/bin/make -f
 
-include /usr/share/R/debian/r-cran.mk
+include /usr/share/dpkg/default.mk
 
-install/$(package)::
-	rm -rf debian/$(package)/usr/lib/R/site-library/$(cranName)/LICENSE
+%:
+	dh $@ --buildsystem R
 
-# if I would only know how to hook in after dh_installdocs - forget this magic
-# cdbs thingy and remove the file rather in the test sccript ...
-	# Delete tests depending from devtools since this is not (yet) packaged
-#	cd debian/$(package)/usr/share/doc/$(package)/tests/ ; \
-#	if grep -qR devtools * ; then \
-#	    rm -f `grep -lR devtools *` ; \
-#	fi
+override_dh_install:
+	dh_install
+	find debian -name LICENSE -delete
 
+override_dh_installdocs:
+	dh_installdocs
+	# Delete tests depending from devtools since this is not (yet) packaged
+	cd debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/tests/ ; \
+	if grep -qR devtools * ; then \
+	    rm -f `grep -lR devtools *` ; \
+	fi
diff --git a/debian/watch b/debian/watch
index 362e2e1..5d7b1d2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
+version=4
 http://cran.r-project.org/src/contrib/tikzDevice_([-\d.]*)\.tar\.gz

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