[r-cran-highr] 01/02: Merge branch 'master' into debian/jessie-backports

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch debian/jessie-backports
in repository r-cran-highr.

commit 40f1ccadc39ad24ab36d37402255b9a9b512e411
Merge: 8b6355f 8e77d9d
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jun 6 22:47:32 2017 +0200

    Merge branch 'master' into debian/jessie-backports

 DESCRIPTION                             |   9 +++++----
 MD5                                     |  18 +++++++++---------
 NEWS                                    |  12 ++++++++++++
 R/highlight.R                           |  11 +++++++++--
 R/utils.R                               |  11 +++++++----
 build/vignette.rds                      | Bin 248 -> 248 bytes
 debian/README.test                      |   8 ++++++++
 debian/changelog                        |  13 +++++++++++++
 debian/compat                           |   2 +-
 debian/control                          |  10 ++++++----
 debian/copyright                        |   8 ++++----
 debian/docs                             |   3 +++
 debian/patches/privacy_breach_fix.patch |   4 ++--
 debian/patches/remove_broken_test.patch |  19 +++++++++++++++++++
 debian/patches/series                   |   1 +
 debian/rules                            |  19 ++++++++++++-------
 debian/tests/control                    |   3 +++
 debian/tests/run-unit-test              |  13 +++++++++++++
 debian/watch                            |   2 +-
 inst/doc/highr-custom.html              |   4 ++--
 inst/doc/highr-internals.html           |   4 ++--
 man/hilight.Rd                          |   3 ++-
 tests/testit/test-hilight.R             |   6 ++++++
 23 files changed, 140 insertions(+), 43 deletions(-)

diff --cc debian/changelog
index ed507e2,9628d78..9bf2ea7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ r-cran-highr (0.6-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream version
+   * Architecture: all
+   * convert to dh-r
+   * Canonical CRAN homepage
+   * debhelper 10
+   * d/watch: version=4
+   * Add autopkgtest
+ 
+  -- Andreas Tille <tille at debian.org>  Wed, 30 Nov 2016 11:37:47 +0100
+ 
 +r-cran-highr (0.5.1-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Andreas Tille <tille at debian.org>  Sat, 09 Jul 2016 13:16:05 +0200
 +
  r-cran-highr (0.5.1-2) unstable; urgency=low
  
    * Initial release. Closes: #808808

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-highr.git