From: biao716.wang Date: Thu, 12 Nov 2020 07:05:41 +0000 (+0900) Subject: Modify urlgrabber install directory X-Git-Tag: accepted/tools/devbase/tools/20250527.103829~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28afff5592dec6a66cfad5688b2f7663f82ec480;p=tools%2Fpython-urlgrabber.git Modify urlgrabber install directory must name package name python3-urlgrabber, if so, it will be installed in dist-packages directory. But if you name it python-urlgrabber, it will be installed in site-paackages dir under pythone version Change-Id: I268bc9617ea55b1beb863b78c378dcefca0fa9cf Signed-off-by: biao716.wang --- diff --git a/debian/control b/debian/control index 1f8573c..67f13df 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: python-urlgrabber Section: devel Priority: extra Maintainer: Jong-Woo Chae -Build-Depends: debhelper (>= 7.0.15), python3-dev, dh-python, python3-setuptools, python3-six, python3-pycurl +Build-Depends: debhelper (>= 7.0.15), cdbs, python3, python-is-python3, python3-all, python3-dev, dh-python, python3-docutils, python3-six, python3-pycurl Standards-Version: 4.1.0 Homepage: http://www.tizen.org -Package: python-urlgrabber +Package: python3-urlgrabber Architecture: all -Depends: ${python:Depends}, +Depends: ${python3:Depends}, python3-six, python3-pycurl Description: image creator for Linux distributions diff --git a/debian/python-urlgrabber.install b/debian/python-urlgrabber.install deleted file mode 100644 index 28207a6..0000000 --- a/debian/python-urlgrabber.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/* /usr/lib -debian/tmp/usr/bin/urlgrabber /usr/bin diff --git a/debian/rules b/debian/rules index e200318..79a8246 100755 --- a/debian/rules +++ b/debian/rules @@ -1,47 +1,14 @@ #!/usr/bin/make -f +%: + dh $@ --with python3 --buildsystem=pybuild -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +override_dh_auto_install: + dh_auto_install + # remove unneeded documents installed by setup.py + -rm -rf $(CURDIR)/debian/python-urlgrabber/usr/share/doc/urlgrabber-* + #mkdir -p $(CURDIR)/debian/tmp + #python3 setup.py install --prefix=/usr --root=$(CURDIR)/debian/tmp +override_dh_installchangelogs: + dh_installchangelogs ChangeLog -build: build-stamp -build-stamp: - dh_testdir - python3 setup.py build -clean: - dh_testdir - dh_testroot - rm -f build-stamp - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Installing package - mkdir -p $(CURDIR)/debian/tmp - python3 setup.py install --prefix=/usr --root=$(CURDIR)/debian/tmp -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_install - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_python3 - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: build install - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/setup.py b/setup.py index 6f6a6bd..17401e1 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ -from setuptools import setup +#from setuptools import setup +from distutils.core import setup pkg_name = "urlgrabber" pkg_version = "4.1.0" @@ -44,12 +45,6 @@ setup( maintainer_email="ngompa@fedoraproject.org", packages=["urlgrabber"], package_dir = {'urlgrabber':'urlgrabber'}, - include_package_data=True, - install_requires=[ - "pycurl", - "six", - "setuptools", - ], scripts = ['scripts/urlgrabber'], data_files = [ ('share/doc/' + pkg_name + '-' + pkg_version, ['README','LICENSE', 'TODO', 'ChangeLog']),