debian
/
midori
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put files back after the merge to allow proper upgrade to new upstream version

This commit is contained in:
Ryan Niebur 2013-10-23 20:44:53 -07:00
parent 14564ce6cc
commit f5457c8c6a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -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
View 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