[med-svn] [Git][med-team/q2cli][master] Use only Major.Minor in dependencies since Micro version might be different in...

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / q2cli


Commits:
c961fff2 by Andreas Tille at 2024-01-29T14:27:56+01:00
Use only Major.Minor in dependencies since Micro version might be different in some qiime packages but this dependency should be sufficient to make sure release versions will stay in sync
Make sure the hint that d/control is autogenerated will remain

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends: debhelper-compat (= 13),
                python3,
                python3-pytest <!nocheck>,
                python3-setuptools,
-               qiime (>= 2023.9.1),
+               qiime (>= 2023.9),
                python3-click
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/med-team/q2cli
@@ -23,8 +23,8 @@ Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python3:Depends},
-         q2-feature-table (>= 2023.9.1),
-         qiime (>= 2023.9.1),
+         q2-feature-table (>= 2023.9),
+         qiime (>= 2023.9),
          python3-setuptools,
          python3-click
 Description: Click-based command line interface for QIIME 2


=====================================
debian/rules
=====================================
@@ -5,13 +5,16 @@ export LC_ALL=C.UTF-8
 export QIIMETEST=1
 
 include /usr/share/dpkg/default.mk
+VERSION_UPSTREAM=$(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\(20[0-9][0-9]\.[0-9]\+\)\..*/\1/')
+
 export PYBUILD_TEST_ARGS=--ignore=q2cli/tests/test_usage.py
 
 %:
 	dh $@ --buildsystem=pybuild
 
-debian/control: debian/control.in
-	sed -e"s/@DEB_VERSION_UPSTREAM@/$(DEB_VERSION_UPSTREAM)/g" $< > $@
+debian/control: debian/control.in debian/changelog
+	echo "# This file is autogenerated from control.in to update versioned dependencies" > $@
+	sed -e"s/@DEB_VERSION_UPSTREAM@/$(VERSION_UPSTREAM)/g" $< >> $@
 
 override_dh_install:
 	dh_install



View it on GitLab: https://salsa.debian.org/med-team/q2cli/-/commit/c961fff2ad97fa35b61ee5692eae5ad31a86e5ec

-- 
View it on GitLab: https://salsa.debian.org/med-team/q2cli/-/commit/c961fff2ad97fa35b61ee5692eae5ad31a86e5ec
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240129/170ca91b/attachment-0001.htm>