[Python-apps-commits] r12612 - in packages/awscli/trunk/debian (3 files)

[takaki at users.alioth.debian.org]

    Date: Tuesday, November 24, 2015 @ 15:44:50
  Author: takaki
Revision: 12612

prepare release

Modified:
  packages/awscli/trunk/debian/changelog
  packages/awscli/trunk/debian/control
  packages/awscli/trunk/debian/patches/adopt_to_botocore_changes

Modified: packages/awscli/trunk/debian/changelog
===================================================================
--- packages/awscli/trunk/debian/changelog	2015-11-24 15:30:17 UTC (rev 12611)
+++ packages/awscli/trunk/debian/changelog	2015-11-24 15:44:50 UTC (rev 12612)
@@ -1,3 +1,11 @@
+awscli (1.9.9-2) unstable; urgency=medium
+
+  * Refresh patches.
+  * debian/control: Depend version specified botocore. 
+    (Closes: #784798, #775706)
+
+ -- TANIGUCHI Takaki <takaki at debian.org>  Wed, 25 Nov 2015 00:44:40 +0900
+
 awscli (1.9.9-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/awscli/trunk/debian/control
===================================================================
--- packages/awscli/trunk/debian/control	2015-11-24 15:30:17 UTC (rev 12611)
+++ packages/awscli/trunk/debian/control	2015-11-24 15:44:50 UTC (rev 12612)
@@ -19,7 +19,7 @@
 
 Package: awscli
 Architecture: all
-Depends: python3, ${python3:Depends}, ${misc:Depends}
+Depends: python3, python-botocore(=1.9.3), ${python3:Depends}, ${misc:Depends}
 Description: Universal Command Line Environment for AWS
  This package provides a unified command line interface to many
  Amazon Web Services.

Modified: packages/awscli/trunk/debian/patches/adopt_to_botocore_changes
===================================================================
--- packages/awscli/trunk/debian/patches/adopt_to_botocore_changes	2015-11-24 15:30:17 UTC (rev 12611)
+++ packages/awscli/trunk/debian/patches/adopt_to_botocore_changes	2015-11-24 15:44:50 UTC (rev 12612)
@@ -22,21 +22,24 @@
 
 Index: awscli-1.9.9/awscli/customizations/s3/tasks.py
 ===================================================================
---- awscli-1.9.9.orig/awscli/customizations/s3/tasks.py	2015-11-24 17:26:53.449324759 +0900
-+++ awscli-1.9.9/awscli/customizations/s3/tasks.py	2015-11-24 17:26:53.425325078 +0900
-@@ -5,7 +5,7 @@
+--- awscli-1.9.9.orig/awscli/customizations/s3/tasks.py	2015-11-25 00:32:49.328220357 +0900
++++ awscli-1.9.9/awscli/customizations/s3/tasks.py	2015-11-25 00:33:41.503521417 +0900
+@@ -5,9 +5,9 @@
  import socket
  import threading
  
 -from botocore.vendored import requests
 +import requests
  from botocore.exceptions import IncompleteReadError
- from botocore.vendored.requests.packages.urllib3.exceptions import \
+-from botocore.vendored.requests.packages.urllib3.exceptions import \
++from urllib3.exceptions import \
      ReadTimeoutError
+ 
+ from awscli.customizations.s3.utils import find_bucket_key, MD5Error, \
 Index: awscli-1.9.9/awscli/paramfile.py
 ===================================================================
---- awscli-1.9.9.orig/awscli/paramfile.py	2015-11-24 17:26:53.449324759 +0900
-+++ awscli-1.9.9/awscli/paramfile.py	2015-11-24 17:26:53.425325078 +0900
+--- awscli-1.9.9.orig/awscli/paramfile.py	2015-11-25 00:32:49.328220357 +0900
++++ awscli-1.9.9/awscli/paramfile.py	2015-11-25 00:32:49.312220572 +0900
 @@ -14,7 +14,7 @@
  import logging
  import os
@@ -48,8 +51,8 @@
  from awscli.compat import compat_open
 Index: awscli-1.9.9/awscli/testutils.py
 ===================================================================
---- awscli-1.9.9.orig/awscli/testutils.py	2015-11-24 17:26:53.449324759 +0900
-+++ awscli-1.9.9/awscli/testutils.py	2015-11-24 17:26:53.425325078 +0900
+--- awscli-1.9.9.orig/awscli/testutils.py	2015-11-25 00:32:49.328220357 +0900
++++ awscli-1.9.9/awscli/testutils.py	2015-11-25 00:32:49.312220572 +0900
 @@ -51,7 +51,7 @@
  from botocore.session import Session
  from botocore.exceptions import ClientError
@@ -59,3 +62,16 @@
  
  import awscli.clidriver
  from awscli.plugin import load_plugins
+Index: awscli-1.9.9/awscli/customizations/awslambda.py
+===================================================================
+--- awscli-1.9.9.orig/awscli/customizations/awslambda.py	2015-11-25 00:36:59.000000000 +0900
++++ awscli-1.9.9/awscli/customizations/awslambda.py	2015-11-25 00:37:09.068741401 +0900
+@@ -14,7 +14,7 @@
+ import copy
+ from contextlib import closing
+ 
+-from botocore.vendored import six
++import six
+ 
+ from awscli.arguments import CustomArgument, CLIArgument
+ from awscli.customizations import utils