mesa: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/control | 4 ++--
debian/libgl1-mesa-dri.install.in | 1 +
debian/libgl1-mesa-dri.install.kfreebsd.in | 1 -
4 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit e6197c676a887dac80dd577ab3d254d61c76e112
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Mar 20 18:17:18 2014 +0100
Install /etc/drirc on hurd (Closes: #741572).
diff --git a/debian/changelog b/debian/changelog
index 2c47bb8..2915d1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (10.1.0-4) UNRELEASED; urgency=medium
* Fix unsatisfiable libwayland-egl1-mesa and libwayland-dev dependency on
!linux (Closes: #742306).
+ * Install /etc/drirc on hurd (Closes: #741572).
-- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 20 Mar 2014 18:12:38 +0100
diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in
new file mode 100644
index 0000000..1d835ea
--- /dev/null
+++ b/debian/libgl1-mesa-dri.install.in
@@ -0,0 +1 @@
+dri/etc/drirc etc
diff --git a/debian/libgl1-mesa-dri.install.kfreebsd.in b/debian/libgl1-mesa-dri.install.kfreebsd.in
deleted file mode 100644
index 1d835ea..0000000
--- a/debian/libgl1-mesa-dri.install.kfreebsd.in
+++ /dev/null
@@ -1 +0,0 @@
-dri/etc/drirc etc
commit 2b8ea351a52eb7433f66914f34a2c0939946f8c9
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Mar 20 18:13:56 2014 +0100
Fix unsatisfiable libwayland-egl1-mesa and libwayland-dev dependency on !linux
Closes: #742306
diff --git a/debian/changelog b/debian/changelog
index bada1b8..2c47bb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0-4) UNRELEASED; urgency=medium
+
+ * Fix unsatisfiable libwayland-egl1-mesa and libwayland-dev dependency on
+ !linux (Closes: #742306).
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 20 Mar 2014 18:12:38 +0100
+
mesa (10.1.0-3) unstable; urgency=medium
[ Andreas Boll ]
diff --git a/debian/control b/debian/control
index 7d78cb9..063f59b 100644
--- a/debian/control
+++ b/debian/control
@@ -303,7 +303,7 @@ Depends:
libxcb-sync-dev,
libxshmfence-dev,
libx11-xcb-dev,
- libwayland-dev (>= 1.2.0),
+ libwayland-dev (>= 1.2.0) [linux-any],
${misc:Depends},
Description: free implementation of the EGL API -- development files
This package contains the development environment required for compiling
@@ -322,7 +322,7 @@ Depends:
${misc:Depends},
libegl1-mesa (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
- libwayland-egl1-mesa (= ${binary:Version}),
+ libwayland-egl1-mesa (= ${binary:Version}) [linux-any],
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the EGL API -- hardware drivers
Reply to: