[Python-modules-commits] [pytds] 07/08: merge patched into master

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository pytds.

commit 714ce5a7dbbb81ce5f207adf85eccfe023c7ab63
Merge: fd2cd2a 731186b
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Sat Mar 11 20:27:10 2017 +0000

    merge patched into master

 RELEASE-VERSION                           |  1 +
 debian/.git-dpm                           |  4 ++--
 debian/patches/0001-RELEASE-VERSION.patch | 20 ++++++++++++++++++++
 debian/patches/series                     |  1 +
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 405b48f,0000000..86b03d8
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
- ed7ec511e0ca09a536fe97af61d97ace3f4eae8b
- ed7ec511e0ca09a536fe97af61d97ace3f4eae8b
++731186b5a7a869441b5d655988bb65d4f7f317ae
++731186b5a7a869441b5d655988bb65d4f7f317ae
 +ed7ec511e0ca09a536fe97af61d97ace3f4eae8b
 +ed7ec511e0ca09a536fe97af61d97ace3f4eae8b
 +pytds_1.8.2.orig.tar.gz
 +25d5e81b50c28230435b46ed907eb3487d1d7094
 +97571
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-RELEASE-VERSION.patch
index 0000000,0000000..042a276
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-RELEASE-VERSION.patch
@@@ -1,0 -1,0 +1,20 @@@
++From 731186b5a7a869441b5d655988bb65d4f7f317ae Mon Sep 17 00:00:00 2001
++From: Christopher Hoskin <christopher.hoskin at gmail.com>
++Date: Sat, 11 Mar 2017 20:24:44 +0000
++Subject: RELEASE-VERSION
++
++Forwarded: not-needed
++Author: Christopher Hoskin <mans0954 at debian.org>
++Last-Update: 11-Mar-2017
++---
++ RELEASE-VERSION | 1 +
++ 1 file changed, 1 insertion(+)
++ create mode 100644 RELEASE-VERSION
++
++diff --git a/RELEASE-VERSION b/RELEASE-VERSION
++new file mode 100644
++index 0000000..53adb84
++--- /dev/null
+++++ b/RELEASE-VERSION
++@@ -0,0 +1 @@
+++1.8.2
diff --cc debian/patches/series
index 0000000,0000000..478bfb4
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-RELEASE-VERSION.patch

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