debian/changelog | 4 +++-
debian/gbp.conf | 2 ++
debian/watch | 5 ++++-
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit c166235a109c779996aede1296e6b968e2da954e
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed May 19 15:03:21 2010 +1000
Update watchfile to grab the tarball we actually use
diff --git a/debian/watch b/debian/watch
index ee95ce2..eea9557 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,5 +2,8 @@ version=3
opts="uversionmangle=s/-rc/~rc/" \
http://sf.net/mesa3d/MesaLib-(.*)\.tar\.gz
+#opts="uversionmangle=s/-rc/~rc/" \
+#ftp://freedesktop.org/pub/mesa/([\d\.]*)/ MesaLib-(.*)\.tar\.gz
+
opts="uversionmangle=s/-rc/~rc/" \
-ftp://freedesktop.org/pub/mesa/([\d\.]*)/ MesaLib-(.*)\.tar\.gz
+http://cgit.freedesktop.org/mesa/mesa /mesa/mesa/snapshot/mesa-(.*).tar.gz
commit 57b6a34c041bd228efcc2e08e9ea3aa9ffc6075a
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed May 19 14:47:53 2010 +1000
Add gbp.conf for the ubuntu packaging branch
diff --git a/debian/changelog b/debian/changelog
index d92fefa..671feff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,8 +31,10 @@ mesa (7.8.1-1ubuntu1) UNRELEASED; urgency=low
[ Christopher James Halse Rogers ]
* debian/patches/103_savage-expose_fbmodes_with_nonzero_alpha.patch
- Refresh for driCreateConfigs API change
+ * debian/gbp.conf
+ - Set debian-branch=ubuntu to make git-buildpackage less annoying
- -- Christopher James Halse Rogers <r...@ubuntu.com> Wed, 19 May 2010
11:03:37 +1000
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Wed, 19 May 2010
14:47:25 +1000
mesa (7.8.1-1) experimental; urgency=low
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..86ebc55
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=ubuntu
--
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/e1oebry-0001jw...@alioth.debian.org
