From 382df796a518e54030820af42ecea9a036ce3c66 Mon Sep 17 00:00:00 2001 From: David Prevot Date: Tue, 3 May 2022 10:28:02 +0200 Subject: [PATCH] Improve and document upstream import --- debian/README.source | 2 ++ debian/gbp.conf | 5 +++-- debian/watch | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 debian/README.source create mode 100644 debian/watch diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e3c28a6 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,2 @@ +# In order to import the last upstream $version, run +gbp import-orig --uscan diff --git a/debian/gbp.conf b/debian/gbp.conf index 50563e3..963eb3b 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,6 @@ -[buildpackage] -upstream-tree = debian +[DEFAULT] debian-branch = debian +upstream-branch = upstream/latest +upstream-vcs-tag = server/%(version%~%-)s export-dir = /tmp/bkctld builder = dpkg-buildpackage -i -I -uc -us diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..decf567 --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +version=4 +options=uversionmangle=s/-?([^\d.]+)/~$1/i;tr/A-Z/a-z/,\ +mode=git,gitmode=full,gitexport=all \ +https://gitea.evolix.org/evolix/evobackup \ +refs/tags(?:/server|/bkctld)?/v?(\d.+)