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

mesa: Changes to 'ubuntu'



 debian/changelog                  |    4 ++--
 debian/libgl1-mesa-dri.install.in |    2 +-
 debian/patches/series             |    2 +-
 debian/rules                      |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5602e970e16ed893317409565cdc5a9da3951d84
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date:   Thu Aug 23 15:52:38 2012 +0300

    release to quantal

diff --git a/debian/changelog b/debian/changelog
index 2de7aae..f8567a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.0~git20120821.c1114c61-0ubuntu1) UNRELEASED; urgency=low
+mesa (9.0~git20120821.c1114c61-0ubuntu1) quantal; urgency=low
 
   * Merge from unreleased debian git.
     - Includes support for ATI Trinity PCI IDs (LP: #1009089)
@@ -27,7 +27,7 @@ mesa (9.0~git20120821.c1114c61-0ubuntu1) UNRELEASED; urgency=low
   * control: Add Pre-Depends on dpkg-dev due to the binaries using xz
     compression.
 
- -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 17 Aug 2012 11:08:47 +0300
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 23 Aug 2012 15:37:30 +0300
 
 mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
 

commit 1c7338088f03e54c4d5dc545c40bd174e37c4165
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date:   Thu Aug 23 15:31:55 2012 +0300

    disable the libgallim patch, we'll probably get the same from upstream soon

diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in
index 3de588a..9e98190 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,3 +1,3 @@
 dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
 dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so* usr/lib/${DEB_HOST_MULTIARCH}/
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libgallium*.so* usr/lib/${DEB_HOST_MULTIARCH}/
+#dri/usr/lib/${DEB_HOST_MULTIARCH}/libgallium*.so* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/patches/series b/debian/patches/series
index 80b027c..1d3510c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,4 @@
 # Ubuntu patches.
 100_no_abi_tag.patch
 101_ubuntu_hidden_glname.patch
-117-static-gallium.patch
+#117-static-gallium.patch
diff --git a/debian/rules b/debian/rules
index 7e91db9..0c37440 100755
--- a/debian/rules
+++ b/debian/rules
@@ -232,7 +232,7 @@ binary-arch: install
 	# No need for these .so, they're just convenience libraries:
 	rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
 	rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so
-	rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libgallium*.so
+#	rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libgallium*.so
 	# purge .la files
 	find debian/tmp/ -name '*.la' -exec rm '{}' ';'
 


Reply to: