diff --git a/horizon/Makefile b/horizon/Makefile index d64cd72bcb..19b180fce7 100644 --- a/horizon/Makefile +++ b/horizon/Makefile @@ -1,6 +1,5 @@ PYTHON=`which python` DESTDIR=/ -BUILDIR=$(CURDIR)/debian/horizon PROJECT=horizon all: @@ -9,7 +8,6 @@ all: @echo "make source - Create source package" @echo "make install - Install on local system" @echo "make buildrpm - Generate a rpm package" - @echo "make builddeb - Generate a deb package" @echo "make clean - Get rid of scratch and byte files" buildout: ./bin/buildout @@ -27,17 +25,7 @@ install: buildrpm: $(PYTHON) setup.py bdist_rpm --post-install=rpm/postinstall --pre-uninstall=rpm/preuninstall -builddeb: - # build the source package in the parent directory - # then rename it to project_version.orig.tar.gz - $(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../ - rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../* - # build the package - #dpkg-buildpackage -i -I -rfakeroot - dpkg-buildpackage -b -rfakeroot -tc -uc -D - clean: $(PYTHON) setup.py clean - $(MAKE) -f $(CURDIR)/debian/rules clean rm -rf build/ MANIFEST find . -name '*.pyc' -delete diff --git a/openstack-dashboard/Makefile b/openstack-dashboard/Makefile index 4b00d036d5..63df40114a 100644 --- a/openstack-dashboard/Makefile +++ b/openstack-dashboard/Makefile @@ -1,6 +1,5 @@ PYTHON=`which python` DESTDIR=/ -BUILDIR=$(CURDIR)/debian/openstack-dashboard PROJECT=openstack-dashboard all: @@ -9,7 +8,6 @@ all: @echo "make source - Create source package" @echo "make install - Install on local system" @echo "make buildrpm - Generate a rpm package" - @echo "make builddeb - Generate a deb package" @echo "make clean - Get rid of scratch and byte files" buildout: ./bin/buildout @@ -27,15 +25,6 @@ install: buildrpm: $(PYTHON) setup.py bdist_rpm --post-install=rpm/postinstall --pre-uninstall=rpm/preuninstall -builddeb: - # build the source package in the parent directory - # then rename it to project_version.orig.tar.gz - $(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../ - rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../* - # build the package - #dpkg-buildpackage -i -I -rfakeroot - dpkg-buildpackage -b -rfakeroot -tc -uc -D - clean: $(PYTHON) setup.py clean $(MAKE) -f $(CURDIR)/debian/rules clean diff --git a/openstack-dashboard/debian/changelog b/openstack-dashboard/debian/changelog deleted file mode 100644 index e485e7b0d4..0000000000 --- a/openstack-dashboard/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -openstack-dashboard (0.2.0) UNRELEASED; urgency=low - - * Initial release. (Closes: #XXXXXX) - - -- anthony Mon, 20 Jun 2011 20:29:57 +0000 diff --git a/openstack-dashboard/debian/compat b/openstack-dashboard/debian/compat deleted file mode 100644 index 7f8f011eb7..0000000000 --- a/openstack-dashboard/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/openstack-dashboard/debian/control b/openstack-dashboard/debian/control deleted file mode 100644 index 63045bbf8a..0000000000 --- a/openstack-dashboard/debian/control +++ /dev/null @@ -1,17 +0,0 @@ -Source: openstack-dashboard -Section: python -Priority: optional -Maintainer: Anthony Young (sleepsonthefloor) -Build-Depends: debhelper (>=7.0.50~), python-support (>= 0.6), cdbs (>= 0.4.49), python-all-dev -XS-Python-Version: >=2.5 -Standards-Version: 3.9.1 - -Package: openstack-dashboard -Architecture: all -Homepage: https://github.com/4P/openstack-dashboard -XB-Python-Version: ${python:Versions} -Depends: ${misc:Depends}, ${python:Depends} -Description: Dashboard for Openstack - Here you should put a long description your package. This line *MUST* (this is - for default printing) begin with a single space. - Look for more information about this. diff --git a/openstack-dashboard/debian/copyright b/openstack-dashboard/debian/copyright deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/openstack-dashboard/debian/rules b/openstack-dashboard/debian/rules deleted file mode 100755 index f9ad92e1c6..0000000000 --- a/openstack-dashboard/debian/rules +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -DEB_PYTHON_SYSTEM := pysupport - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk - -clean:: - rm -rf build build-stamp configure-stamp build/ MANIFEST - dh_clean - diff --git a/openstack-dashboard/setup.py b/openstack-dashboard/setup.py index a39de56418..75d706271b 100755 --- a/openstack-dashboard/setup.py +++ b/openstack-dashboard/setup.py @@ -26,13 +26,6 @@ def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() -dst = 'debian/openstack-dashboard/var/lib/dash' -os.system('rm -rf %s' % dst) -shutil.copytree('tools', '%s/tools' % dst) -shutil.copytree('dashboard', '%s/dashboard' % dst) -shutil.copytree('local', '%s/local' % dst) - - setuptools.setup( name = 'openstack-dashboard', version = '0.4',