summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puddletag/debian/changelog3
-rwxr-xr-xpuddletag/debian/rules26
2 files changed, 19 insertions, 10 deletions
diff --git a/puddletag/debian/changelog b/puddletag/debian/changelog
index 0faa8d0..cc415f1 100644
--- a/puddletag/debian/changelog
+++ b/puddletag/debian/changelog
@@ -4,8 +4,9 @@ puddletag (2.0.1-1+devuan) obs; urgency=high
* Fork debian debian.tar.xz and remove all docs steps which
were broken.
* Bump compat level to 12
+ * Omit pybuild which was just causing build issues.
- -- Ben Stack <bgstack15@gmail.com> Sat, 05 Sep 2020 11:52:56 -0400
+ -- Ben Stack <bgstack15@gmail.com> Wed, 16 Sep 2020 21:27:33 -0400
puddletag (1.2.0-2) unstable; urgency=medium
diff --git a/puddletag/debian/rules b/puddletag/debian/rules
index 97b84e7..42976fb 100755
--- a/puddletag/debian/rules
+++ b/puddletag/debian/rules
@@ -8,24 +8,32 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export PYBUILD_NAME=puddletag
-export PYBUILD_SYSTEM=distutils
+# Using pybuild causes build failures. Omitting pybuild throws tons of lintian warnings but it builds.
+#export PYBUILD_NAME=puddletag
+#export PYBUILD_SYSTEM=distutils
+# ON DH INVOCATION: --buildsystem=pybuild
%:
- dh $@ --with python3 --buildsystem=pybuild
+ dh $@ --with python3,sphinxdoc
override_dh_clean:
- dh_clean || :
-
-override_dh_auto_clean:
- dh_auto_clean || :
+ dh_clean
+ $(MAKE) -C puddletag-docs clean
override_dh_auto_install:
cd $(CURDIR)/source ; \
python3 setup.py install --root=$(CURDIR)/debian/puddletag --install-layout=deb
+ $(MAKE) -C puddletag-docs documentation SPHINXBUILD=sphinx-build
+
+override_dh_installdocs:
+ dh_installdocs README.rst source/THANKS source/TODO
+ mv puddletag-docs/_build/documentation/ puddletag-docs/_build/html/
+ dh_installdocs puddletag-docs/_build/html/
+ dh_link /usr/share/doc/puddletag/html/docs.html /usr/share/doc/puddletag/html/index.html
+
override_dh_compress:
dh_compress -X.txt
-#override_dh_installchangelogs:
-# dh_installchangelogs source/changelog
+override_dh_installchangelogs:
+ dh_installchangelogs source/changelog
bgstack15