[med-svn] [r-cran-shiny] 04/06: New upstream version

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-shiny.

commit 4f96bdf1026480a7151516e98ac2615e8c0067fd
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 14 13:20:08 2017 +0200

    New upstream version
---
 debian/changelog                                  | 5 ++++-
 debian/patches/fix_utils_resolve_for_debian.patch | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cec7c22..3f3c52c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-r-cran-shiny (1.0.0+dfsg-2) UNRELEASED; urgency=medium
+r-cran-shiny (1.0.5+dfsg-1) UNRELEASED; urgency=medium
 
   [ Don Armstrong ]
   * Hack for symlinks to twitter-bootstrap and javascript
     Closes: #867963
 
+  [ Andreas Tille ]
+  * New upstream version
+
  -- Andreas Tille <tille at debian.org>  Thu, 14 Sep 2017 13:17:43 +0200
 
 r-cran-shiny (1.0.0+dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/fix_utils_resolve_for_debian.patch b/debian/patches/fix_utils_resolve_for_debian.patch
index 76b2fbe..f854db6 100644
--- a/debian/patches/fix_utils_resolve_for_debian.patch
+++ b/debian/patches/fix_utils_resolve_for_debian.patch
@@ -10,7 +10,7 @@ Last-Update: 2017-07-10
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/R/utils.R
 +++ b/R/utils.R
-@@ -298,6 +298,12 @@ resolve <- function(dir, relpath) {
+@@ -288,6 +288,12 @@ resolve <- function(dir, relpath) {
    dir <- normalizePath(dir, winslash='/', mustWork=TRUE)
    # trim the possible trailing slash under Windows (#306)
    if (isWindows()) dir <- sub('/$', '', dir)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-shiny.git