gistfile.diff

diff --git a/modules/packages/manifests/mesa.pp b/modules/packages/manifests/mesa.pp
--- a/modules/packages/manifests/mesa.pp
+++ b/modules/packages/manifests/mesa.pp
@@ -1,32 +1,34 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 class packages::mesa {
     case $::operatingsystem {
         Ubuntu: {
+            realize(Packages::Aptrepo['mesa-lts-saucy'])
             case $::hardwaremodel {
                 "i686": {
                     package {
                         # This package is a recompiled version of
-                        # https://launchpad.net/ubuntu/+source/mesa
-                        ["libgl1-mesa-dri", "libgl1-mesa-glx", "libglapi-mesa",
-                         "libglu1-mesa", "libxatracker1"]:
-                            ensure => '8.0.4-0ubuntu0.6mozilla1';
+                        # http://packages.ubuntu.com/precise-updates/mesa-common-dev-lts-saucy
+                        ["libgl1-mesa-dri-lts-saucy", "libgl1-mesa-glx-lts-saucy",
+                         "libglapi-mesa-lts-saucy", "libxatracker1-lts-saucy":
+                            ensure => '9.2.1-1ubuntu3~precise1mozilla1';
                     }
                 }
                 "x86_64": {
                     package {
                         # This package is a recompiled version of
-                        # https://launchpad.net/ubuntu/+source/mesa
-                        # libgl1-mesa-dev:i386 is required by B2G emulators, Bug 1013634
-                        ["libgl1-mesa-dri", "libgl1-mesa-glx", "libglapi-mesa",
-                         "libglu1-mesa", "libxatracker1", "libgl1-mesa-dev:i386"]:
-                            ensure => '8.0.4-0ubuntu0.6mozilla1';
+                        # http://packages.ubuntu.com/precise-updates/mesa-common-dev-lts-saucy
+                        # libgl1-mesa-dev-lts-saucy:i386 is required by B2G emulators, Bug 1013634
+                        ["libgl1-mesa-dri-lts-saucy", "libgl1-mesa-glx-lts-saucy",
+                         "libglapi-mesa-lts-saucy", "libxatracker1-lts-saucy",
+                         "libgl1-mesa-dev-lts-saucy:i386"]:
+                            ensure => '9.2.1-1ubuntu3~precise1mozilla1';
                     }
                 }
             }
         }
         default: {
             fail("cannot install on $::operatingsystem")
         }
     }
diff --git a/modules/packages/manifests/setup.pp b/modules/packages/manifests/setup.pp
--- a/modules/packages/manifests/setup.pp
+++ b/modules/packages/manifests/setup.pp
@@ -136,17 +136,17 @@ class packages::setup {
                     command     => "/usr/bin/apt-get update",
                     schedule    => "daily";
                 "apt-get-update":
                     command     => "/usr/bin/apt-get update",
                     refreshonly => true;
             }
             # to flush the package index, increase this value by one (or
             # anything, really, just change it).
-            $repoflag = 30
+            $repoflag = 31
             file {
                 "/etc/.repo-flag":
                     content =>
                     "# see \$repoflag in modules/packages/manifests/setup.pp\n$repoflag\n",
                     notify => Exec['apt-get-update'];
                 # Make sure that the main file is empty
                 "/etc/apt/sources.list":
                     owner => 0,
@@ -221,15 +221,19 @@ class packages::setup {
                 "kernel":
                     url_path     => "repos/apt/custom/kernel",
                     distribution => "${lsbdistcodename}",
                     components   => ["all"];
                 "collectd":
                     url_path     => "repos/apt/custom/collectd",
                     distribution => "${lsbdistcodename}",
                     components   => ["all"];
+                "mesa-lts-saucy":
+                    url_path     => "repos/apt/custom/mesa-lts-saucy",
+                    distribution => "${lsbdistcodename}",
+                    components   => ["all"];
             }
         }
         Darwin: {
             #nothing to setup on Darwin
         }
     }
 }