Skip to content

Commit 8f36257

Browse files
committed
Merge #177: Package git-core has been renamed to git
faa2dc2 Package git-core has been renamed to git (MarcoFalke)
2 parents d520618 + faa2dc2 commit 8f36257

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -eu
55
66
sudo apt-get update -y
77
sudo apt-get upgrade -y
8-
sudo apt-get install -y autoconf2.13 automake build-essential bsdmainutils faketime g++ g++-mingw-w64 git-core libqt4-dev libtool libz-dev mingw-w64 nsis pciutils pkg-config psmisc subversion unzip zip
8+
sudo apt-get install -y autoconf2.13 automake build-essential bsdmainutils faketime g++ g++-mingw-w64 git libqt4-dev libtool libz-dev mingw-w64 nsis pciutils pkg-config psmisc subversion unzip zip
99
1010
echo "ok"
1111

bin/make-base-vm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if [ $DISTRO = "debian" ]; then
118118
LOCALE_PKG=locales
119119
fi
120120

121-
addpkg=pciutils,build-essential,git-core,subversion,$LOCALE_PKG,wget,lsb-release
121+
addpkg=pciutils,build-essential,git,subversion,$LOCALE_PKG,wget,lsb-release
122122

123123
if [ $DISTRO = "ubuntu" ]; then
124124
# Need comma at end to work around an issue with apt for Debian <= Wheezy regarding empty strings

0 commit comments

Comments
 (0)