Tim Andersson has proposed merging
~andersson123/+git/autodep8:update-to-0.28+nmu1 into
~ubuntu-release/+git/autodep8:master.
Requested reviews:
Ubuntu Release Team (ubuntu-release)
For more details, see:
https://code.launchpad.net/~andersson123/+git/autodep8/+merge/470343
Applies the changes relevant to the 0.28+nmu1 version of autodep8.
--
Your team Canonical's Ubuntu QA is subscribed to branch
~ubuntu-release/+git/autodep8:master.
diff --git a/autodep8 b/autodep8
index 84ba89c..8ffa352 100755
--- a/autodep8
+++ b/autodep8
@@ -16,7 +16,7 @@ detect_by_control_field() {
[ -f debian/control ] &&
grep-dctrl --quiet \
-F XS-Testsuite,Testsuite \
- -r "^autopkgtest-pkg-$packagetype\$" debian/control
+ -r "^autopkgtest-pkg-$pkgtype\$" debian/control
}
detect_by_source_contents() {
diff --git a/debian/changelog b/debian/changelog
index 0f3d9eb..20bc526 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+autodep8 (0.28+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * R packages: don't match packages with unrequested suffixes
+
+ -- Michael R. Crusoe <cru...@debian.org> Wed, 17 Jul 2024 17:09:01 +0200
+
autodep8 (0.28) unstable; urgency=medium
* test-package-type: test against synthetic packages
diff --git a/support/common b/support/common
index 35e7b8a..16c48fc 100644
--- a/support/common
+++ b/support/common
@@ -59,7 +59,7 @@ parse_descr_r(){
deb_r_pkgs=""
for pkg in $r_pkgs
do
- r_pkg_debconverted=$(echo "$deb_pkgs" | grep -w "r-cran-$pkg\|r-bioc-$pkg")
+ r_pkg_debconverted=$(echo "$deb_pkgs" | grep -w "r-cran-$pkg$\|r-bioc-$pkg$")
deb_r_pkgs="${deb_r_pkgs} ${r_pkg_debconverted}"
done
echo $deb_r_pkgs \
diff --git a/support/dkms/generate b/support/dkms/generate
index c6f0394..01a1911 100755
--- a/support/dkms/generate
+++ b/support/dkms/generate
@@ -3,7 +3,7 @@
cat <<EOF
Test-Command: /usr/lib/dkms/dkms-autopkgtest
Restrictions: needs-root, breaks-testbed, allow-stderr, superficial, ${pkg_dkms_extra_restrictions:-}
-Depends: dkms, linux-doc, ${pkg_dkms_extra_depends:-}
+Depends: dkms, openssl, linux-doc, ${pkg_dkms_extra_depends:-}
Features: test-name=dkms-autopkgtest
EOF
--
Mailing list: https://launchpad.net/~canonical-ubuntu-qa
Post to : canonical-ubuntu-qa@lists.launchpad.net
Unsubscribe : https://launchpad.net/~canonical-ubuntu-qa
More help : https://help.launchpad.net/ListHelp
