Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xserver / 
xorg-server


Commits:
990ddd07 by Timo Aaltonen at 2018-06-13T11:04:43+03:00
remove upstream .gitlab-ci.yml, it makes no sense on salsa

- - - - -
d1cce6cb by Timo Aaltonen at 2018-06-13T11:10:47+03:00
control: Add Breaks on libgl1-mesa-dri older than 18.0.5.

- - - - -


3 changed files:

- − .gitlab-ci.yml
- debian/changelog
- debian/control


Changes:

=====================================
.gitlab-ci.yml deleted
=====================================
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-image: docker:latest
-services:
-    - docker:dind
-
-before_script:
-    - echo FROM nwnk/xserver-travis-rawhide:v5 > Dockerfile
-    - echo ADD . /root >> Dockerfile
-    - echo WORKDIR /root >> Dockerfile
-    - docker build -t withgit .
-
-job:
-    script:
-        - docker run --volume $HOME/.ccache:/root/.ccache withgit 
./test/scripts/build-travis-deps.sh


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.20.0-3) UNRELEASED; urgency=medium
+
+  * control: Add Breaks on libgl1-mesa-dri older than 18.0.5.
+
+ -- Timo Aaltonen <[email protected]>  Wed, 13 Jun 2018 11:07:10 +0300
+
 xorg-server (2:1.20.0-2) unstable; urgency=medium
 
   * Bump some minimum (build) dependencies.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -102,6 +102,7 @@ Recommends:
  libpam-systemd,
 Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
 Breaks:
+ libgl1-mesa-dri (<< 18.0.5),
  xserver-xorg (<< 1:7.7+10~),
  systemd (<< 226-4~),
 Replaces:



View it on GitLab: 
https://salsa.debian.org/xorg-team/xserver/xorg-server/compare/4a2fd9434c3547aafbd8b823af0d6501d02efbe7...d1cce6cbac2df16d9716aef5a4a2a2139a1bf1a0

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/xserver/xorg-server/compare/4a2fd9434c3547aafbd8b823af0d6501d02efbe7...d1cce6cbac2df16d9716aef5a4a2a2139a1bf1a0
You're receiving this email because of your account on salsa.debian.org.

Reply via email to