From: Ryan Niebur <ryanryan52@gmail.com>
Date: Thu, 24 Oct 2013 03:44:53 +0000 (-0700)
Subject: put files back after the merge to allow proper upgrade to new upstream version
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5457c8c6a8206a33682f94bcc904498c8d0e248;p=midori

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

diff --git a/debian/changelog b/debian/changelog
index 81fef4af..ed62dd5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 00000000..12edaefa
--- /dev/null
+++ b/debian/gbp.conf
@@ -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