Преглед на файлове

Merge #177: Package git-core has been renamed to git

faa2dc2 Package git-core has been renamed to git (MarcoFalke)
pull/182/head
Devrandom преди 2 години
родител
ревизия
8f3625740c
No account linked to committer's email address
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1
    1
      Vagrantfile
  2. 1
    1
      bin/make-base-vm

+ 1
- 1
Vagrantfile Целия файл

@@ -5,7 +5,7 @@ set -eu

sudo apt-get update -y
sudo apt-get upgrade -y
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
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

echo "ok"


+ 1
- 1
bin/make-base-vm Целия файл

@@ -118,7 +118,7 @@ if [ $DISTRO = "debian" ]; then
LOCALE_PKG=locales
fi

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

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

Loading…
Отказ
Запис