put files back after the merge to allow proper upgrade to new upstream version
This commit is contained in:
parent
14564ce6cc
commit
f5457c8c6a
2 changed files with 10 additions and 1 deletions
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -1,4 +1,4 @@
|
|||
midori (0.4.6-1) UNRELEASED; urgency=low
|
||||
midori (0.5.2-1) UNRELEASED; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
* Apply patch from Colin Watson to improve conffile handling, using new
|
||||
|
|
9
debian/gbp.conf
vendored
Normal file
9
debian/gbp.conf
vendored
Normal file
|
@ -0,0 +1,9 @@
|
|||
[git-import-orig]
|
||||
upstream-branch=upstream-unstable
|
||||
debian-branch=master
|
||||
upstream-tag=%(version)s
|
||||
|
||||
[git-import-dsc]
|
||||
upstream-branch=upstream-unstable
|
||||
debian-branch=master
|
||||
upstream-tag=%(version)s
|
Loading…
Reference in a new issue