summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-06-10 10:01:28 +0300
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-06-10 14:52:48 +0300
commit6058e632ea75d06a86331fae7feb3eb8a43ea36d (patch)
treef7d71c4eeec2a34e94ed2550150d2d78bebeb15f
parent8b1278a9106699a47bf50db2ed46e6a38788cb9d (diff)
downloadpristine-tar-6058e632ea75d06a86331fae7feb3eb8a43ea36d.tar.gz
pristine-tar-6058e632ea75d06a86331fae7feb3eb8a43ea36d.tar.bz2
pristine-tar-6058e632ea75d06a86331fae7feb3eb8a43ea36d.zip
deb packaging: change format to 3.0 (quilt)
Also update .gbp.conf so that gbp-pq and gbp-pq-rpm can use the same development branch. Change-Id: I89ccbcb32e8615ff31412b91d9f1de6e027c0629 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rw-r--r--.gbp.conf3
-rw-r--r--debian/source/format1
-rw-r--r--debian/source/options1
3 files changed, 5 insertions, 0 deletions
diff --git a/.gbp.conf b/.gbp.conf
index 6444afb..361c0ec 100644
--- a/.gbp.conf
+++ b/.gbp.conf
@@ -4,3 +4,6 @@ packaging-dir = packaging
[git-buildpackage]
upstream-tag = %(version)s
+
+[gbp-pq-rpm]
+pq-branch = patch-queue/%(branch)s
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..9bdcb25
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore=(^packaging/.*|^.gbp.conf)