Bug#856358: unblock fdroidserver/0.7.0-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package: fdroidserver
It previously had bash-completion, and a build bug preventing the
upstream completion file from being installed in 0.7.0-1 (856352).
Since I was uploading, I also fixed another easy usability bug (855978)
Attached is the source debdiff.
diff -Nru fdroidserver-0.7.0/debian/changelog fdroidserver-0.7.0/debian/changelog
--- fdroidserver-0.7.0/debian/changelog 2017-02-28 12:30:58.000000000 +0100
+++ fdroidserver-0.7.0/debian/changelog 2017-02-28 13:17:18.000000000 +0100
@@ -1,3 +1,10 @@
+fdroidserver (0.7.0-2) unstable; urgency=medium
+
+ * make sure bash-completion is installed (Closes: #856352)
+ * prefer headless JDK when available (Closes: #855978)
+
+ -- Hans-Christoph Steiner <hans@eds.org> Tue, 28 Feb 2017 13:04:38 +0100
+
fdroidserver (0.7.0-1) unstable; urgency=medium
* New upstream release (Closes: #835463)
diff -Nru fdroidserver-0.7.0/debian/control fdroidserver-0.7.0/debian/control
--- fdroidserver-0.7.0/debian/control 2017-02-28 12:32:01.000000000 +0100
+++ fdroidserver-0.7.0/debian/control 2017-02-28 13:17:18.000000000 +0100
@@ -4,9 +4,12 @@
Maintainer: Hans-Christoph Steiner <hans@eds.org>
Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
Build-Depends: debhelper (>= 9.0~),
+ bash-completion,
dh-python,
python3,
- python3-setuptools
+ python3-setuptools,
+ texlive,
+ texinfo
Standards-Version: 3.9.8
X-Python3-Version: >= 3.2
Homepage: https://f-droid.org
@@ -16,7 +19,7 @@
Package: fdroidserver
Architecture: all
Depends: ${python3:Depends},
- default-jdk | openjdk-7-jdk | oracle-java7-jdk | oracle-java8-jdk | oracle-java9-jdk | oracle-java7-installer | oracle-java8-installer | oracle-java9-installer,
+ default-jdk-headless | default-jdk | openjdk-7-jdk | oracle-java7-jdk | oracle-java8-jdk | oracle-java9-jdk | oracle-java7-installer | oracle-java8-installer | oracle-java9-installer,
rsync,
${misc:Depends}
Recommends: adb,
diff -Nru fdroidserver-0.7.0/debian/docs fdroidserver-0.7.0/debian/docs
--- fdroidserver-0.7.0/debian/docs 2017-02-28 12:32:52.000000000 +0100
+++ fdroidserver-0.7.0/debian/docs 2017-02-28 13:05:43.000000000 +0100
@@ -1 +1,2 @@
README.md
+docs/html/
diff -Nru fdroidserver-0.7.0/debian/rules fdroidserver-0.7.0/debian/rules
--- fdroidserver-0.7.0/debian/rules 2017-02-28 12:48:05.000000000 +0100
+++ fdroidserver-0.7.0/debian/rules 2017-02-28 13:17:18.000000000 +0100
@@ -18,6 +18,13 @@
override_dh_compress:
dh_compress -X usr/share/doc/fdroidserver/examples
+override_dh_installdocs:
+ cd docs/ && \
+ ./gendocs.sh -o html --email admin@f-droid.org fdroid "F-Droid Server Manual"
+ rm -f docs/html/fdroid.html.gz
+ dh_installdocs
+
override_dh_auto_install:
dh_bash-completion
dh_auto_install
+ sed -i '/^#!\/bin\/bash/d' debian/fdroidserver/usr/share/bash-completion/completions/fdroid
Reply to: