[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

mesa: Changes to 'debian-experimental'



 debian/changelog                             |    8 ++++++
 debian/control                               |   32 +++++++++++++++++++++++++++
 debian/libegl1-mesa-drivers.install.linux.in |    4 ---
 debian/libwayland-egl1-mesa.install.in       |    3 ++
 debian/libwayland-egl1-mesa.symbols          |    5 ++++
 5 files changed, 48 insertions(+), 4 deletions(-)

New commits:
commit e31eb247bbf94678ecf7308e0b7257498f59eb5e
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Mar 17 23:11:24 2014 +0100

    Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 219b25f..8a2952f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-mesa (10.1.0-2) UNRELEASED; urgency=medium
+mesa (10.1.0-2) experimental; urgency=medium
 
-  * Install libwayland-egl in a seperate library package (libwayland-egl1-mesa)
+  [ Sjoerd Simons ]
+  * Install libwayland-egl in a separate library package (libwayland-egl1-mesa)
     and provide a virtual libwayland-egl1 package. (Closes: #739269).
 
- -- Sjoerd Simons <sjoerd@debian.org>  Sun, 16 Mar 2014 22:03:02 +0100
+ -- Julien Cristau <jcristau@debian.org>  Mon, 17 Mar 2014 23:11:14 +0100
 
 mesa (10.1.0-1) experimental; urgency=low
 

commit 39bbc9b2e0f1780939168e1189b9ea7f363e92b5
Author: Sjoerd Simons <sjoerd@luon.net>
Date:   Mon Mar 17 10:54:19 2014 +0100

    libwayland-egl1-mesa: Add breaks/replaces and improve description
    
    Add breaks & replaces to libegl1-mesa-drivers to ensure upgrades work
    successfully as libwayland-egl1-mesa replaces files in that package and
    improve the description

diff --git a/debian/control b/debian/control
index a58be87..69e4497 100644
--- a/debian/control
+++ b/debian/control
@@ -361,15 +361,12 @@ Depends:
 Recommends: libegl1-mesa-drivers
 Provides: libwayland-egl1
 Conflicts: libwayland-egl1
-Replaces: libwayland-egl1
+Replaces: libwayland-egl1, libegl1-mesa-drivers  (<< 10.1.0-2)
+Breaks: libegl1-mesa-drivers (<< 10.1.0-2)
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Description: free implementation of the EGL API -- runtime
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains wayland specific interface for use with EGL.
+Description: implementation of the Wayland EGL platform -- runtime
+ This package contains the mesa implementation of the Wayland EGL platform
 
 Package: libwayland-egl1-mesa-dbg
 Section: debug
@@ -379,12 +376,9 @@ Depends:
  libwayland-egl1-mesa (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
-Description: free implementation of the EGL API -- debugging symbols
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains the debugging symbols for the wayland EGL library.
+Description: implementation of the Wayland EGL platform -- debugging symbols
+ This package contains the debugging symbols for the mesa implementation of the
+ Wayland EGL platform
 
 Package: libopenvg1-mesa
 Section: libs

commit 3d2e8e66ce9c5c07a73f45ef01b9ade475ef5a13
Author: Sjoerd Simons <sjoerd@luon.net>
Date:   Sun Mar 16 22:07:07 2014 +0100

    Install libwayland-egl in a seperate library package (libwayland-egl1-mesa) and provide a virtual libwayland-egl1 package. (Closes: #739269).

diff --git a/debian/changelog b/debian/changelog
index c34f774..219b25f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0-2) UNRELEASED; urgency=medium
+
+  * Install libwayland-egl in a seperate library package (libwayland-egl1-mesa)
+    and provide a virtual libwayland-egl1 package. (Closes: #739269).
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sun, 16 Mar 2014 22:03:02 +0100
+
 mesa (10.1.0-1) experimental; urgency=low
 
   [ Andreas Boll ]
diff --git a/debian/control b/debian/control
index ed08431..a58be87 100644
--- a/debian/control
+++ b/debian/control
@@ -322,6 +322,9 @@ Depends:
  ${misc:Depends},
  libegl1-mesa (= ${binary:Version}),
  libglapi-mesa (= ${binary:Version}),
+ libwayland-egl1-mesa (= ${binary:Version}),
+# for libllvmradeon
+ libgl1-mesa-dri (= ${binary:Version}) [any-i386 any-amd64],
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: free implementation of the EGL API -- hardware drivers
@@ -348,6 +351,41 @@ Description: free implementation of the EGL API -- driver debugging symbols
  This package contains the debugging symbols for the drivers required for
  hardware accelerated rendering of EGL-based graphics libraries.
 
+Package: libwayland-egl1-mesa
+Section: libs
+Architecture: linux-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libegl1-mesa (= ${binary:Version})
+Recommends: libegl1-mesa-drivers
+Provides: libwayland-egl1
+Conflicts: libwayland-egl1
+Replaces: libwayland-egl1
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: free implementation of the EGL API -- runtime
+ This package contains the EGL native platform graphics interface library.
+ EGL provides a platform-agnostic mechanism for creating rendering surfaces
+ for use with other graphics libraries, such as OpenGL|ES and OpenVG.
+ .
+ This package contains wayland specific interface for use with EGL.
+
+Package: libwayland-egl1-mesa-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any
+Depends:
+ libwayland-egl1-mesa (= ${binary:Version}),
+ ${misc:Depends},
+Multi-Arch: same
+Description: free implementation of the EGL API -- debugging symbols
+ This package contains the EGL native platform graphics interface library.
+ EGL provides a platform-agnostic mechanism for creating rendering surfaces
+ for use with other graphics libraries, such as OpenGL|ES and OpenVG.
+ .
+ This package contains the debugging symbols for the wayland EGL library.
+
 Package: libopenvg1-mesa
 Section: libs
 Architecture: linux-any kfreebsd-any
diff --git a/debian/libegl1-mesa-drivers.install.linux.in b/debian/libegl1-mesa-drivers.install.linux.in
index 2c4c266..741f962 100644
--- a/debian/libegl1-mesa-drivers.install.linux.in
+++ b/debian/libegl1-mesa-drivers.install.linux.in
@@ -1,6 +1,2 @@
 # OS-independent part (from libegl1-mesa-drivers.install.in):
 dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so usr/lib/${DEB_HOST_MULTIARCH}/egl
-
-# Wayland support, only on Linux:
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 usr/lib/${DEB_HOST_MULTIARCH}
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0.0 usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libwayland-egl1-mesa.install.in b/debian/libwayland-egl1-mesa.install.in
new file mode 100644
index 0000000..9adea44
--- /dev/null
+++ b/debian/libwayland-egl1-mesa.install.in
@@ -0,0 +1,3 @@
+# Wayland support, only on Linux:
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0.0 usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libwayland-egl1-mesa.symbols b/debian/libwayland-egl1-mesa.symbols
new file mode 100644
index 0000000..4ec0edc
--- /dev/null
+++ b/debian/libwayland-egl1-mesa.symbols
@@ -0,0 +1,5 @@
+libwayland-egl.so.1 libwayland-egl1-mesa #MINVER# | libwayland-egl1
+ wl_egl_window_create@Base 10.0.2
+ wl_egl_window_destroy@Base 10.0.2
+ wl_egl_window_get_attached_size@Base 10.0.2
+ wl_egl_window_resize@Base 10.0.2


Reply to: