[med-svn] r23970 - trunk/packages/R/r-cran-tikzdevice/trunk/debian

[Andreas Tille]

Author: tille
Date: 2017-08-27 12:41:01 +0000 (Sun, 27 Aug 2017)
New Revision: 23970

Modified:
   trunk/packages/R/r-cran-tikzdevice/trunk/debian/changelog
   trunk/packages/R/r-cran-tikzdevice/trunk/debian/compat
   trunk/packages/R/r-cran-tikzdevice/trunk/debian/control
   trunk/packages/R/r-cran-tikzdevice/trunk/debian/copyright
   trunk/packages/R/r-cran-tikzdevice/trunk/debian/rules
   trunk/packages/R/r-cran-tikzdevice/trunk/debian/watch
Log:
  * 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


Modified: trunk/packages/R/r-cran-tikzdevice/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-tikzdevice/trunk/debian/changelog	2017-08-27 12:12:26 UTC (rev 23969)
+++ trunk/packages/R/r-cran-tikzdevice/trunk/debian/changelog	2017-08-27 12:41:01 UTC (rev 23970)
@@ -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)

Modified: trunk/packages/R/r-cran-tikzdevice/trunk/debian/compat
===================================================================
--- trunk/packages/R/r-cran-tikzdevice/trunk/debian/compat	2017-08-27 12:12:26 UTC (rev 23969)
+++ trunk/packages/R/r-cran-tikzdevice/trunk/debian/compat	2017-08-27 12:41:01 UTC (rev 23970)
@@ -1 +1 @@
-9
+10

Modified: trunk/packages/R/r-cran-tikzdevice/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-tikzdevice/trunk/debian/control	2017-08-27 12:12:26 UTC (rev 23969)
+++ trunk/packages/R/r-cran-tikzdevice/trunk/debian/control	2017-08-27 12:41:01 UTC (rev 23970)
@@ -3,23 +3,23 @@
 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

Modified: trunk/packages/R/r-cran-tikzdevice/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-tikzdevice/trunk/debian/copyright	2017-08-27 12:12:26 UTC (rev 23969)
+++ trunk/packages/R/r-cran-tikzdevice/trunk/debian/copyright	2017-08-27 12:41:01 UTC (rev 23970)
@@ -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 

Modified: trunk/packages/R/r-cran-tikzdevice/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-tikzdevice/trunk/debian/rules	2017-08-27 12:12:26 UTC (rev 23969)
+++ trunk/packages/R/r-cran-tikzdevice/trunk/debian/rules	2017-08-27 12:41:01 UTC (rev 23970)
@@ -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 ...
+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/$(package)/usr/share/doc/$(package)/tests/ ; \
-#	if grep -qR devtools * ; then \
-#	    rm -f `grep -lR devtools *` ; \
-#	fi
-
+	cd debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/tests/ ; \
+	if grep -qR devtools * ; then \
+	    rm -f `grep -lR devtools *` ; \
+	fi

Modified: trunk/packages/R/r-cran-tikzdevice/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-tikzdevice/trunk/debian/watch	2017-08-27 12:12:26 UTC (rev 23969)
+++ trunk/packages/R/r-cran-tikzdevice/trunk/debian/watch	2017-08-27 12:41:01 UTC (rev 23970)
@@ -1,2 +1,2 @@
-version=3
+version=4
 http://cran.r-project.org/src/contrib/tikzDevice_([-\d.]*)\.tar\.gz