[Python-modules-commits] r26243 - in packages/pytaglib/trunk/debian (6 files)

[cjsmo-guest at users.alioth.debian.org]

    Date: Tuesday, October 22, 2013 @ 15:17:59
  Author: cjsmo-guest
Revision: 26243

make changes piotr suggested

Added:
  packages/pytaglib/trunk/debian/dirs
  packages/pytaglib/trunk/debian/patches/
  packages/pytaglib/trunk/debian/patches/01_setuppy.patch
  packages/pytaglib/trunk/debian/patches/series
Modified:
  packages/pytaglib/trunk/debian/control
  packages/pytaglib/trunk/debian/rules

Modified: packages/pytaglib/trunk/debian/control
===================================================================
--- packages/pytaglib/trunk/debian/control	2013-10-22 07:37:18 UTC (rev 26242)
+++ packages/pytaglib/trunk/debian/control	2013-10-22 15:17:59 UTC (rev 26243)
@@ -17,7 +17,7 @@
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pytaglib/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pytaglib/trunk/
 
-Package: python3-taglib
+Package: python3-pytaglib
 Depends: ${shlibs:Depends},
  ${misc:Depends},
  ${python3:Depends},

Added: packages/pytaglib/trunk/debian/dirs
===================================================================
--- packages/pytaglib/trunk/debian/dirs	                        (rev 0)
+++ packages/pytaglib/trunk/debian/dirs	2013-10-22 15:17:59 UTC (rev 26243)
@@ -0,0 +1 @@
+usr/bin

Added: packages/pytaglib/trunk/debian/patches/01_setuppy.patch
===================================================================
--- packages/pytaglib/trunk/debian/patches/01_setuppy.patch	                        (rev 0)
+++ packages/pytaglib/trunk/debian/patches/01_setuppy.patch	2013-10-22 15:17:59 UTC (rev 26243)
@@ -0,0 +1,24 @@
+Description: Disable entry points
+Author: Charlie Smotherman <cjsmo at cableone.net>
+
+Index: pytaglib-0.3.6/setup.py
+===================================================================
+--- pytaglib-0.3.6.orig/setup.py	2013-08-13 03:22:17.000000000 -0500
++++ pytaglib-0.3.6/setup.py	2013-10-22 04:03:27.276851085 -0500
+@@ -32,7 +32,7 @@
+     else:
+         return open(readmeFile, "rt").read()
+ 
+-script_name = 'pyprinttags3' if sys.version_info[0] >= 3 else 'pyprinttags'
++#script_name = 'pyprinttags3' if sys.version_info[0] >= 3 else 'pyprinttags'
+ 
+ setup(
+     name='pytaglib',
+@@ -48,6 +48,6 @@
+     ext_modules=cythonize("src/taglib.pyx"),
+     package_dir={'': 'src'},
+     py_modules=['pyprinttags'],
+-    entry_points={ 'console_scripts': ['{0} = pyprinttags:script'.format(script_name)] },
++   # entry_points={ 'console_scripts': ['{0} = pyprinttags:script'.format(script_name)] },
+     test_suite='tests'
+ )

Added: packages/pytaglib/trunk/debian/patches/series
===================================================================
--- packages/pytaglib/trunk/debian/patches/series	                        (rev 0)
+++ packages/pytaglib/trunk/debian/patches/series	2013-10-22 15:17:59 UTC (rev 26243)
@@ -0,0 +1 @@
+01_setuppy.patch

Modified: packages/pytaglib/trunk/debian/rules
===================================================================
--- packages/pytaglib/trunk/debian/rules	2013-10-22 07:37:18 UTC (rev 26242)
+++ packages/pytaglib/trunk/debian/rules	2013-10-22 15:17:59 UTC (rev 26243)
@@ -1,10 +1,21 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-export PYBUILD_TEST=--test-pytest
+export PYBUILD_TEST_python3=--test-pytest
+export PYBUILD_INSTAL_ARGS_python3=--install-layout=deb
 
+PY3VERS = $(shell py3version -r)
+DESTDIR = $(CURDIR)/debian/python3-pytaglib
+PYPRT   = $(DESTDIR)/usr/lib/$(PY3VERS)/dist-packages
+PYPRT3  = $(DESTDIR)/usr/bin
+
 %:
 	dh $@ --with=python3 --buildsystem=pybuild
 
 override_dh_auto_build:
 	mv doc/pyprinttags.1 doc/pyprinttags3.1
+
+override_dh_install:
+	dh_install
+	mv $(PYPRT)/pyprinttags.py $(PYPRT3)/pyprinttags3
+