debian/changelog | 33 ++++++++++++++++++++++++++-
debian/compat | 2 -
debian/control | 13 +++++++++-
debian/libegl1-mesa-drivers.install.linux.in | 2 -
debian/rules | 2 -
5 files changed, 45 insertions(+), 7 deletions(-)
New commits:
commit 6620b4abe0f772b97b697549b231671c4adfd30d
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Thu Sep 18 11:59:11 2014 +0200
New upstream release candidate. (LP: #1364003)
diff --git a/debian/changelog b/debian/changelog
index c7d6c72..fc28472 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
mesa (10.3.0~rc3-3ubuntu1) UNRELEASED; urgency=low
+ * New upstream release candidate. (LP: #1364003)
* Merge from released debian-experimental.
* Import upstream fix for altivec little endian instructions.
commit a2bab76b4a260fa536d2de5619b2f74c9ec7f6da
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Sep 15 22:39:36 2014 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index fd75f04..c159591 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.3.0~rc3-3) UNRELEASED; urgency=medium
+mesa (10.3.0~rc3-3) experimental; urgency=medium
[ Andreas Boll ]
* Bump llvm-3.5-dev and libclang-3.5-dev to 1:3.5-1, should fix FTBFS on
@@ -11,7 +11,10 @@ mesa (10.3.0~rc3-3) UNRELEASED; urgency=medium
[ Dima Kogan ]
* All -dev packages are now Multi-Arch: same (Closes: #689088, #678040).
- -- Andreas Boll <andreas.boll....@gmail.com> Mon, 15 Sep 2014 14:19:30 +0200
+ [ Julien Cristau ]
+ * Upload clean source without partial Ubuntu alternatives patches (closes:
#761678)
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 15 Sep 2014 22:39:15 +0200
mesa (10.3.0~rc3-2) experimental; urgency=medium
commit 3803b01079d10f7ff3370e5566ba0502d96f676f
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Mon Sep 15 20:17:03 2014 +0200
Drop redundant libegl1-mesa-drivers.install.linux.in
It's the same as libegl1-mesa-drivers.install.in
diff --git a/debian/changelog b/debian/changelog
index 5877a8b..fd75f04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mesa (10.3.0~rc3-3) UNRELEASED; urgency=medium
* Bump compat to v9 for changed dh_strip behavior:
- dh_strip puts separated debug symbols in a location based on their
build-id (Closes: #755921).
+ * Drop redundant libegl1-mesa-drivers.install.linux.in.
[ Dima Kogan ]
* All -dev packages are now Multi-Arch: same (Closes: #689088, #678040).
diff --git a/debian/libegl1-mesa-drivers.install.linux.in
b/debian/libegl1-mesa-drivers.install.linux.in
deleted file mode 100644
index 741f962..0000000
--- a/debian/libegl1-mesa-drivers.install.linux.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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
commit 4e8ef10eb3d85c3b79991c2189d4e7f4745e5d20
Author: Dima Kogan <d...@secretsauce.net>
Date: Sun Feb 16 01:31:01 2014 -0800
All -dev packages are now Multi-Arch: same
Closes #689088, #678040
diff --git a/debian/changelog b/debian/changelog
index 0c9bfb3..5877a8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
mesa (10.3.0~rc3-3) UNRELEASED; urgency=medium
+ [ Andreas Boll ]
* Bump llvm-3.5-dev and libclang-3.5-dev to 1:3.5-1, should fix FTBFS on
kfreebsd-*.
* Bump compat to v9 for changed dh_strip behavior:
- dh_strip puts separated debug symbols in a location based on their
build-id (Closes: #755921).
+ [ Dima Kogan ]
+ * All -dev packages are now Multi-Arch: same (Closes: #689088, #678040).
+
-- Andreas Boll <andreas.boll....@gmail.com> Mon, 15 Sep 2014 14:19:30 +0200
mesa (10.3.0~rc3-2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index cc021cc..857f2a5 100644
--- a/debian/control
+++ b/debian/control
@@ -143,6 +143,7 @@ Depends:
Provides: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev, mesag-dev,
libgl1-mesa-swrast-dev
Replaces: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
+Multi-Arch: same
Description: free implementation of the OpenGL API -- development files
This package provides the development environment required for
compiling programs with Mesa. For a complete description of Mesa,
@@ -189,6 +190,7 @@ Architecture: linux-any
Depends:
libxatracker2 (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: X acceleration library -- development files
This package contains the XA (X acceleration) library. It is used exclusively
by the X server to do render, copy and video acceleration.
@@ -237,6 +239,7 @@ Depends:
libgbm1 (= ${binary:Version}),
libudev-dev,
${misc:Depends},
+Multi-Arch: same
Description: generic buffer management API -- development files
This package contains the GBM buffer management library. It provides a
mechanism for allocating buffers for graphics rendering tied to Mesa.
@@ -306,6 +309,7 @@ Depends:
libx11-xcb-dev,
libwayland-dev (>= 1.2.0) [linux-any],
${misc:Depends},
+Multi-Arch: same
Description: free implementation of the EGL API -- development files
This package contains the development environment required for compiling
programs against EGL native platform graphics interface library.
@@ -422,6 +426,7 @@ Depends:
libopenvg1-mesa (= ${binary:Version}),
libegl1-mesa-dev,
${misc:Depends},
+Multi-Arch: same
Description: free implementation of the OpenVG API -- development files
This package contains the mesa implementation of the OpenVG 2D acceleration
library. OpenVG provides a device independent and vendor-neutral interface
@@ -477,6 +482,7 @@ Depends:
libgles1-mesa (= ${binary:Version}),
libegl1-mesa-dev,
${misc:Depends},
+Multi-Arch: same
Description: free implementation of the OpenGL|ES 1.x API -- development files
OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
embedded systems - including consoles, phones, appliances and vehicles.
@@ -535,6 +541,7 @@ Depends:
libgles2-mesa (= ${binary:Version}),
libegl1-mesa-dev,
${misc:Depends},
+Multi-Arch: same
Description: free implementation of the OpenGL|ES 2.x API -- development files
OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
embedded systems - including consoles, phones, appliances and vehicles.
@@ -723,6 +730,7 @@ Depends:
Conflicts: libgl-dev, libgl1-mesa-dri-dev
Replaces: libgl-dev, libgl1-mesa-dri-dev
Provides: libgl-dev, libgl1-mesa-dri-dev
+Multi-Arch: same
Description: free implementation of the OpenGL API -- GLX development files
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
@@ -742,6 +750,7 @@ Depends:
libx11-dev,
libdrm-dev (>= 2.4.52) [!hurd-any],
${misc:Depends},
+Multi-Arch: same
Description: Developer documentation for Mesa
This package includes the specifications for the Mesa-specific OpenGL
extensions, the complete set of release notes and the development header
@@ -775,6 +784,7 @@ 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.
commit e1d346784a60600237c323a5e46d0ad379819176
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Mon Sep 15 18:32:46 2014 +0200
Exclude gbm_gallium_drm.so from dh_makeshlibs
Fixes changed behavior from debhelper 8:
- dh_makeshlibs will run dpkg-gensymbols on all shared libraries that it
generates shlibs files for. So -X can be used to exclude libraries.
Also, libraries in unusual locations that dpkg-gensymbols would not
have processed before will be passed to it, a behavior change that can
cause some packages to fail to build.
diff --git a/debian/rules b/debian/rules
index ca4033c..c6d154a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -303,7 +303,7 @@ binary-arch: install
dh_strip $(foreach p,$(nodbgpkg),-p$(p))
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -s -- -c4
+ dh_makeshlibs -s -Xgbm_gallium_drm.so -- -c4
dh_installdeb -s
dh_shlibdeps -s
dh_gencontrol -s
commit 6c3a93a01e4311f3b0f09b197aa7e810f8f9ef59
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Mon Sep 15 16:33:25 2014 +0200
Bump debhelper version to 9
diff --git a/debian/changelog b/debian/changelog
index 1c64fc1..0c9bfb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ mesa (10.3.0~rc3-3) UNRELEASED; urgency=medium
* Bump llvm-3.5-dev and libclang-3.5-dev to 1:3.5-1, should fix FTBFS on
kfreebsd-*.
+ * Bump compat to v9 for changed dh_strip behavior:
+ - dh_strip puts separated debug symbols in a location based on their
+ build-id (Closes: #755921).
-- Andreas Boll <andreas.boll....@gmail.com> Mon, 15 Sep 2014 14:19:30 +0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index ab4c9b1..cc021cc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Standards-Version: 3.9.3
Build-Depends:
- debhelper (>= 8.1.3),
+ debhelper (>= 9),
quilt (>= 0.40),
pkg-config,
libdrm-dev (>= 2.4.56) [!hurd-any],
commit 9a55a8b6265c99a86aa2cce074d08df5536f2426
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Mon Sep 15 14:22:33 2014 +0200
Bump llvm-3.5-dev and libclang-3.5-dev to 1:3.5-1
Should fix FTBFS on kfreebsd-*
diff --git a/debian/changelog b/debian/changelog
index d3d6435..1c64fc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.3.0~rc3-3) UNRELEASED; urgency=medium
+
+ * Bump llvm-3.5-dev and libclang-3.5-dev to 1:3.5-1, should fix FTBFS on
+ kfreebsd-*.
+
+ -- Andreas Boll <andreas.boll....@gmail.com> Mon, 15 Sep 2014 14:19:30 +0200
+
mesa (10.3.0~rc3-2) experimental; urgency=medium
[ Andreas Boll ]
diff --git a/debian/control b/debian/control
index 4660fa3..ab4c9b1 100644
--- a/debian/control
+++ b/debian/control
@@ -37,10 +37,10 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
- llvm-3.5-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ llvm-3.5-dev (>= 1:3.5-1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libwayland-dev (>= 1.2.0) [linux-any],
- libclang-3.5-dev [amd64 i386 armhf],
+ libclang-3.5-dev (>= 1:3.5-1) [amd64 i386 armhf],
libclc-dev [amd64 i386 armhf],
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
commit d77d8908a3dd52b156ada75460a2c37f2ec1b4ad
Author: Maarten Lankhorst <d...@mblankhorst.nl>
Date: Fri Aug 22 15:04:19 2014 +0200
And revert again for now.. (LP: #1360241)
diff --git a/debian/changelog b/debian/changelog
index 58777f3..db40d27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.2.6-1ubuntu3) utopic; urgency=medium
+
+ * And revert again for now.. (LP: #1360241)
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Fri, 22 Aug 2014
15:02:30 +0200
+
mesa (10.2.6-1ubuntu2) utopic; urgency=medium
* Fixup typo.
diff --git a/debian/control b/debian/control
index 0b0191f..0da13b6 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
- llvm-3.5-dev (>= 1:3.5~+rc3) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ llvm-3.4-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libwayland-dev (>= 1.2.0) [linux-any],
libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
@@ -552,7 +552,6 @@ Priority: optional
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
- libllvm3.5 (>= 1:3.5~+rc3) [amd64 i386],
${shlibs:Depends},
${misc:Depends}
Recommends: libtxc-dxtn-s2tc0 | libtxc-dxtn0
diff --git a/debian/rules b/debian/rules
index 3c10f52..c4bd048 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,7 +110,7 @@ else
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386
armhf))
GALLIUM_DRIVERS += radeonsi
confflags_GALLIUM += --enable-gallium-llvm
- confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.5
+ confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.4
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
commit 53b80ad89f317af3bd828df26ed27acb76cc275e
Author: Maarten Lankhorst <d...@mblankhorst.nl>
Date: Thu Aug 21 18:41:49 2014 +0200
Fixup typo.
diff --git a/debian/changelog b/debian/changelog
index c6e03e3..58777f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.2.6-1ubuntu2) utopic; urgency=medium
+
+ * Fixup typo.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 21 Aug 2014
18:39:52 +0200
+
mesa (10.2.6-1ubuntu1) utopic; urgency=medium
* Drop 101_ubuntu_hidden_glname.patch.
diff --git a/debian/control b/debian/control
index 9db6b68..0b0191f 100644
--- a/debian/control
+++ b/debian/control
@@ -552,7 +552,7 @@ Priority: optional
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
- libllvm-3.5 (>= 1:3.5~+rc3) [amd64 i386],
+ libllvm3.5 (>= 1:3.5~+rc3) [amd64 i386],
${shlibs:Depends},
${misc:Depends}
Recommends: libtxc-dxtn-s2tc0 | libtxc-dxtn0
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xubws-0003ox...@moszumanska.debian.org
