Merge ~vicamo/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:bug-1859389/add-obsolete-by/bionic into ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/bionic

[You-Sheng Yang]

[You-Sheng Yang (vicamo)]

review: Approve

diff --git a/debian/backport-iwlwifi-dkms.dkms.in b/debian/backport-iwlwifi-dkms.dkms.in
index 285c400..16fb845 100644
--- a/debian/backport-iwlwifi-dkms.dkms.in
+++ b/debian/backport-iwlwifi-dkms.dkms.in
@@ -1,6 +1,7 @@
 PACKAGE_NAME="@DKMS_PACKAGE_NAME@"
 PACKAGE_VERSION="#MODULE_VERSION#"
 AUTOINSTALL="yes"
+OBSOLETE_BY="5.0.0"
 
 BUILT_MODULE_NAME[0]="compat"
 BUILT_MODULE_LOCATION[0]="compat"
diff --git a/debian/changelog b/debian/changelog
index 655a602..3c55ac2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+backport-iwlwifi-dkms (7906-0ubuntu4~18.04.1) bionic; urgency=medium
+
+  * debian/backport-iwlwifi-dkms.dkms.in
+    - Add OBSOLETE_BY="5.0.0". (LP: #1859389)
+
+  * debian/gbp.conf
+    - Use tags for upstream tree.
+    - Update debian-branch to bionic.
+
+ -- You-Sheng Yang <[e-mail]>  Mon, 13 Jan 2020 14:14:37 +0800
+
 backport-iwlwifi-dkms (7906-0ubuntu3~18.04.1) bionic; urgency=critical
 
   * Initial release (LP: #1856024).
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 8052664..2ba1d64 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-debian-branch = ubuntu/eoan
-upstream-branch = upstream/master
-upstream-tree = BRANCH
+debian-branch = ubuntu/bionic
+upstream-tree = tag
+pristine-tar = False