Use pydbgp and pydbgp2 for binary names

2 files changed, 26 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3409b7e79f0a..13cca84d5ef6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = komodo-pydbgp
 	pkgdesc = The Komodo IDE Python Remote Debugging component
 	pkgver = 12.0.1.91869
-	pkgrel = 1
+	pkgrel = 2
 	url = http://code.activestate.com/komodo/remotedebugging/
 	arch = x86_64
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index 2a51f8256fbd..5bba7dce5eeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=(python-pydbgp python2-pydbgp)
 _srcrel=91869
 _srcver=12.0.1
 pkgver=${_srcver}.${_srcrel}
-pkgrel=1
+pkgrel=2
 pkgdesc="The Komodo IDE Python Remote Debugging component"
 arch=('x86_64')
 url="http://code.activestate.com/komodo/remotedebugging/"
@@ -16,30 +16,34 @@ source=("http://downloads.activestate.com/Komodo/releases/${_srcver}/remotedebug
 sha256sums=(217f13e51ea37e28714ef29c4a35c72e3c8fdf562610f8366702b103ffca2bf9)
 
 build() {
-	cd "$srcdir/Komodo-PythonRemoteDebugging-${_srcver}-${_srcrel}-linux-${arch[*]}"
-	cp pydbgpproxy py3_dbgpproxy
-	sed -i '1s:/usr/bin/env python:/usr/bin/env python2:' pydbgp
-	sed -i '1s:/usr/bin/env python:/usr/bin/env python2:' pydbgpproxy
+  rm -rf "${srcdir}/source"
+  cp -r "$srcdir/Komodo-PythonRemoteDebugging-${_srcver}-${_srcrel}-linux-${arch[*]}" "${srcdir}/source"
+  cd "$srcdir/source"
+  cp pydbgpproxy pydbgpproxy2
+  mv pydbgp pydbgp2
+  mv py3_dbgp pydbgp
+  sed -i '1s:/usr/bin/env python:/usr/bin/env python2:' pydbgp2
+  sed -i '1s:/usr/bin/env python:/usr/bin/env python2:' pydbgpproxy2
 }
 
 package_python-pydbgp() {
-	depends=(python)
-	# Terrible hack to get site-packages of current python
-	local site_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
-	cd "$srcdir/Komodo-PythonRemoteDebugging-${_srcver}-${_srcrel}-linux-${arch[*]}"
-	mkdir -p "${pkgdir}/usr/bin/" "${pkgdir}/${site_dir}"
-	cp py3_dbgp "${pkgdir}/usr/bin/"
-	cp py3_dbgpproxy "${pkgdir}/usr/bin/"
-	cp -r python3lib/dbgp  "${pkgdir}/${site_dir}"
+  depends=(python)
+  # Terrible hack to get site-packages of current python
+  local site_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+  cd "$srcdir/source"
+  mkdir -p "${pkgdir}/usr/bin/" "${pkgdir}/${site_dir}"
+  cp pydbgp "${pkgdir}/usr/bin/"
+  cp pydbgpproxy "${pkgdir}/usr/bin/"
+  cp -r python3lib/dbgp  "${pkgdir}/${site_dir}"
 }
 
 package_python2-pydbgp() {
-	depends=(python2)
-	# Terrible hack to get site-packages of current python
-	local site_dir=$(python2 -c 'import site; print(site.getsitepackages()[0])')
-	cd "$srcdir/Komodo-PythonRemoteDebugging-${_srcver}-${_srcrel}-linux-${arch[*]}"
-	mkdir -p "${pkgdir}/usr/bin/" "${pkgdir}/${site_dir}"
-	cp pydbgp "${pkgdir}/usr/bin/"
-	cp pydbgpproxy "${pkgdir}/usr/bin/"
-	cp -r pythonlib/dbgp  "${pkgdir}/${site_dir}"
+  depends=(python2)
+  # Terrible hack to get site-packages of current python
+  local site_dir=$(python2 -c 'import site; print(site.getsitepackages()[0])')
+  cd "$srcdir/source"
+  mkdir -p "${pkgdir}/usr/bin/" "${pkgdir}/${site_dir}"
+  cp pydbgp2 "${pkgdir}/usr/bin/"
+  cp pydbgpproxy2 "${pkgdir}/usr/bin/"
+  cp -r pythonlib/dbgp  "${pkgdir}/${site_dir}"
 }