debian/changelog | 6 ++++
debian/control | 76 ++++++++++++++++++++++++++++-----------------------
debian/not-installed | 2 -
debian/rules | 2 -
4 files changed, 50 insertions(+), 36 deletions(-)
New commits:
commit c47dfb4a975ad67d5178162413d7cc3e685b0a1b
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Sep 9 06:31:01 2015 +0300
release to trusty
diff --git a/debian/changelog b/debian/changelog
index 801d01a..aedfcb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa-lts-vivid (10.5.9-2ubuntu1~trusty3) UNRELEASED; urgency=medium
+mesa-lts-vivid (10.5.9-2ubuntu1~trusty3) trusty; urgency=medium
* control: Add renamed libosmesa6/-dev. (LP: #1424059)
- -- Timo Aaltonen <tjaal...@debian.org> Tue, 08 Sep 2015 14:33:08 +0300
+ -- Timo Aaltonen <tjaal...@debian.org> Wed, 09 Sep 2015 06:28:54 +0300
mesa-lts-vivid (10.5.9-2ubuntu1~trusty2) trusty; urgency=medium
commit 37779260883f916d07581ccc1b9291968f7b91cc
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Tue Sep 8 14:36:22 2015 +0300
control: Add renamed libosmesa6/-dev. (LP: #1424059)
diff --git a/debian/changelog b/debian/changelog
index 0433b99..801d01a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa-lts-vivid (10.5.9-2ubuntu1~trusty3) UNRELEASED; urgency=medium
+
+ * control: Add renamed libosmesa6/-dev. (LP: #1424059)
+
+ -- Timo Aaltonen <tjaal...@debian.org> Tue, 08 Sep 2015 14:33:08 +0300
+
mesa-lts-vivid (10.5.9-2ubuntu1~trusty2) trusty; urgency=medium
* Backport vivid package for lts-vivid stack.
diff --git a/debian/control b/debian/control
index 9c0f064..5622c6a 100644
--- a/debian/control
+++ b/debian/control
@@ -649,40 +649,48 @@ Description: Developer documentation for Mesa
Provides: mesa-common-dev, xorg-renamed-package, xorg-renamed-package-lts-vivid
Conflicts: mesa-common-dev, xorg-renamed-package-lts-utopic,
-#Package: libosmesa6
-#Section: libs
-#Architecture: any
-#Depends:
-# ${shlibs:Depends},
-# ${misc:Depends},
-# libglapi-mesa (= ${binary:Version}),
-#Replaces: libgl1-mesa-swx11 (<< 6.5.2)
-#Pre-Depends: ${misc:Pre-Depends}
-#Multi-Arch: same
-#Description: Mesa Off-screen rendering extension
-# OSmesa is a Mesa extension that allows programs to render to an
-# off-screen buffer using the OpenGL API without having to create a
-# rendering context on an X Server. It uses a pure software renderer.
-# .
-# This package provides both 16-bit and 32-bit versions of the off-screen
-# renderer which do not require external libraries to work.
-
-#Package: libosmesa6-dev
-#Section: libdevel
-#Architecture: any
-#Depends:
-# libosmesa6 (= ${binary:Version}),
-# mesa-common-dev (= ${binary:Version}) | libgl-dev,
-# ${misc:Depends},
-#Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev
-#Replaces: xlibosmesa-dev, libosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2),
mesa-common-dev (<< 6.5.2)
-#Provides: xlibosmesa-dev, libosmesa-dev
-#Multi-Arch: same
-#Description: Mesa Off-screen rendering extension -- development files
-# This package provides the required environment for developing programs
-# that use the off-screen rendering extension of Mesa.
-# .
-# For more information on OSmesa see the libosmesa6 package.
+Package: libosmesa6-lts-vivid
+Section: libs
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libglapi-mesa-lts-vivid (= ${binary:Version}),
+Replaces: libgl1-mesa-swx11 (<< 6.5.2),
+ libosmesa6
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Mesa Off-screen rendering extension
+ OSmesa is a Mesa extension that allows programs to render to an
+ off-screen buffer using the OpenGL API without having to create a
+ rendering context on an X Server. It uses a pure software renderer.
+ .
+ This package provides both 16-bit and 32-bit versions of the off-screen
+ renderer which do not require external libraries to work.
+Conflicts:
+ libosmesa6, xorg-renamed-package-lts-utopic
+Provides:
+ libosmesa6, xorg-renamed-package, xorg-renamed-package-lts-vivid
+
+Package: libosmesa6-dev-lts-vivid
+Section: libdevel
+Architecture: any
+Depends:
+ libosmesa6-lts-vivid (= ${binary:Version}),
+ mesa-common-dev-lts-vivid (= ${binary:Version}) | libgl-dev,
+ ${misc:Depends},
+Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev,
+ libosmesa6-dev, xorg-renamed-package-lts-utopic
+Replaces: xlibosmesa-dev, libosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2),
mesa-common-dev (<< 6.5.2),
+ libosmesa6-dev
+Provides: xlibosmesa-dev, libosmesa-dev,
+ libosmesa6-dev, xorg-renamed-package, xorg-renamed-package-lts-vivid
+Multi-Arch: same
+Description: Mesa Off-screen rendering extension -- development files
+ This package provides the required environment for developing programs
+ that use the off-screen rendering extension of Mesa.
+ .
+ For more information on OSmesa see the libosmesa6 package.
Package: mesa-vdpau-drivers-lts-vivid
Section: libs
diff --git a/debian/not-installed b/debian/not-installed
index 8cfd3a4..d3048a4 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,6 +1,6 @@
# Keep track of files we don't install:
# Common list:
-NOT_INSTALLED := dri/usr/include/GL/osmesa.h \
+NOT_INSTALLED := \
dri/usr/include/GL/wglext.h \
dri/usr/include/GL/wmesa.h
diff --git a/debian/rules b/debian/rules
index f96ee12..782315a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,7 +123,7 @@ confflags-dri = \
--with-dri-drivers="$(DRI_DRIVERS)" \
--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
--with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri'
\
- --disable-osmesa \
+ --enable-osmesa \
--enable-glx-tls \
--enable-shared-glapi \
--enable-texture-float \
