[Python-modules-commits] [python-smstrade] 03/17: merge patched into master

[Jan Dittberner]

This is an automated email from the git hooks/post-receive script.

jandd pushed a commit to branch master
in repository python-smstrade.

commit 6d6b50e15d21f5595554c02aa7a9498719b8092b
Merge: 1b7c12e 52011f6
Author: Jan Dittberner <jandd at debian.org>
Date:   Sat Jan 2 19:13:38 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...-number-to-be-independent-of-master-branc.patch | 46 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  4 --
 smstrade/_version.py                               |  5 +--
 version.txt                                        |  2 +-
 6 files changed, 51 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index 67e6b70,0000000..f9ca10d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- a849b2ff9614e58600132d3ec0d37e38a687462c
- a849b2ff9614e58600132d3ec0d37e38a687462c
++52011f66d5aea3999c069529fdce644aba62dee9
++52011f66d5aea3999c069529fdce644aba62dee9
 +a849b2ff9614e58600132d3ec0d37e38a687462c
 +a849b2ff9614e58600132d3ec0d37e38a687462c
 +python-smstrade_0.2.4.orig.tar.gz
 +a7834eb5133daa1b36e125dccaae2a693e0298ee
 +13390
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-version-number-to-be-independent-of-master-branc.patch
index 0000000,0000000..4d097e3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-version-number-to-be-independent-of-master-branc.patch
@@@ -1,0 -1,0 +1,46 @@@
++From 52011f66d5aea3999c069529fdce644aba62dee9 Mon Sep 17 00:00:00 2001
++From: Jan Dittberner <jandd at debian.org>
++Date: Sat, 2 Jan 2016 19:13:29 +0100
++Subject: Fix version number to be independent of master branch changes
++
++---
++ setup.py             | 4 ----
++ smstrade/_version.py | 5 +----
++ version.txt          | 2 +-
++ 3 files changed, 2 insertions(+), 9 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index c08907d..2350c47 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -53,11 +53,7 @@ setup(
++     author="Jan Dittberner",
++     author_email="jan at dittberner.info",
++     packages=find_packages(exclude=['tests']),
++-    setup_requires=['vcversioner'],
++     license="MIT",
++-    vcversioner={
++-        'version_module_paths': ['smstrade/_version.py'],
++-    },
++     entry_points={
++         'console_scripts': [
++             'smstrade_send = smstrade:send_sms',
++diff --git a/smstrade/_version.py b/smstrade/_version.py
++index d9e27ce..ace3989 100644
++--- a/smstrade/_version.py
+++++ b/smstrade/_version.py
++@@ -1,5 +1,2 @@
++-
++-# This file is automatically generated by setup.py.
+++# This file is patched by the Debian package
++ __version__ = '0.2.4'
++-__sha__ = 'g19d040f'
++-__revision__ = 'g19d040f'
++diff --git a/version.txt b/version.txt
++index 1f53580..abd4105 100644
++--- a/version.txt
+++++ b/version.txt
++@@ -1 +1 @@
++-0.2.4-0-g19d040f
++\ No newline at end of file
+++0.2.4
diff --cc debian/patches/series
index 0000000,0000000..0127d7b
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-version-number-to-be-independent-of-master-branc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-smstrade.git