summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-03-23 17:15:25 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-03-23 17:15:25 -0400
commit56401df89091a60247d8bb625e032b7030d6d548 (patch)
treee7d18e12ba909e69c948ae6ce2c2bcb71072e13e /Makefile
parentcff844dc14b3280effd3d8e7aa8395466afe0385 (diff)
moving git buildpackage configuration off of master branch (please put it debian/gbp.conf in the debian branch)
Diffstat (limited to 'Makefile')
-rwxr-xr-xMakefile2
1 files changed, 1 insertions, 1 deletions
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.