diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/Makefile | 8 | ||||
| -rw-r--r-- | debian/gbp.conf | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/debian/Makefile b/debian/Makefile index 3a3fe77..b61f899 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -38,13 +38,7 @@ deps: .PHONY: dch dch: - gbp dch --distribution=unstable - -.PHONY: commit -commit: - cd -- '$(call escape,$(root))' && \ - version="$$( dpkg-parsechangelog --show-field Version )" && \ - git commit -m "debian: $$version" + gbp dch --distribution=unstable --commit .PHONY: tag tag: diff --git a/debian/gbp.conf b/debian/gbp.conf index e7faaa2..0754169 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,7 +1,13 @@ [DEFAULT] +upstream-branch = master upstream-tag = v%(version)s ignore-branch = True debian-branch = debian debian-tag = debian/v%(version)s pristine-tar = False export-dir = debian/build-area/ + +[dch] +dch-opt = --upstream +# ^^^ Don't append "ubuntu1" to the version. +commit-msg = debian: v%(version)s |