[DRE-commits] [SCM] ruby-passenger.git branch, master, updated. debian/3.0.12debian-1-8-g92cff53

[Laurent Bigonville]

The following commit has been merged in the master branch:
commit 0ebaea6cb9620ac00b7381ca0ea338e8b3f8da79
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Thu Jun 28 16:03:15 2012 +0200

    Add debian/gbp.conf file

diff --git a/debian/changelog b/debian/changelog
index fe65b9d..7f00de6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ ruby-passenger (3.0.13debian-1) UNRELEASED; urgency=low
   * debian/control: Add apache2-mpm-event to the dependency alternative, it is
     now supported by passenger (Closes: #600679)
   * Drop debian/patches/fix_ftbfs_gcc47.patch: Applied upstream
+  * Add debian/gbp.conf file
 
- -- Laurent Bigonville <bigon at debian.org>  Thu, 28 Jun 2012 16:01:36 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 28 Jun 2012 16:03:07 +0200
 
 ruby-passenger (3.0.12debian-1) unstable; urgency=low
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..908cc60
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+debian-branch = master
+upstream-branch = upstream
+pristine-tar = True
+
+[git-buildpackage]
+tarball-dir = ../tarballs/
+export-dir = ../build-area/

-- 
ruby-passenger.git