[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn1946-2-3-g4254c91

[Simon McVittie]

The following commit has been merged in the master branch:
commit a9caffef747e29263800086061ff47c499b7f676
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jul 23 18:42:27 2011 +0100

    Specifically enable pristine-tar in git-buildpackage so we'll produce matching orig tarballs in future, and import the pristine-tar data for this upstream version

diff --git a/debian/changelog b/debian/changelog
index 5ee347b..a1df1cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ ioquake3 (1.36+svn1946-2) unstable; urgency=low
   * Drop the patch that allowed compatibility with libjpeg62-dev
     - so we no longer use part of the bundled libjpeg8 (Closes: #623462)
   * Standards-Version: 3.9.2 (no changes)
+  * Specifically enable pristine-tar in git-buildpackage so we'll produce
+    matching orig tarballs in future, and import the pristine-tar data
+    for this upstream version
   * q3arch: correctly recognise powerpc-linux-gnuspe (Debian powerpcspe,
     PowerPC with Signal Processing Extensions) as Linux
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..efba884
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+debian-branch = master
+upstream-branch = upstream
+pristine-tar = True

-- 
Quake 3 engine