Merge ~danilogondolfo/ubuntu/+source/devscripts:lp2046242 into ubuntu/+source/devscripts:ubuntu/devel

[Danilo Egea Gondolfo]

[Danilo Egea Gondolfo (danilogondolfo)]

This change was already merged upstream so this delta can be discarded on the next version update (that includes the change): https://salsa.debian.org/debian/devscripts/-/merge_requests/375

PPA containing this change https://launchpad.net/~danilogondolfo/+archive/ubuntu/devscripts-ppa/

Autopkgtests

https://autopkgtest.ubuntu.com/results/autopkgtest-noble-danilogondolfo-devscripts-ppa/noble/amd64/d/devscripts/20231212_131433_5c4f0@/log.gz

https://autopkgtest.ubuntu.com/results/autopkgtest-noble-danilogondolfo-devscripts-ppa/noble/arm64/d/devscripts/20231212_132724_d78e1@/log.gz

https://autopkgtest.ubuntu.com/results/autopkgtest-noble-danilogondolfo-devscripts-ppa/noble/armhf/d/devscripts/20231212_132016_8f06a@/log.gz

https://autopkgtest.ubuntu.com/results/autopkgtest-noble-danilogondolfo-devscripts-ppa/noble/ppc64el/d/devscripts/20231212_131538_29a16@/log.gz

https://autopkgtest.ubuntu.com/results/autopkgtest-noble-danilogondolfo-devscripts-ppa/noble/s390x/d/devscripts/20231212_131418_06448@/log.gz

[Simon Quigley (tsimonq2)]

Looks like they beat you to the punch: https://tracker.debian.org/news/1485223/accepted-devscripts-2237-source-into-unstable/

sorry :)

review: Disapprove

[Danilo Egea Gondolfo (danilogondolfo)]

That's great, thanks! ;)

Unmerged commits

95df620... by Danilo Egea Gondolfo on 2023-12-12

Changelog

b24801c... by Danilo Egea Gondolfo on 2023-12-12

Update maintainer

bd89e09... by Danilo Egea Gondolfo on 2023-12-06

Move libgitlab-api-v4-perl to Suggests on Ubuntu

Use the logic present in debian/rules to add libgitlab-api-v4-perl to
Suggests on Ubuntu and keep it in Recommends on Debian.

The reason for this change is that we're considering moving
libgitlab-api-v4-perl to universe on Ubuntu but devscripts is in main.

When libgitlab-api-v4-perl is not installed a message will be displayed:

$ salsa
You must install GitLab::API::v4

b1645fa... by Simon Quigley on 2023-10-20

2.23.6build1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index e546fc2..4d34e3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+devscripts (2.23.6ubuntu1) noble; urgency=medium
+
+  * Move libgitlab-api-v4-perl to Suggests on Ubuntu (LP: #2046242).
+    Use the logic present in debian/rules to add libgitlab-api-v4-perl to
+    Suggests on Ubuntu and keep it in Recommends on Debian. This change
+    was merged upstream and can be dropped on the next package version update.
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Tue, 12 Dec 2023 10:53:38 +0000
+
 devscripts (2.23.6build1) noble; urgency=medium
 
   * No-change rebuild to pick up Noble.
diff --git a/debian/control b/debian/control
index 2aa9398..9ee9274 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: devscripts
 Section: devel
 Priority: optional
-Maintainer: Devscripts Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Devscripts Maintainers <[e-mail]>
 Uploaders:
  Mattia Rizzolo <[e-mail]>,
  Benjamin Drung <[e-mail]>,
@@ -100,7 +101,6 @@ Recommends:
  libdpkg-perl,
  libencode-locale-perl,
  libgit-wrapper-perl,
- libgitlab-api-v4-perl,
  libjson-perl,
  liblist-compare-perl,
  libstring-shellquote-perl,
diff --git a/debian/rules b/debian/rules
index 26c5c34..696a6b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-UBU_SUGGESTS=debian-keyring, equivs, liblwp-protocol-https-perl, libsoap-lite-perl, pristine-tar
+UBU_SUGGESTS=debian-keyring, equivs, libgitlab-api-v4-perl, liblwp-protocol-https-perl, libsoap-lite-perl, pristine-tar
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo ubuntu),ubuntu)
  SUBSTVARS=-V'vendor:Suggests=$(UBU_SUGGESTS)' -V'vendor:Recommends='
 else