[Python-modules-commits] [python-pyalsa] 05/09: merge patched into master

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository python-pyalsa.

commit 3328a30ad7b4a3ac616037072534ece197dcf705
Merge: 14e9927 a1d9f13
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Thu Nov 26 10:10:27 2015 +0900

    merge patched into master

 debian/.git-dpm                |  6 +++---
 debian/patches/00_fix_setup_py | 34 ----------------------------------
 debian/patches/series          |  1 -
 3 files changed, 3 insertions(+), 38 deletions(-)

diff --cc debian/.git-dpm
index 7257dd3,0000000..e052380
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
- 1e2ec040da4ceecb80547d6ac3e7eec9fd6fbe9b
- 1e2ec040da4ceecb80547d6ac3e7eec9fd6fbe9b
- ced502a2686fa01d3f5a8bc1fc3c29470b13f74a
++a1d9f1318d3d0220e1252289277d72d3d76e3a22
++a1d9f1318d3d0220e1252289277d72d3d76e3a22
++a1d9f1318d3d0220e1252289277d72d3d76e3a22
 +a1d9f1318d3d0220e1252289277d72d3d76e3a22
 +python-pyalsa_1.0.29.orig.tar.bz2
 +9beb926b7d9429eca43e8a11e8152e8f2a32f1d9
 +39481
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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