Rebased ref, commits from common ancestor: commit b8315748619f90bc63f9d10e45af4e84aa66bb5e Author: Maarten Lankhorst <maarten.lankho...@canonical.com> Date: Thu Dec 19 19:21:11 2013 +0100
release to trusty diff --git a/debian/changelog b/debian/changelog index 159b636..e91b1fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -mesa (10.0.1-1ubuntu2) UNRELEASED; urgency=medium +mesa (10.0.1-1ubuntu2) trusty; urgency=medium + [ Matthias Klose ] * Build using llvm-3.4. - -- Matthias Klose <d...@ubuntu.com> Wed, 18 Dec 2013 15:12:29 +0100 + -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 19 Dec 2013 19:21:03 +0100 mesa (10.0.1-1ubuntu1) trusty; urgency=low commit fb7e3319f4c5919b6c03e6d5935d0526cfec8709 Author: Matthias Klose <d...@ubuntu.com> Date: Wed Dec 18 15:12:29 2013 +0100 Build using llvm-3.4. diff --git a/debian/changelog b/debian/changelog index 22eebc9..159b636 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mesa (10.0.1-1ubuntu2) UNRELEASED; urgency=medium + + * Build using llvm-3.4. + + -- Matthias Klose <d...@ubuntu.com> Wed, 18 Dec 2013 15:12:29 +0100 + mesa (10.0.1-1ubuntu1) trusty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index cd1d170..91e3def 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Build-Depends: libudev-dev [linux-any], flex, bison, - llvm-3.3-dev (>= 1:3.3-4) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf powerpc], + llvm-3.4-dev (>= 1:3.3-4) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf], libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf], libwayland-dev (>= 1.0.2) [linux-any], libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el], diff --git a/debian/rules b/debian/rules index c4f7556..6b9bfc4 100755 --- a/debian/rules +++ b/debian/rules @@ -165,7 +165,7 @@ $(STAMP)-build-%: configure --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --localstatedir=/var --disable-silent-rules \ $(confflags) $(confflags-$*) \ - ac_cv_path_LLVM_CONFIG=llvm-config-3.3 + ac_cv_path_LLVM_CONFIG=llvm-config-3.4 cd $(DEB_BUILD_DIR)/$* && $(MAKE) >$@ -- 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/e1vtifn-0004wf...@moszumanska.debian.org