aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2014-06-19 14:13:28 +0000
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2014-06-19 14:35:39 +0000
commit77f6cb62a46e834384f5c3c4815be2521be5a205 (patch)
treeb9d2933b416254a320725b51a4dfa362c6f88d6a
parent4d2ae63bdaea4f7f40bdf1fc0bec9259f51020f4 (diff)
debian: update changelog and gbp.confdebian/10.2.1-0ubuntu0_linaro1linaro-experimental
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
-rw-r--r--debian/changelog14
-rw-r--r--debian/gbp.conf2
2 files changed, 6 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index f183785590f..bb61be79289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,10 @@
-mesa (10.3.0~git20140618.88b887fa-0ubuntu0ricotz~trusty) trusty; urgency=medium
+mesa (10.2.1-0ubuntu0~linaro1) trusty; urgency=medium
- * Checkout from git 20140618 (master branch) up to commit
- 88b887faa9209a58d29c819e01f9ad37ebc99a36
- * Only added debian/ tree from origin/ubuntu+1
- * hook: Drop MIR support.
- * hook: Drop 02_gbm_no_undefined.diff (upstream)
- * hook: Drop egl-platform-mir.patch (fails)
- * hook: update symbols.
+ * Checkout 10.2.1 from debian-experimental
+ * Import debian from origin/ubuntu+1
+ * Enable freedreno
- -- Rico Tzschichholz <ricotz@ubuntu.com> Wed, 18 Jun 2014 08:11:21 +0200
+ -- Nicolas Dechesne <nicolas.dechesne@linaro.org> Thu, 19 Jun 2014 14:08:06 +0000
mesa (10.2.0~git20140319-0ubuntu1) UNRELEASED; urgency=medium
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 86ebc55d74b..9d9b6c75643 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,2 @@
[DEFAULT]
-debian-branch=ubuntu
+debian-branch=linaro-experimental