* remove debian files (should be autogenerated)

* move different files to data
* move scripts to scripts

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -1,17 +0,0 @@
-Source: yandex-load-tank-base
-Section: devel
-Priority: optional
-Maintainer: Yandex Load Testing Team <doctornkz@yandex.ru>
-Build-Depends: debhelper (>= 7), python | python-all | python-dev | python-all-dev
-Standards-Version: 3.9.3
-Homepage: https://github.com/yandex-load/yandex-tank
-
-Package: yandex-load-tank-base
-Architecture: all
-Depends: python (>=2.6), python-ipaddr, python-lxml, python-progressbar, python-psutil,
-	phantom(>=0.14), phantom-ssl,
-    ${misc:Depends}
-Recommends: python-mysqldb, python-sqlalchemy
-Description: Yandex.Tank (Load Testing Tool)
- turns common Debian compatible computer into heavy machinegun
-

debian/copyright

@@ -1 +1 @@
-© 2012 Yandex, Load Testing Team <doctornkz@yandex.ru>
+© 2015 Yandex, Load Testing Team <doctornkz@yandex.ru>

debian/dirs

@@ -1,3 +0,0 @@
-usr/lib/yandex-tank
-etc/yandex-tank
-usr/bin

debian/install

@@ -1,7 +0,0 @@
-Tank usr/lib/yandex-tank
-tankcore.py usr/lib/yandex-tank
-
-tank.py usr/lib/yandex-tank
-*.sh usr/lib/yandex-tank
-00-base.ini etc/yandex-tank
-yandex-tank.completion /etc/bash_completion.d

debian/links

@@ -1,5 +0,0 @@
-/usr/lib/yandex-tank/tank.py /usr/bin/lunapark
-/usr/lib/yandex-tank/tank.py /usr/bin/yandex-tank
-/usr/lib/yandex-tank/ab.sh /usr/bin/yandex-tank-ab
-/usr/lib/yandex-tank/jmeter.sh /usr/bin/yandex-tank-jmeter
-/usr/lib/yandex-tank/bfg.sh /usr/bin/yandex-tank-bfg

debian/manpages

@@ -1,2 +1,2 @@
-debian/yandex-tank.1
-debian/load.conf.1
+data/yandex-tank.1
+data/load.conf.1

debian/rules

@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp  
-	dh_testdir
-
-	# Add here commands to compile the package.
-	#$(MAKE)
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	#$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep  
-	dh_installdirs
-
-	# Add here commands to install the package into debian/yandex-load-tank.
-	#$(MAKE) DESTDIR=$(CURDIR)/debian/yandex-load-tank install
-
-build-arch: build-stamp
-build-indep: build-stamp
-      
-# Build architecture-independent files here.
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-#	dh_installexamples
-	dh_install
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-#	dh_installwm
-#	dh_installudev
-	dh_lintian
-#	dh_undocumented
-	dh_installman
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_perl
-	dh_python2
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-override_dh_pysupport:
-	dh_python2
-
-# Build architecture-dependent files here.
-binary-arch: install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

debian/yandex-load-tank-base.pyinstall

@@ -1 +0,0 @@
-tankcore.py 2.6-

setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='yandextank',
-    version='1.6.8',
+    version='1.7.0',
     description='a performance measurement tool',
     longer_description='''
 Yandex.Tank is a performance measurement and load testing automatization tool.
@@ -34,8 +34,6 @@ analytic tools for the results they produce.
         'Intended Audience :: Developers',
         'Intended Audience :: System Administrators',
         'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)',
-        'Operating System :: MacOS :: MacOS X',
-        'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX',
         'Topic :: Software Development :: Quality Assurance',
         'Topic :: Software Development :: Testing',
@@ -73,5 +71,8 @@ analytic tools for the results they produce.
         ('/etc/yandex-tank/TipsAndTricks', [
             'config/TipsAndTricks/tips.txt',
         ]),
+        ('/etc/bash_completion.d', [
+            'data/yandex-tank.completion'
+        ]),
     ]
 )