Control: tags -1 + patch

On Tue, Dec 15, 2015 at 07:11:30AM +0100, Helmut Grohne wrote:
> 1) Since the documentation resides in Arch:all -doc packages, arguably
>    python-sphinx is not needed for building architecture dependent
>    packages. Thus the dependency should be moved to Build-Depends-Indep.
>    Of course I tried this method on both packages before resorting to
>    the :native annotation, but the use of sphinxdoc in debhelper's
>    --with flag makes this non-trivial. If you see a way to do this,
>    that'd totally solve the issue.

I did find a way to implement this. A patch is attached. It also speeds
up the indep-only build by not building jansson, which is useful for
source-only uploads. Can you apply it?

Helmut
diff --minimal -Nru jansson-2.7/debian/changelog jansson-2.7/debian/changelog
--- jansson-2.7/debian/changelog
+++ jansson-2.7/debian/changelog
@@ -1,3 +1,11 @@
+jansson (2.7-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Improve cross Build-Depends satisfiability (Closes: #807848)
+    + Demote python-sphinx to Build-Depends-Indep
+
+ -- Helmut Grohne <hel...@subdivi.de>  Tue, 22 Mar 2016 20:35:09 +0100
+
 jansson (2.7-3) unstable; urgency=medium
 
   * Always build the documentation (Closes: #789675)
diff --minimal -Nru jansson-2.7/debian/control jansson-2.7/debian/control
--- jansson-2.7/debian/control
+++ jansson-2.7/debian/control
@@ -2,7 +2,8 @@
 Section: libs
 Priority: optional
 Maintainer: Alessandro Ghedini <gh...@debian.org>
-Build-Depends: debhelper (>= 9), dh-autoreconf, python-sphinx (>= 1.0)
+Build-Depends: debhelper (>= 9), dh-autoreconf
+Build-Depends-Indep: python-sphinx (>= 1.0)
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/jansson.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/jansson.git
diff --minimal -Nru jansson-2.7/debian/rules jansson-2.7/debian/rules
--- jansson-2.7/debian/rules
+++ jansson-2.7/debian/rules
@@ -1,11 +1,14 @@
 #!/usr/bin/make -f
 
 %:
+       dh $@ --with=autoreconf
+binary binary-indep build build-indep install install-indep:
        dh $@ --with=autoreconf,sphinxdoc
 
-override_dh_auto_build:
-       dh_auto_build
+override_dh_auto_build-indep:
        $(MAKE) html
 
+override_dh_auto_test-indep override_dh_auto_install-indep:
+
 override_dh_strip:
        dh_strip --dbg-package=libjansson-dbg

Reply via email to