Revert "fishdescriptor: for revert: attempt at setuptools"

This reverts commit 15b1fbea6eaf22d148764b352f2d86b5fc7efb1c.

diff --git a/debian/control b/debian/control
index e6a33dcb91eb9ae6208b92adff7127bff3fed605..3e095540e7df876c1838a52ee661b9a7affc37fa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: admin
 Priority: extra
 Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Build-Depends: libx11-dev, libxmu-dev, nettle-dev, debhelper (>= 5),
 Priority: extra
 Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Build-Depends: libx11-dev, libxmu-dev, nettle-dev, debhelper (>= 5),

-               libxdmcp-dev, libxau-dev, libice-dev, libsm-dev,
-               dh-python
+               libxdmcp-dev, libxau-dev, libice-dev, libsm-dev

 Standards-Version: 3.9.1
 
 Package: chiark-backup
 Standards-Version: 3.9.1
 
 Package: chiark-backup

diff --git a/debian/rules b/debian/rules
index cf5973423acadf5b751868e9f82d348d0cdcc58c..32f312912b87f42b97d5d3508ceb3bf1d451a772 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,10 +23,6 @@ build:
        set -e; for s in $(subdirs_build_arch); do \
                $(MAKE) -C $$s all $(makebuildargs); \
        done
        set -e; for s in $(subdirs_build_arch); do \
                $(MAKE) -C $$s all $(makebuildargs); \
        done

-
-       dh_python2
-       dh_python3
-

        touch build
 
 build-indep: build
        touch build
 
 build-indep: build

diff --git a/setup.py b/setup.py
deleted file mode 100644 (file)
index ece640f..0000000
--- a/setup.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from setuptools import setup, find_packages
-
-setup(
-  name="fishdescriptor",
-  version="1.0",
-  package_dir={'':'fishdescriptor/py'},
-  packages=["fishdescriptor"],
-  scripts=["fishdescriptor"],
-)