[med-svn] [Git][med-team/q2cli][master] Revert "Drop unneeded patches"

[Liubov Chuprikova]

Liubov Chuprikova pushed to branch master at Debian Med / q2cli


Commits:
0fbe0191 by Liubov Chuprikova at 2019-12-14T23:07:00Z
Revert "Drop unneeded patches"

This reverts commit e02f3d3694dc98631b148199e08897dabe1c9616.

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/call_py3.patch
- + debian/patches/inform_zsh_users_howto_set_autocompletion.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -3,9 +3,8 @@ q2cli (2019.10.0-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream version
   * Standards-Version: 4.4.1
-  * Drop unneeded patches
 
- -- Andreas Tille <tille at debian.org>  Tue, 12 Nov 2019 09:39:41 +0100
+ -- Andreas Tille <tille at debian.org>  Tue, 12 Nov 2019 09:32:25 +0100
 
 q2cli (2019.7.0-1) unstable; urgency=medium
 


=====================================
debian/patches/call_py3.patch
=====================================
@@ -0,0 +1,13 @@
+Description: call python3 in the tab-qiime script, as the package is python3 only
+From: Alex Mestiashvili <amestia at rsh2.donotuse.de>
+--- q2cli.orig/bin/tab-qiime
++++ q2cli/bin/tab-qiime
+@@ -13,7 +13,7 @@
+ {
+   # Attempt to find the cached completion script. If q2cli isn't installed, or
+   # is an incompatible version, don't attempt completion.
+-  local completion_path="$(python -c "import q2cli.util; print(q2cli.util.get_completion_path())" 2> /dev/null)"
++  local completion_path="$(python3 -c "import q2cli.util; print(q2cli.util.get_completion_path())" 2> /dev/null)"
+ 
+   if [[ $? != 0 ]]; then
+     unset COMPREPLY


=====================================
debian/patches/inform_zsh_users_howto_set_autocompletion.patch
=====================================
@@ -0,0 +1,24 @@
+Author: Liubov Chuprikova <chuprikovalv at gmail.com>
+Last-Update: Sat, 23 Mar 2019 14:43:01 +0100
+Description: Bash users will have a working completion, but we also need to
+ inform zsh users how they can enable completion.
+
+--- a/q2cli/__main__.py
++++ b/q2cli/__main__.py
+@@ -17,15 +17,10 @@
+ 
+ To get help with QIIME 2, visit https://qiime2.org.
+ 
+-To enable tab completion in Bash, run the following command or add it to your \
+-.bashrc/.bash_profile:
+-
+-    source tab-qiime
+-
+ To enable tab completion in ZSH, run the following commands or add them to \
+ your .zshrc:
+ 
+-    autoload bashcompinit && bashcompinit && source tab-qiime
++    autoload bashcompinit && bashcompinit && source /usr/share/bash-completion/completions/qiime
+ 
+ """
+ 


=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+call_py3.patch
+inform_zsh_users_howto_set_autocompletion.patch



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

-- 
View it on GitLab: https://salsa.debian.org/med-team/q2cli/commit/0fbe0191ea1fb55b40d007f78df5ef32c62c8ff1
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/20191214/897338ca/attachment-0001.html>