diff --git a/debian/python-ur.pyinstall b/debian/python-urx.pyinstall similarity index 100% rename from debian/python-ur.pyinstall rename to debian/python-urx.pyinstall diff --git a/debian/python3-ur.install b/debian/python3-urx.install similarity index 100% rename from debian/python3-ur.install rename to debian/python3-urx.install diff --git a/make_deb.py b/make_deb.py index 1d75a4f..2a860c0 100755 --- a/make_deb.py +++ b/make_deb.py @@ -8,8 +8,9 @@ from email.utils import formatdate DEBVERSION = "0.5" -rev = subprocess.check_output("bzr version-info --check-clean --custom --template='{revno}'", shell=True) -bzrstring = "bzr" + str(rev).replace("'","") +#rev = subprocess.check_output("bzr version-info --check-clean --custom --template='{revno}'", shell=True) +#bzrstring = "bzr" + str(rev).replace("'","") +vcsstring = "gitxxx" def get_changelog(progname, version, changelog, date): @@ -31,12 +32,12 @@ def check_deb(name): if __name__ == "__main__": check_deb("build-essential") f = open("debian/changelog", "w") - f.write(get_changelog("python-ur", DEBVERSION + bzrstring, "Updated to last changes in bzr repository", formatdate())) + f.write(get_changelog("python-urx", DEBVERSION + vcsstring, "Updated to last changes in repository", formatdate())) f.close() #now build package #subprocess.check_call("dpkg-buildpackage -rfakeroot -uc -us -b", shell=True) - subprocess.check_call("fakeroot dh binary --with python3,python2 --without pysupport,pycentral", shell=True) + subprocess.check_call("fakeroot dh binary --with python3,python2", shell=True) subprocess.check_call("dh clean", shell=True) diff --git a/setup.py b/setup.py index 15fe476..7f4244a 100644 --- a/setup.py +++ b/setup.py @@ -2,18 +2,16 @@ from distutils.core import setup from distutils.command.install_data import install_data -import glob -import os - import make_deb setup (name = "python-ur", - version = make_deb.bzrstring, + version = make_deb.vcsstring, description = "Python library to control an UR robot", author = "Olivier Roulet-Dubonnet", url = 'http://launchpad.net/XXX', - py_modules=["urparser", "urx"], - license = "GNU General Public License", + packages = ["urx"], + provides = ["urx"], + license = "GNU General Public License v3", )