From c568fe012ffd21858d3e44a273abcce8d2305fd8 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 9 Jul 2015 10:04:21 -0400
Subject: [PATCH] use new upstream tags

---
 debian/gbp.conf | 3 ++-
 debian/watch    | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 4f2c8b3..127ec74 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,5 @@
 [DEFAULT]
 upstream-branch = master
 debian-branch = debian
-upstream-tag = %(version)s
+upstream-tag = libpsl-%(version)s
+upstream-vcs-tag = libpsl-%(version)s
diff --git a/debian/watch b/debian/watch
index 688f54e..2fcb1ba 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/libpsl-$1\.tar\.gz/ \
-  https://github.com/rockdaboot/libpsl/tags .*/v?(\d\S*)\.tar\.gz
+https://github.com/rockdaboot/libpsl/tags .*/libpsl-(\d\S*)\.tar\.gz