[Python-modules-commits] [python-pyalsa] 07/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 76b247972744e4c6cd3f8f7b99c380d7d006db71
Merge: 3328a30 02527d7
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Thu Nov 26 10:13:00 2015 +0900

    merge patched into master

 debian/.git-dpm                                 |  4 +--
 debian/patches/0001-Do-not-create-symlink.patch | 34 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 setup.py                                        | 17 -------------
 4 files changed, 37 insertions(+), 19 deletions(-)

diff --cc debian/.git-dpm
index e052380,0000000..f2ea19a
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
- a1d9f1318d3d0220e1252289277d72d3d76e3a22
- a1d9f1318d3d0220e1252289277d72d3d76e3a22
++02527d7272205e8f48b1125a72e2047c0b2d75f0
++02527d7272205e8f48b1125a72e2047c0b2d75f0
 +a1d9f1318d3d0220e1252289277d72d3d76e3a22
 +a1d9f1318d3d0220e1252289277d72d3d76e3a22
 +python-pyalsa_1.0.29.orig.tar.bz2
 +9beb926b7d9429eca43e8a11e8152e8f2a32f1d9
 +39481
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Do-not-create-symlink.patch
index 0000000,0000000..246b523
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Do-not-create-symlink.patch
@@@ -1,0 -1,0 +1,34 @@@
++From 02527d7272205e8f48b1125a72e2047c0b2d75f0 Mon Sep 17 00:00:00 2001
++From: TANIGUCHI Takaki <takaki at asis.media-as.org>
++Date: Thu, 26 Nov 2015 10:12:42 +0900
++Subject: Do not create symlink
++
++---
++ setup.py | 17 -----------------
++ 1 file changed, 17 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 925d4eb..499c602 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -58,20 +58,3 @@ setup(
++     packages=['pyalsa'],
++     scripts=[]
++ )
++-
++-uname = os.uname()
++-a = 'build/lib.%s-%s-%s' % (uname[0].lower(), uname[4], sys.version[:3])
++-for f in ['alsacard.so', 'alsacontrol.so', 'alsahcontrol.so',
++-          'alsamixer.so', 'alsaseq.so']:
++-  if not os.path.exists('pyalsa/%s' % f):
++-    a = '../build/lib.%s-%s-%s/pyalsa/%s' % \
++-                    (uname[0].lower(), uname[4], sys.version[:3], f)
++-    print a, f
++-    p = 'pyalsa/' + f
++-    try:
++-      st = os.lstat(p)
++-      if stat.S_ISLNK(st.st_mode):
++-        os.remove(p)
++-    except:
++-      pass
++-    os.symlink(a, 'pyalsa/%s' % f)
diff --cc debian/patches/series
index 0000000,0000000..28723a2
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Do-not-create-symlink.patch

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