catching up to master branch

Author: eddelbuettel

ChangeLog

@@ -1,9 +1,14 @@
+<<<<<<< HEAD
 2014-06-11  Dirk Eddelbuettel  <edd@debian.org>
 
         * inst/include/Rcpp/macros/macros.h: No longer include
         macros/preprocessor_generated.h which was deprecated as of Rcpp 0.10.5
         * inst/include/Rcpp/macros/preprocessor_generated.h: Removed
 
+2014-06-08  Dirk Eddelbuettel  <edd@debian.org>
+
+        * cleanup: Do not remove 'build/Rcpp.pdf', thanks to hint by Kurt / CRAN
+
 2014-06-06  Dirk Eddelbuettel  <edd@debian.org>
 
         * DESCRIPTION: Release 0.11.2

cleanup

@@ -22,7 +22,6 @@ rm -f confdefs.h config.log config.status \
 	inst/unitTests/testRcppClass/src/*.o \
 	inst/unitTests/testRcppClass/src/*.so \
 	src/Makedeps libRcpp.a \
-	build/Rcpp.pdf \
 	src/symbols.rds \
 	inst/unitTests/testRcppClass/src/symbols.rds \
 	vignettes/*.aux vignettes/*.log vignettes/*.out \

debian/r-cran-rcpp.lintian-overrides

@@ -77,3 +77,4 @@ r-cran-rcpp: script-not-executable usr/lib/R/site-library/Rcpp/examples/Convolve
 r-cran-rcpp: script-not-executable usr/lib/R/site-library/Rcpp/unitTests/runit.na.R
 r-cran-rcpp: script-not-executable usr/lib/R/site-library/Rcpp/unitTests/runit.subset.R
 r-cran-rcpp: script-not-executable usr/lib/R/site-library/Rcpp/unitTests/runit.table.R
+r-cran-rcpp: script-not-executable usr/lib/R/site-library/Rcpp/unitTests/runit.attributes.R