Merge tag 'upstream/2016.06.25'

[youtubedl] / debian / rules

diff --git a/debian/rules b/debian/rules
index b389392906ec38c11fb65fcd3260efbd51ab0d23..07d43f26b0a2513bc8eeb08166cc447b15d8de1b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,16 @@
 #!/usr/bin/make -f
 %:
-       dh $@
+       dh $@ --with python2 --buildsystem=python_distutils
 
-override_dh_installman:
-       pod2man -r "youtube-dl" -c "User commands" debian/youtube-dl.pod > debian/youtube-dl.1
-       dh_installman
+override_dh_install:
+       mv debian/youtube-dl/usr/etc debian/youtube-dl/
+       dh_install
 
-override_dh_python2:
+override_dh_installdocs:
+       dh_installdocs
+       mv debian/youtube-dl/usr/share/doc/youtube_dl/* debian/youtube-dl/usr/share/doc/youtube-dl
+       rmdir debian/youtube-dl/usr/share/doc/youtube_dl
 
-override_dh_pysupport:
-override_dh_auto_test:
+override_dh_clean:
+       dh_clean
+       rm -rf youtube_dl.egg-info