[pkg-d-commits] [dub] 02/04: Merge tag 'upstream/1.2.0'

[Matthias Klumpp]

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

mak pushed a commit to branch master
in repository dub.

commit 45410482ac66cf6f748891ec156fd0ad29143c6a
Merge: 1ac85b8 4a7b626
Author: Matthias Klumpp <mak at debian.org>
Date:   Tue Jan 24 22:34:05 2017 +0100

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 .travis.yml                                        |   4 +-
 CHANGELOG.md                                       |  38 +++++-
 dub.sdl                                            |   4 +-
 dub.selections.json                                |   2 +-
 scripts/fish-completion/dub.fish                   |   2 +-
 source/dub/commandline.d                           |  48 ++++---
 source/dub/compilers/dmd.d                         |   1 +
 source/dub/compilers/utils.d                       |   3 +-
 source/dub/dependencyresolver.d                    |   6 +-
 source/dub/dub.d                                   | 100 +++++++++++----
 source/dub/generators/build.d                      |  17 +--
 source/dub/generators/sublimetext.d                |   1 +
 source/dub/init.d                                  |   8 +-
 source/dub/internal/vibecompat/data/json.d         |  40 +++---
 .../dub/internal/vibecompat/data/serialization.d   |   2 +-
 source/dub/internal/vibecompat/data/utils.d        |   2 +-
 source/dub/internal/vibecompat/inet/path.d         |   2 +-
 source/dub/internal/vibecompat/inet/url.d          |   2 +-
 source/dub/package_.d                              |  14 ++-
 source/dub/packagemanager.d                        |  10 +-
 source/dub/platform.d                              |   2 +-
 source/dub/project.d                               | 138 ++++++++++++++-------
 source/dub/version_.d                              |   2 +-
 test/issue1004-override-config.sh                  |   4 +
 test/issue1004-override-config/.no_build           |   0
 test/issue1004-override-config/a/a.d               |   5 +
 test/issue1004-override-config/a/dub.sdl           |   9 ++
 test/issue1004-override-config/main/dub.sdl        |   2 +
 test/issue1004-override-config/main/source/main.d  |   6 +
 test/issue1005-configuration-resolution.sh         |   4 +
 test/issue1005-configuration-resolution/.no_build  |   0
 test/issue1005-configuration-resolution/a/dub.sdl  |  10 ++
 test/issue1005-configuration-resolution/b/dub.sdl  |   7 ++
 .../b/source/b.d                                   |   3 +
 test/issue1005-configuration-resolution/c/dub.sdl  |   2 +
 .../main/dub.sdl                                   |   6 +
 .../main/source/app.d                              |   6 +
 test/issue1024-selective-upgrade.sh                |  15 +++
 test/issue1024-selective-upgrade/.no_build         |   0
 test/issue1024-selective-upgrade/a-1.0.0/dub.sdl   |   2 +
 test/issue1024-selective-upgrade/a-1.0.1/dub.sdl   |   2 +
 test/issue1024-selective-upgrade/b-1.0.0/dub.sdl   |   2 +
 test/issue1024-selective-upgrade/b-1.0.1/dub.sdl   |   2 +
 test/issue1024-selective-upgrade/main/dub.sdl      |   3 +
 44 files changed, 393 insertions(+), 145 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/dub.git