[r-cran-formatr] 01/02: Merge tag 'debian/1.4-1' 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-formatr.

commit 7ec55ed36e76ee6bcdf9af8ccba3817e58696c79
Merge: aea952c 4efe1b0
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jun 6 22:20:49 2017 +0200

    Merge tag 'debian/1.4-1' into debian/jessie-backports

 DESCRIPTION                |   9 +++---
 MD5                        |  28 +++++++++---------
 NAMESPACE                  |   3 --
 NEWS                       |  35 +++++++++++++++++++++++
 R/deprecated.R             |  28 ------------------
 R/tidy.R                   |  59 +++++---------------------------------
 R/usage.R                  |  13 ++++-----
 R/utils.R                  |  55 ++++++++++++++++++++++++++++++++----
 build/vignette.rds         | Bin 215 -> 215 bytes
 debian/README.test         |   9 ++++++
 debian/changelog           |  16 +++++++++++
 debian/compat              |   2 +-
 debian/control             |  22 +++++++++------
 debian/copyright           |   6 ++--
 debian/docs                |   3 ++
 debian/rules               |  14 +++------
 debian/tests/control       |   3 ++
 debian/tests/run-unit-test |  13 +++++++++
 debian/watch               |   6 ++--
 inst/doc/formatR.R         |   3 ++
 inst/doc/formatR.Rmd       |  49 +++++++++-----------------------
 inst/doc/formatR.html      |  69 +++++++++++++--------------------------------
 man/deprecated.Rd          |  25 ----------------
 man/usage.Rd               |   2 +-
 tests/testit/test-tidy.R   |  26 ++++++++++++++++-
 vignettes/formatR.Rmd      |  49 +++++++++-----------------------
 26 files changed, 259 insertions(+), 288 deletions(-)

diff --cc debian/changelog
index b19ee84,28aeb18..5826aa3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ r-cran-formatr (1.4-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream version
+   * cme fix dpkg-control
+   * convert to dh-r
+   * Canonical CRAN homepage
+   * debhelper 10
+   * d/watch:
+      - version=4
+      - do not replace '-' by '.' in upstream version
+   * Add autopkgtest
+   * do not Build-Depend: dpkg-dev
+ 
+  -- Andreas Tille <tille at debian.org>  Tue, 29 Nov 2016 13:39:53 +0100
+ 
 +r-cran-formatr (1.2.1-4~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Andreas Tille <tille at debian.org>  Sat, 09 Jul 2016 13:14:56 +0200
 +
  r-cran-formatr (1.2.1-4) unstable; urgency=low
  
    * debian/watch: use real upstream name: s/formatr/formatR/.

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