debian/changelog | 7 ++++
debian/control | 45 ++++++++++++++++++++++++--------
debian/libgl1-mesa-dev.install.in | 2 -
debian/libgl1-mesa-dri.install.in | 2 -
debian/libgl1-mesa-dri.install.linux.in | 4 +-
debian/libglu1-mesa-dev.install.in | 10 +++----
debian/libglu1-mesa.install.in | 2 -
debian/libosmesa6-dev.install.in | 6 ++--
debian/libosmesa6.install.in | 2 -
debian/rules | 5 +--
10 files changed, 57 insertions(+), 28 deletions(-)
New commits:
commit a3f7fcf341b9d07650fd6884af086bccbbb90474
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Aug 22 00:15:28 2012 +0300
add installation target paths where needed
diff --git a/debian/libgl1-mesa-dev.install.in
b/debian/libgl1-mesa-dev.install.in
index aa05ba6..69099f8 100644
--- a/debian/libgl1-mesa-dev.install.in
+++ b/debian/libgl1-mesa-dev.install.in
@@ -1,2 +1,2 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/libGL.so usr/lib/${DEB_HOST_MULTIARCH}/mesa
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
diff --git a/debian/libgl1-mesa-dri.install.in
b/debian/libgl1-mesa-dri.install.in
index 31a01bb..8f4de07 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,3 +1,3 @@
# If this part gets modified, make sure to update .install.$os as well:
build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libgl1-mesa-dri.install.linux.in
b/debian/libgl1-mesa-dri.install.linux.in
index aee0994..08b6e72 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -1,6 +1,6 @@
# Keep this part in sync with libgl1-mesa-dri.install:
build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
usr/lib/${DEB_HOST_MULTIARCH}/
# This part is Linux-specific:
#build/dri/${DEB_HOST_MULTIARCH}/libgallium.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/libglu1-mesa-dev.install.in
b/debian/libglu1-mesa-dev.install.in
index 9c15fbd..b74bfa2 100644
--- a/debian/libglu1-mesa-dev.install.in
+++ b/debian/libglu1-mesa-dev.install.in
@@ -1,5 +1,5 @@
-dri/usr/include/GL/glu.h
-dri/usr/include/GL/glu_mangle.h
-#dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.a
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.so
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glu.pc
+dri/usr/include/GL/glu.h usr/include/GL/
+dri/usr/include/GL/glu_mangle.h usr/include/GL/
+#dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.a usr/lib/${DEB_HOST_MULTIARCH}/
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.so usr/lib/${DEB_HOST_MULTIARCH}/
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glu.pc
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
diff --git a/debian/libglu1-mesa.install.in b/debian/libglu1-mesa.install.in
index a52dd59..d078272 100644
--- a/debian/libglu1-mesa.install.in
+++ b/debian/libglu1-mesa.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.so.*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.so.* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libosmesa6-dev.install.in b/debian/libosmesa6-dev.install.in
index cef6cac..4499bff 100644
--- a/debian/libosmesa6-dev.install.in
+++ b/debian/libosmesa6-dev.install.in
@@ -1,3 +1,3 @@
-dri/usr/include/GL/osmesa.h
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc
+dri/usr/include/GL/osmesa.h usr/include/GL/
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so usr/lib/${DEB_HOST_MULTIARCH}/
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
diff --git a/debian/libosmesa6.install.in b/debian/libosmesa6.install.in
index 6289c66..4abf5b1 100644
--- a/debian/libosmesa6.install.in
+++ b/debian/libosmesa6.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.* usr/lib/${DEB_HOST_MULTIARCH}/
commit 480680dfe4bbe642d1a240288598809d7597be2e
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Aug 22 00:14:26 2012 +0300
control: Add Pre-Depends on dpkg-dev due to the binaries using xz
compression.
diff --git a/debian/changelog b/debian/changelog
index 64d4d74..03b7990 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ mesa (9.0~git20120821.c1114c61-0ubuntu1) UNRELEASED;
urgency=low
* rules: Enable llvmpipe on armhf to see if it works or not.
* rules: Remove bin/install-sh on clean, and don't create a symlink for
it.
+ * control: Add Pre-Depends on dpkg-dev due to the binaries using xz
+ compression.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 17 Aug 2012 11:08:47 +0300
diff --git a/debian/control b/debian/control
index 0703b75..aab8995 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,8 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Multi-Arch: same
Description: X acceleration library -- runtime
This package contains the XA (X acceleration) library. It is used exclusively
@@ -73,6 +74,7 @@ Description: X acceleration library -- debugging symbols
Package: libxatracker-dev
Section: libdevel
Architecture: linux-any
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
libxatracker1 (= ${binary:Version}),
${misc:Depends},
@@ -91,7 +93,8 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Multi-Arch: same
Description: generic buffer management API -- runtime
This package contains the GBM buffer management library. It provides a
@@ -120,6 +123,7 @@ Description: generic buffer management API -- debugging
symbols
Package: libgbm-dev
Section: libdevel
Architecture: linux-any
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
libgbm1 (= ${binary:Version}),
libudev-dev,
@@ -143,7 +147,8 @@ Recommends: libegl1-mesa-drivers
Provides: libegl1-x11
Conflicts: libegl1-x11
Replaces: libegl1-x11
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Multi-Arch: same
Description: free implementation of the EGL API -- runtime
This package contains the EGL native platform graphics interface library.
@@ -173,6 +178,7 @@ Description: free implementation of the EGL API --
debugging symbols
Package: libegl1-mesa-dev
Section: libdevel
Architecture: linux-any kfreebsd-any
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
libegl1-mesa (= ${binary:Version}),
libegl1-mesa-drivers (= ${binary:Version}),
@@ -204,7 +210,8 @@ Depends:
${misc:Depends},
libegl1-mesa (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Multi-Arch: same
Replaces: libegl1-mesa (<= 8.0.1-0ubuntu2)
Description: free implementation of the EGL API -- hardware drivers
@@ -241,7 +248,8 @@ Depends:
Provides: libopenvg1
Conflicts: libopenvg1
Replaces: libopenvg1
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Multi-Arch: same
Description: free implementation of the OpenVG API -- runtime
This package contains the mesa implementation of the OpenVG 2D acceleration
@@ -271,6 +279,7 @@ Description: free implementation of the OpenVG API --
debugging symbols
Package: libopenvg1-mesa-dev
Section: libdevel
Architecture: linux-any kfreebsd-any
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
libopenvg1-mesa (= ${binary:Version}),
libegl1-mesa-dev,
@@ -295,7 +304,8 @@ Depends:
Provides: libgles1
Conflicts: libgles1
Replaces: libgles1
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Multi-Arch: same
Description: free implementation of the OpenGL|ES 1.x API -- runtime
OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
@@ -327,6 +337,7 @@ Description: free implementation of the OpenGL|ES 1.x API
-- debugging symbols
Package: libgles1-mesa-dev
Section: libdevel
Architecture: linux-any kfreebsd-any
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
libgles1-mesa (= ${binary:Version}),
libegl1-mesa-dev,
@@ -352,7 +363,8 @@ Depends:
Provides: libgles2
Conflicts: libgles2
Replaces: libgles2
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Multi-Arch: same
Description: free implementation of the OpenGL|ES 2.x API -- runtime
OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
@@ -386,6 +398,7 @@ Description: free implementation of the OpenGL|ES 2.x API
-- debugging symbols
Package: libgles2-mesa-dev
Section: libdevel
Architecture: linux-any kfreebsd-any
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
libgles2-mesa (= ${binary:Version}),
libegl1-mesa-dev,
@@ -408,7 +421,8 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Multi-Arch: same
Description: free implementation of the GL API -- shared library
The Mesa GL API module is responsible for dispatching all the gl*
@@ -445,7 +459,8 @@ Provides: libgl1
Breaks:
libgl1-nvidia-alternatives (<= 275.09.07-1),
fglrx-glx (<< 1:11-6-1),
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Multi-Arch: same
Description: free implementation of the OpenGL API -- GLX runtime
Mesa is a 3-D graphics library with an API which is very similar to
@@ -510,6 +525,7 @@ Package: libgl1-mesa-dri
Section: libs
Priority: optional
Architecture: any
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
${shlibs:Depends},
${misc:Depends}
@@ -562,6 +578,7 @@ Description: Debugging symbols for the Mesa DRI modules
Package: libgl1-mesa-dri-experimental
Section: libs
Architecture: linux-any kfreebsd-any
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
${shlibs:Depends},
libgl1-mesa-dri (>= 7.11.1) [linux-any],
@@ -610,6 +627,7 @@ Description: Debugging symbols for the experimental Mesa
DRI modules
Package: libgl1-mesa-dev
Section: libdevel
Architecture: any
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
mesa-common-dev (= ${binary:Version}),
libgl1-mesa-glx (= ${binary:Version}),
@@ -642,6 +660,7 @@ Package: mesa-common-dev
Section: libdevel
Architecture: any
Replaces: xlibmesa-gl-dev (<< 1:7), xlibosmesa-dev, libgl1-mesa-swx11-dev (<<
6.5.2), libgl1-mesa-dev (<< 7.5~rc4-2)
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
libx11-dev,
libdrm-dev,
@@ -658,7 +677,8 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Replaces: libgl1-mesa-swx11 (<< 6.5.2)
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Multi-Arch: same
Description: Mesa Off-screen rendering extension
OSmesa is a Mesa extension that allows programs to render to an
@@ -671,6 +691,7 @@ Description: Mesa Off-screen rendering extension
Package: libosmesa6-dev
Section: libdevel
Architecture: any
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
libosmesa6 (= ${binary:Version}),
mesa-common-dev (= ${binary:Version}) | libgl-dev,
@@ -693,7 +714,8 @@ Depends:
Provides: libglu1
Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1
Replaces: libglu1
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Multi-Arch: same
Description: Mesa OpenGL utility library (GLU)
GLU offers simple interfaces for building mipmaps; checking for the
@@ -712,6 +734,7 @@ Description: Mesa OpenGL utility library (GLU)
Package: libglu1-mesa-dev
Section: libdevel
Architecture: any
+Pre-Depends: dpkg (>= 1.15.6~),
Depends:
libglu1-mesa (= ${binary:Version}),
libgl1-mesa-dev | libgl-dev,
commit cdd0d906fa0da1b3425f1441223f10774fc533dd
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Aug 21 22:18:38 2012 +0300
rules: Remove bin/install-sh on clean, and don't create a symlink for it.
diff --git a/debian/changelog b/debian/changelog
index 34d04da..64d4d74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ mesa (9.0~git20120821.c1114c61-0ubuntu1) UNRELEASED;
urgency=low
* libgl1-mesa-dri.install.linux.in: Don't try to install libgallium.so,
which isn't built yet.
* rules: Enable llvmpipe on armhf to see if it works or not.
+ * rules: Remove bin/install-sh on clean, and don't create a symlink for
+ it.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 17 Aug 2012 11:08:47 +0300
diff --git a/debian/rules b/debian/rules
index c5786b6..d4f8c34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -189,10 +189,9 @@ clean: unpatch
rm -rf configure bin/config.guess bin/config.sub config.h.in
rm -rf $$(find -name Makefile.in)
rm -rf aclocal.m4 bin/missing bin/depcomp install-sh bin/ltmain.sh
- rm -f bin/ar-lib bin/compile bin/ylwrap
+ rm -f bin/ar-lib bin/compile bin/ylwrap bin/install-sh
rm -rf $(STAMP_DIR)
for file in debian/*.in; do rm -f $${file%%.in}; done
- ln -sf minstall bin/install-sh
rm -f src/glsl/builtins/tools/texture_builtins.pyc
rm -f src/mapi/glapi/gen/*.pyc
rm -f src/mesa/main/*.pyc
commit 6b71b76821d853638235859a84c14d02c9d51df1
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Aug 21 21:42:40 2012 +0300
rules: Enable llvmpipe on armhf to see if it works or not.
diff --git a/debian/changelog b/debian/changelog
index 4e86f5b..34d04da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ mesa (9.0~git20120821.c1114c61-0ubuntu1) UNRELEASED;
urgency=low
build target.
* libgl1-mesa-dri.install.linux.in: Don't try to install libgallium.so,
which isn't built yet.
+ * rules: Enable llvmpipe on armhf to see if it works or not.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 17 Aug 2012 11:08:47 +0300
diff --git a/debian/rules b/debian/rules
index 19adc29..c5786b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ else
# Build the llvmpipe driver only on amd64, i386 until it's tested elsewhere
- ifeq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386))
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386 armhf))
DRI_DRIVERS += swrast
else
GALLIUM_DRIVERS += swrast
commit 7de805dfbbd4451cb45df447cfe49c990117f73f
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Aug 21 21:37:19 2012 +0300
libgl1-mesa-dri.install.linux.in: Don't try to install libgallium.so, which
isn't built yet.
diff --git a/debian/changelog b/debian/changelog
index 2f1acfe..4e86f5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ mesa (9.0~git20120821.c1114c61-0ubuntu1) UNRELEASED;
urgency=low
Drop the static lib from -dev since only shared libs get built.
* libgl1-mesa-dev.install.in: Fix the source file paths to match the
build target.
+ * libgl1-mesa-dri.install.linux.in: Don't try to install libgallium.so,
+ which isn't built yet.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 17 Aug 2012 11:08:47 +0300
diff --git a/debian/libgl1-mesa-dri.install.linux.in
b/debian/libgl1-mesa-dri.install.linux.in
index f446949..aee0994 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -3,7 +3,7 @@ build/dri/${DEB_HOST_MULTIARCH}/*_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
# This part is Linux-specific:
-build/dri/${DEB_HOST_MULTIARCH}/libgallium.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+#build/dri/${DEB_HOST_MULTIARCH}/libgallium.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/gallium/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/gallium/r600_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/gallium/radeonsi_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3vp3-0003vw...@vasks.debian.org
