Merge remote-tracking branch 'upstream/master' into upstream

README.md

@@ -8,6 +8,9 @@ Vagrant Host Manager
 
 `vagrant-hostmanager` is a Vagrant plugin that manages the `hosts` file on guest machines (and optionally the host). Its goal is to enable resolution of multi-machine environments deployed with a cloud provider where IP addresses are not known in advance.
 
+Do you like what we do? Consider supporting us through Patreon. All of the money goes directly back into growing our collection of open source and free software.
+[![Patreon](https://img.shields.io/badge/patreon-donate-red.svg)](https://www.patreon.com/devopsgroup)
+
 Installation
 ------------
 

debian/changelog

@@ -1,5 +0,0 @@
-vagrant-hostmanager (1.8.9-1) unstable; urgency=medium
-
-  * Initial release (Closes: #898996)
-
- -- Kienan Stewart <kienan.stewart@burntworld.ca>  Thu, 17 May 2018 22:07:59 -0400

debian/compat

@@ -1 +0,0 @@
-10

debian/control

@@ -1,25 +0,0 @@
-Source: vagrant-hostmanager
-Section: ruby
-Priority: optional
-Maintainer: Kienan Stewart <kienan.stewart@burntworld.ca>
-Build-Depends: debhelper (>= 10),
-               gem2deb,
-               rake,
-               vagrant
-Standards-Version: 4.1.4
-Homepage: https://github.com/devopsgroup-io/vagrant-hostmanager
-Vcs-Git: https://salsa.debian.org/kienan-guest/vagrant-hostmanager.git
-Vcs-Browser: https://salsa.debian.org/kienan-guest/vagrant-hostmanager
-XS-Ruby-Versions: all
-
-Package: vagrant-hostmanager
-Architecture: all
-XB-Ruby-Versions: ${ruby:Versions}
-Depends: ruby | ruby-interpreter,
-         ${shlibs:Depends},
-         ${misc:Depends}
-Description: Vagrant plugin for managing /etc/hosts on guests and host
- vagrant-hostmanager is a Vagrant plugin that manages the hosts file on guest
- machines (and optionally the host). Its goal is to enable resolution of
- multi-machine environments deployed with a cloud provider where IP addresses
- are not known in advance.

debian/copyright

@@ -1,33 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: vagrant-hostmanager
-Source: https://github.com/devopsgroup-io/vagrant-hostmanager
-
-Files: *
-Copyright: 2013 Shawn Dahlen <shawn@dahlen.me>,
-           2015-2018 Seth Reeser <seth.reeser@devopsgroup.io>,
-           2013-2018 vagrant-hostmanager contributors
-License: MPL-2.0
-
-Files: debian/*
-Copyright: 2018 Kienan Stewart <kienan.stewart@burntworld.ca>
-License: MPL-2.0
-Comment: the Debian packaging is licensed under the same terms as the original package.
-
-Files: debian/tests/smoke-test
-Copyright: 2016, Hans-Christoph Steiner <hans@eds.org>
-License: MIT
-
-License: MPL-2.0
- Placeholder
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.

debian/docs

@@ -1 +0,0 @@
-README.md

debian/gbp.conf

@@ -1,2 +0,0 @@
-[DEFAULT]
-upstream-tag = v%(version)s

debian/install

@@ -1 +0,0 @@
-locales usr/share/vagrant-plugins/vagrant-hostmanager/

debian/patches/01_use_different_locale_directory

@@ -1,14 +0,0 @@
-Description: Use different locales directory
- Locale files are installed into /usr/share/vagrant-plugins instead of
- being located relative to the source root.
---- vagrant-hostmanager-1.8.8.orig/lib/vagrant-hostmanager.rb
-+++ vagrant-hostmanager-1.8.8/lib/vagrant-hostmanager.rb
-@@ -8,7 +8,7 @@ module VagrantPlugins
-       @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
-     end
- 
--    I18n.load_path << File.expand_path('locales/en.yml', source_root)
-+    I18n.load_path << File.expand_path("/usr/share/vagrant-plugins/vagrant-hostmanager/locales/en.yml", __FILE__)
-     I18n.reload!
-   end
- end

debian/patches/series

@@ -1 +0,0 @@
-01_use_different_locale_directory

debian/rules

@@ -1,18 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/dpkg/default.mk
-
-export GEM2DEB_TEST_RUNNER = --check-dependencies
-
-%:
-	dh $@ --buildsystem=ruby --with ruby
-
-override_dh_auto_install:
-	dh_auto_install
-	dh_vagrant_plugin
-
-newtarball = new$(DEB_VERSION_UPSTREAM).tar.gz
-get-orig-source:
-	wget --continue -O $(newtarball) \
-		https://github.com/devopsgroup-io/vagrant-hostmanager/releases/v$(DEB_VERSION_UPSTREAM).tar.gz
-	mk-origtargz --rename $(newtarball)

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

debian/tests/control

@@ -1,2 +0,0 @@
-Tests: smoke-test
-Depends: vagrant, @

debian/tests/smoke-test

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-
-set -e
-
-vagrant plugin list | grep vagrant-hostmanager
-
-vagrant global-status

debian/watch

@@ -1,2 +0,0 @@
-version=4
-https://gemwatch.debian.net/vagrant-hostmanager .*/vagrant-hostmanager-(.*).tar.gz

lib/vagrant-hostmanager.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
       @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
 
-    I18n.load_path << File.expand_path("/usr/share/vagrant-plugins/vagrant-hostmanager/locales/en.yml", __FILE__)
+    I18n.load_path << File.expand_path('locales/en.yml', source_root)
     I18n.reload!
   end
 end