[SCM] deken/master: Refreshed patches

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3d499073e3d9bb78bf902205c29bc059a7818b77
Author: IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>
Date:   Tue Oct 24 10:57:37 2017 +0200

    Refreshed patches

diff --git a/debian/patches/debianize.patch b/debian/patches/debianize.patch
index e7b4718..068cd2e 100644
--- a/debian/patches/debianize.patch
+++ b/debian/patches/debianize.patch
@@ -11,22 +11,17 @@ Last-Update: 2015-07-30
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- deken.orig/developer/deken
 +++ deken/developer/deken
-@@ -77,6 +77,10 @@
+@@ -99,6 +99,9 @@
  }
  
  install_deken() {
-+  # on Debian, we can skip installation
-+  if true; then
++    # on Debian, we can skip installation
 +    mkdir -p "${DEKEN_HOME}"
-+  else
-     which python >/dev/null || \
-         bail_install_msg "Oops, no Python found! You need Python to run Deken."
-     which make >/dev/null || \
-@@ -101,9 +105,15 @@
-     [ -x "$DEKEN_HOME/virtualenv/bin/hy" ] || (\
-         echo "Installing deken library dependencies." && \
-         $DEKEN_HOME/virtualenv/bin/pip install -r $DEKEN_HOME/requirements.txt || exit 1)
-+  fi
++    return
+     which "${PYTHON_BIN}" >/dev/null || \
+         bail_install_msg "Oops, no Python found! You need Python to run Deken: ${PYTHON_BIN}
+ You can specify an alternative Python interpreter via the PYTHON_BIN envvar"
+@@ -127,6 +130,11 @@
  }
  
  upgrade_deken() {
@@ -38,21 +33,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      # first upgrade this script itself
      echo "Upgrading $0."
      $HTTP_CLIENT $0 $DEKEN_BASE_URL/deken
-@@ -130,4 +140,4 @@
-     # run he upgrade command instead
-     upgrade_deken || \
-     # run the real deken command with args passed through
--    $DEKEN_HOME/virtualenv/bin/hy $DEKEN_HOME/deken.hy $@
-+    hy2 /usr/share/deken/deken.hy $@
---- deken.orig/developer/deken.hy
-+++ deken/developer/deken.hy
-@@ -469,8 +469,7 @@
-     [arg-parser (apply argparse.ArgumentParser [] {"prog" "deken" "description" "Deken is a build tool for Pure Data externals."})]
-     [arg-subparsers (apply arg-parser.add_subparsers [] {"help" "-h for help." "dest" "command"})]
-     [arg-package (apply arg-subparsers.add_parser ["package"])]
--    [arg-upload (apply arg-subparsers.add_parser ["upload"])]
--    [arg-upgrade (apply arg-subparsers.add_parser ["upgrade"])]]
-+    [arg-upload (apply arg-subparsers.add_parser ["upload"])]]
-       (apply arg-parser.add_argument ["--version"] {"action" "version" "version" version "help" "Outputs the version number of Deken."})
-       (apply arg-package.add_argument ["source"] {"nargs" "+"
-                                                   "metavar" "SOURCE"
+@@ -143,6 +151,8 @@
+ }
+ 
+ tryrun_deken() {
++    hy /usr/share/deken/deken.hy "$@"
++    return
+     if [ ! -x "$DEKEN_HOME/virtualenv/bin/hy" ]; then
+        error "Unable to find '${DEKEN_HOME}/virtualenv/bin/hy'"
+        error "Try running '$0 install' or '$0 upgrade'"
diff --git a/debian/patches/regressive-import.patch b/debian/patches/regressive-import.patch
index 9514a57..fd70bda 100644
--- a/debian/patches/regressive-import.patch
+++ b/debian/patches/regressive-import.patch
@@ -9,7 +9,7 @@ Last-Update: 2015-07-31
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- deken.orig/developer/deken.hy
 +++ deken/developer/deken.hy
-@@ -7,6 +7,7 @@
+@@ -41,6 +41,7 @@
  (import argparse)
  (import datetime)
  
@@ -17,11 +17,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  (import platform)
  (import zipfile)
  (import tarfile)
-@@ -23,6 +24,7 @@
-  (catch [e ImportError] (import [urllib.parse [urlparse]])))
- (import requests)
- (import easywebdav)
-+)(catch [e ImportError] ()))
+@@ -55,6 +56,7 @@
+ (import [getpass [getpass]])
+ (try (import [urlparse [urlparse]])
+  (except [e ImportError] (import [urllib.parse [urlparse]])))
++) (except [e ImportError] ()))
  
  (require hy.contrib.loop)
  

-- 
deken packaging