[Python-modules-commits] r33393 - in packages/python-keyring/trunk/debian (2 files)

[mitya57 at users.alioth.debian.org]

    Date: Sunday, July 19, 2015 @ 09:26:15
  Author: mitya57
Revision: 33393

Rebase no_hgtools.diff for the new version.

Modified:
  packages/python-keyring/trunk/debian/changelog
  packages/python-keyring/trunk/debian/patches/no_hgtools.diff

Modified: packages/python-keyring/trunk/debian/changelog
===================================================================
--- packages/python-keyring/trunk/debian/changelog	2015-07-19 09:23:12 UTC (rev 33392)
+++ packages/python-keyring/trunk/debian/changelog	2015-07-19 09:26:15 UTC (rev 33393)
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Update URLs for move from BitBucket to GitHub.
+  * Rebase no_hgtools.diff for the new version.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 19 Jul 2015 12:22:27 +0300
 

Modified: packages/python-keyring/trunk/debian/patches/no_hgtools.diff
===================================================================
--- packages/python-keyring/trunk/debian/patches/no_hgtools.diff	2015-07-19 09:23:12 UTC (rev 33392)
+++ packages/python-keyring/trunk/debian/patches/no_hgtools.diff	2015-07-19 09:26:15 UTC (rev 33393)
@@ -1,7 +1,7 @@
 Description: get the version number from debian/changelog, not from hg
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-needed
-Last-Update: 2015-02-24
+Last-Update: 2015-07-19
 
 --- a/setup.py
 +++ b/setup.py
@@ -13,21 +13,21 @@
  
  def load(filename):
      """
-@@ -62,9 +63,12 @@
- # only request pytest_runner when command-line indicates invocation
- pytest_runner = ['pytest-runner'] if 'ptr' in sys.argv else []
+@@ -67,9 +68,12 @@
+     []
+ )
  
 +deb_version = check_output(('dpkg-parsechangelog', '-S', 'Version')).decode('utf-8')
 +upstream_version = deb_version.split('-')[0]
 +
  setup_params = dict(
      name='keyring',
--    use_vcs_version=dict(increment='1.0'),
+-    use_vcs_version=True,
 +    version=upstream_version,
      description="Store and access your passwords safely.",
      url="http://bitbucket.org/kang/python-keyring-lib",
      keywords="keyring Keychain GnomeKeyring Kwallet password storage",
-@@ -87,9 +91,7 @@
+@@ -92,9 +96,7 @@
      packages=setuptools.find_packages(),
      extras_require={'test': test_requirements},
      tests_require=test_requirements,