From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 23 Mar 2010 21:15:25 +0000 (-0400)
Subject: moving git buildpackage configuration off of master branch (please put it debian... 
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=56401df89091a60247d8bb625e032b7030d6d548;p=monkeysphere.git

moving git buildpackage configuration off of master branch (please put it debian/gbp.conf in the debian branch)
---

diff --git a/Makefile b/Makefile
index 3567938..062816c 100755
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ VERSION: Changelog
 	sed 's/^Monkeysphere .*$$/Monkeysphere '$(MONKEYSPHERE_VERSION)'/' -i VERSION
 
 debian-package:
-	git buildpackage -uc -us --git-upstream-branch=master --git-debian-branch=debian --git-no-pristine-tar --git-ignore-new
+	git buildpackage -uc -us
 
 # don't explicitly depend on the tarball, since our tarball
 # (re)generation is not idempotent even when no source changes.