[med-svn] r23033 - trunk/packages/R/r-cran-tibble/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-11-10 09:41:33 +0000 (Thu, 10 Nov 2016)
New Revision: 23033

Modified:
   trunk/packages/R/r-cran-tibble/trunk/debian/changelog
   trunk/packages/R/r-cran-tibble/trunk/debian/control
   trunk/packages/R/r-cran-tibble/trunk/debian/copyright
   trunk/packages/R/r-cran-tibble/trunk/debian/rules
   trunk/packages/R/r-cran-tibble/trunk/debian/watch
Log:
  TODO: Deal with test failures
  * New upstream version
  * Convert to dh-r
  * Canonical homepage for CRAN
  * d/watch: version=4



Modified: trunk/packages/R/r-cran-tibble/trunk/debian/changelog
===================================================================
--- trunk/packages/R/r-cran-tibble/trunk/debian/changelog	2016-11-10 08:48:40 UTC (rev 23032)
+++ trunk/packages/R/r-cran-tibble/trunk/debian/changelog	2016-11-10 09:41:33 UTC (rev 23033)
@@ -1,9 +1,14 @@
-r-cran-tibble (1.1-2) UNRELEASED; urgency=medium
+r-cran-tibble (1.2-1) UNRELEASED; urgency=medium
 
+  TODO: Deal with test failures
+  * New upstream version
   * Fixed watch file
   * Adjusted Test depends (thanks to Gordon Ball)
+  * Convert to dh-r
+  * Canonical homepage for CRAN
+  * d/watch: version=4
 
- -- Andreas Tille <tille at debian.org>  Sun, 24 Jul 2016 08:32:22 +0200
+ -- Andreas Tille <tille at debian.org>  Thu, 10 Nov 2016 09:51:01 +0100
 
 r-cran-tibble (1.1-1) unstable; urgency=medium
 

Modified: trunk/packages/R/r-cran-tibble/trunk/debian/control
===================================================================
--- trunk/packages/R/r-cran-tibble/trunk/debian/control	2016-11-10 08:48:40 UTC (rev 23032)
+++ trunk/packages/R/r-cran-tibble/trunk/debian/control	2016-11-10 09:41:33 UTC (rev 23033)
@@ -4,7 +4,7 @@
 Section: gnu-r
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               cdbs,
+               dh-r,
                r-base-dev,
                r-cran-assertthat,
                r-cran-lazyeval,
@@ -12,16 +12,15 @@
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-cran-tibble/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-cran-tibble/trunk/
-Homepage: https://cran.r-project.org/web/packages/tibble/
+Homepage: https://cran.r-project.org/package=tibble
 
 Package: r-cran-tibble
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         ${R:Depends},
-         r-cran-assertthat,
-         r-cran-lazyeval,
-         r-cran-rcpp
+         ${R:Depends}
+Recommends: ${R:Recommends}
+Suggests: ${R:Suggests}
 Description: GNU R Simple Data Frames
  This GNU R package provides a 'tbl_df' class that offers better checking
  and printing capabilities than traditional data frames.

Modified: trunk/packages/R/r-cran-tibble/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-tibble/trunk/debian/copyright	2016-11-10 08:48:40 UTC (rev 23032)
+++ trunk/packages/R/r-cran-tibble/trunk/debian/copyright	2016-11-10 09:41:33 UTC (rev 23033)
@@ -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-Contact: Kirill Müller <krlmlr+r at mailbox.org>
-Source: https://cran.r-project.org/web/packages/tibble
+Upstream-Name: tibble
+Source: https://cran.r-project.org/package=tibble
 
 Files: *
 Copyright: 2013-2016 Hadley Wickham, Romain Francois, Kirill Müller, RStudio 

Modified: trunk/packages/R/r-cran-tibble/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-tibble/trunk/debian/rules	2016-11-10 08:48:40 UTC (rev 23032)
+++ trunk/packages/R/r-cran-tibble/trunk/debian/rules	2016-11-10 09:41:33 UTC (rev 23033)
@@ -1,18 +1,8 @@
 #!/usr/bin/make -f
 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+%:
+	dh $@ --buildsystem R
 
-PKG_CFLAGS=$(CFLAGS)
-PKG_CXXFLAGS=$(CXXFLAGS)
-PKG_CPPFLAGS=$(CPPFLAGS)
-PKG_FFLAGS=$(FFLAGS)
-
-export PKG_CFLAGS PKG_CXXFLAGS PKG_CPPFLAGS PKG_FFLAGS
-
-makeFlags="LDFLAGS=$(LDFLAGS)"
-
-include /usr/share/R/debian/r-cran.mk
-
-install/$(package)::
-	rm -rf $(debRlib)/$(cranName)/LICENSE
+override_dh_install:
+	dh_install
+	find debian -name LICENSE -delete

Modified: trunk/packages/R/r-cran-tibble/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-tibble/trunk/debian/watch	2016-11-10 08:48:40 UTC (rev 23032)
+++ trunk/packages/R/r-cran-tibble/trunk/debian/watch	2016-11-10 09:41:33 UTC (rev 23033)
@@ -1,3 +1,3 @@
-version=3
+version=4
 http://cran.r-project.org/src/contrib/tibble_([-0-9\.]*)\.tar\.(?:gz|bz2|xz)