[med-svn] r21649 - in trunk/packages/R/r-cran-dplyr/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2016-04-04 19:00:54 +0000 (Mon, 04 Apr 2016)
New Revision: 21649

Modified:
   trunk/packages/R/r-cran-dplyr/trunk/debian/copyright
   trunk/packages/R/r-cran-dplyr/trunk/debian/docs
   trunk/packages/R/r-cran-dplyr/trunk/debian/patches/use_debian_packages_boost.patch
   trunk/packages/R/r-cran-dplyr/trunk/debian/rules
   trunk/packages/R/r-cran-dplyr/trunk/debian/watch
Log:
Take over some diff from Chris (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819343#60)


Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/copyright
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/copyright	2016-04-02 19:57:50 UTC (rev 21648)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/copyright	2016-04-04 19:00:54 UTC (rev 21649)
@@ -8,7 +8,8 @@
 License: MIT
 
 Files: debian/*
-Copyright: 2016 Andreas Tille <tille at debian.org>
+Copyright: 2016 Chris Lawrence <lawrencc at debian.org>,
+                Andreas Tille <tille at debian.org>
 License: MIT
 
 License: MIT

Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/docs
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/docs	2016-04-02 19:57:50 UTC (rev 21648)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/docs	2016-04-04 19:00:54 UTC (rev 21649)
@@ -1,3 +1,4 @@
 tests
 debian/README.test
 debian/tests/run-unit-test
+README.md

Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/patches/use_debian_packages_boost.patch
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/patches/use_debian_packages_boost.patch	2016-04-02 19:57:50 UTC (rev 21648)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/patches/use_debian_packages_boost.patch	2016-04-04 19:00:54 UTC (rev 21649)
@@ -1,4 +1,7 @@
-Author: Andreas Tille <tille at debian.org>
+Description: don't require the BH package for R when building
+ BH is a bundle of Boost headers for R. We can use Boost directly via
+ Debian to build this package, so BH isn't needed.
+Author: Chris Lawrence <lawrencc at debian.org>
 Last-Update: Tue, 22 Mar 2016 21:32:09 +0100
 Description: Use Debian packaged boost library
 

Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/rules
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/rules	2016-04-02 19:57:50 UTC (rev 21648)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/rules	2016-04-04 19:00:54 UTC (rev 21649)
@@ -1,5 +1,17 @@
 #!/usr/bin/make -f
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
+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)::

Modified: trunk/packages/R/r-cran-dplyr/trunk/debian/watch
===================================================================
--- trunk/packages/R/r-cran-dplyr/trunk/debian/watch	2016-04-02 19:57:50 UTC (rev 21648)
+++ trunk/packages/R/r-cran-dplyr/trunk/debian/watch	2016-04-04 19:00:54 UTC (rev 21649)
@@ -1,3 +1,3 @@
 version=3
-http://cran.r-project.org/src/contrib/dplyr_([-0-9\.]*).tar.gz
+http://cran.r-project.org/src/contrib/dplyr_([-0-9\.]*)\.tar\.(gz|bz2|xz)