aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2016-07-03 13:49:46 +0200
committerGuido Günther <agx@sigxcpu.org>2016-07-03 13:49:46 +0200
commit53f37eb809aa1118c7f682fc2de840a427311e1b (patch)
tree70cd2787a68e866bf9ca5ba44c12d4255640b124
parentf28a26b4e7b279056f73f8171e83ea6f776860f8 (diff)
import-orig: Make default import message more gbp-dch friendly
Debian changelogs usually have "New upstream version <versionnumber>".
-rw-r--r--docs/manpages/gbp-import-orig.sgml2
-rw-r--r--gbp/config.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/manpages/gbp-import-orig.sgml b/docs/manpages/gbp-import-orig.sgml
index 5049a9e..f72a741 100644
--- a/docs/manpages/gbp-import-orig.sgml
+++ b/docs/manpages/gbp-import-orig.sgml
@@ -179,7 +179,7 @@
<para>
use this format string for the commit message when importing upstream
versions, default is
- <replaceable>Imported Upstream version %(version)s</replaceable>
+ <replaceable>New upstream version %(version)s</replaceable>
</para>
</listitem>
</varlistentry>
diff --git a/gbp/config.py b/gbp/config.py
index 3a35a22..edc30a7 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -115,7 +115,7 @@ class GbpOptionParser(OptionParser):
'debian-tag' : 'debian/%(version)s',
'debian-tag-msg' : '%(pkg)s Debian release %(version)s',
'upstream-tag' : 'upstream/%(version)s',
- 'import-msg' : 'Imported Upstream version %(version)s',
+ 'import-msg' : 'New upstream version %(version)s',
'commit-msg' : 'Update changelog for %(version)s release',
'filter' : [],
'snapshot-number' : 'snapshot + 1',