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

diff --git a/debian/changelog b/debian/changelog
index 81fef4afd9ef5c827f7eb250af706924d9f625d0..ed62dd5fcadb5bf788dcae42c84ce3ea0094f92e 100644 (file)
--- 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 (file)
index 0000000..12edaef
--- /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