Fix duplicates being added to .travis.yml & debain-template/control

This commit is contained in:
Sally Coolatta 2020-08-09 21:32:55 -04:00
parent e296e1309a
commit 9afadccefa
3 changed files with 0 additions and 22 deletions

View file

@ -25,7 +25,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -44,7 +43,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -63,7 +61,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -88,7 +85,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -108,7 +104,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -128,7 +123,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -152,7 +146,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -172,7 +165,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -192,7 +184,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -212,7 +203,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -232,7 +222,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -490,7 +479,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -519,7 +507,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -548,7 +535,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -577,7 +563,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -606,7 +591,6 @@ matrix:
- libpng-dev
- libgl1-mesa-dev
- libgme-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full
@ -651,7 +635,6 @@ addons:
- libgl1-mesa-dev
- libgme-dev
- zlib1g-dev
- libcurl4-openssl-dev
- libopenmpt-dev
- libcurl4-openssl-dev
- p7zip-full

View file

@ -1,8 +1,4 @@
<<<<<<< HEAD
version: 2.0.{branch}-{build}
=======
version: 2.2.6.{branch}-{build}
>>>>>>> srb2/next
os: MinGW
environment:

View file

@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 7.0.50~),
libgme-dev,
libcurl4-openssl-dev,
libopenmpt-dev,
libcurl4-openssl-dev,
libglu1-dev | libglu-dev,
libosmesa6-dev | libgl-dev,
nasm [i386]