[SCM] deken/master: Refreshed patches

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Tue May 24 14:41:53 UTC 2016


The following commit has been merged in the master branch:
commit 0c537a79c5710448659469dcd9f26cd26e307038
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Mon May 23 16:00:47 2016 +0200

    Refreshed patches

diff --git a/debian/patches/debianize.patch b/debian/patches/debianize.patch
index de1ab36..e7b4718 100644
--- a/debian/patches/debianize.patch
+++ b/debian/patches/debianize.patch
@@ -9,8 +9,8 @@ Forwarded: not-needed
 Last-Update: 2015-07-30
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- deken.orig/deken
-+++ deken/deken
+--- deken.orig/developer/deken
++++ deken/developer/deken
 @@ -77,6 +77,10 @@
  }
  
@@ -44,9 +44,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      # 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/deken.hy
-+++ deken/deken.hy
-@@ -384,8 +384,7 @@
+--- 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"])]
@@ -54,5 +54,5 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -    [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"] {"help" "The path to a directory of externals, abstractions, or GUI plugins to be packaged."})
-       (apply arg-package.add_argument ["--version" "-v"] {"help" "An external version number to insert into the package name." "default" "" "required" false})
+       (apply arg-package.add_argument ["source"] {"nargs" "+"
+                                                   "metavar" "SOURCE"
diff --git a/debian/patches/regressive-import.patch b/debian/patches/regressive-import.patch
index 2a5ee6b..9514a57 100644
--- a/debian/patches/regressive-import.patch
+++ b/debian/patches/regressive-import.patch
@@ -7,19 +7,19 @@ Author: IOhannes m zmölnig
 Last-Update: 2015-07-31
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- deken.orig/deken.hy
-+++ deken/deken.hy
-@@ -5,6 +5,7 @@
- (import os)
+--- deken.orig/developer/deken.hy
++++ deken/developer/deken.hy
+@@ -7,6 +7,7 @@
  (import argparse)
+ (import datetime)
  
 +(try (do
  (import platform)
  (import zipfile)
  (import tarfile)
-@@ -16,6 +17,7 @@
- (import [getpass [getpass]])
- (import [urlparse [urlparse]])
+@@ -23,6 +24,7 @@
+  (catch [e ImportError] (import [urllib.parse [urlparse]])))
+ (import requests)
  (import easywebdav)
 +)(catch [e ImportError] ()))
  

-- 
deken packaging



More information about the pkg-multimedia-commits mailing list