Re: RFS: bunch, kitchen, grapefruit, fabulous, stomper, txws, txzmq, moksha.common, moksha.hub

[Jakub Wilk <jwilk@debian.org>]

* Simon Chopin <chopin.simon@gmail.com>, 2013-06-06, 14:19:
> > fabulous/fonts/cmr10.ttf license doesn't look free to me.
> I've removed all the fonts from the tarball since their license wasn't 
> specified anyway — I had to go look in other packages to find them. I 
> guess the FTP masters disagree with you on the license though, as one 
> can find this font at least in fonts-lyx.

I wouldn't assume that just because something is in main, it's 
necessarily blessed by ftp-masters. Two reasons:
1) mistakes happen;
2) not every upload goes through NEW.

> > I don't see a point of making fabulous-xtermspeedup a separate 
> > package. It's tiny, and doesn't bring any extra dependencies.
> Yes, but it's arch:any whereas the rest is arch:all.

That would be a valid reason to keep them separated _if_ the arch:all 
package were big. But it's tiny, too.

> > The package FTBFS when I build only arch-dependent packages:
> > |    dh_sphinxdoc -a
> > | dh_sphinxdoc: Sphinx documentation not found
> > | make: *** [binary-arch] Error 2
> Shouldn't dh_sphinxdoc -a be a NOP?

In general case, no: it's possible that the documentation is included in 
an arch:any package.

In this case: maybe. Here's an excerpt from #debian-mentors from a few 
days ago on this subject:

< helmut> jwilk: while working on doxygen, a question on --with 
sphinxdoc appeared. maybe you have an answer: as far as I can see the 
sequence causes dh_sphinxdoc to be executed on all builds, but it fails 
when it does not find any sphinx documentation. does this work when the 
docs reside in arch:all packages and building arch-only?
[...]
< jwilk> helmut: It doesn't.
[...]
< jwilk> The alternative is to do nothing if you don't find docs. (I'm 
not saying I like this idea.)
< jwilk> Oh, and at some point I was considering doing this: 
http://paste.debian.net/6076
< jwilk> But since nobody bothered to file a bug about the current 
behavior so far, I'm assuming that people are mostly content with it. :P

(The paste has expired since then, so I attached the patch I had in 
mind.)

> > If I were the maintainer, I would remove (with a Debian-specific 
> > patch) this junk from setup.py:
> > | from ez_setup import use_setuptools
> > | use_setuptools(version='0.6c11')
> I always thought this was only a convoluted way to check for the 
> version and never bothered to actually look at ez_setup. Now I 
> understand why you'd remove it, and will do the same from now on.

You could drop the "The information above should ..." part from the 
patch header. :)

> > lintian4python emits (among others):
> > x: python-fabulous: except-without-exception-type usr/share/pyshared/fabulous/logs.py:86
> > x: python-fabulous: except-without-exception-type usr/share/pyshared/fabulous/utils.py:95
> > x: python-fabulous: except-without-exception-type usr/share/pyshared/fabulous/xterm256.py:104
> Patched and reported upstream.

Now it emits:
e: python-fabulous: except-shadows-builtin usr/share/pyshared/fabulous/xterm256.py:104: AssertionError

--
Jakub Wilk

Index: debian/control
===================================================================
--- debian/control	(revision 18535)
+++ debian/control	(working copy)
@@ -20,6 +20,7 @@
   ${sphinxdoc:Depends}, libjs-sphinxdoc (= ${source:Version})
 Recommends: python (>= 2.6) | python-simplejson, python-imaging
 Suggests: jsmath
+Breaks: debhelper (<< 7.3.16~)
 Description: tool for producing documentation for Python projects
  Sphinx is a tool for producing documentation for Python projects, using
  reStructuredText as markup language.
Index: debian/changelog
===================================================================
--- debian/changelog	(revision 18552)
+++ debian/changelog	(working copy)
@@ -2,8 +2,11 @@
 
   * Export PYTHONWARNINGS=d in debian/rules to enable all warnings in Python
     code.
+  * dh_sphinxdoc: when run via the dh addon and acting on a strict subset of
+    all binary packages, don't fail if no documentation was found.
+    + This feature requires debhelper 7.3.16, add Breaks for older versions.
 
- -- Jakub Wilk <jwilk@debian.org>  Thu, 15 Sep 2011 18:48:37 +0200
+ -- Jakub Wilk <jwilk@debian.org>  Sat, 17 Sep 2011 14:07:34 +0200
 
 sphinx (1.0.7+dfsg-2) unstable; urgency=low
 
Index: debian/dh-sphinxdoc/dh_sphinxdoc
===================================================================
--- debian/dh-sphinxdoc/dh_sphinxdoc	(revision 18535)
+++ debian/dh-sphinxdoc/dh_sphinxdoc	(working copy)
@@ -306,8 +306,11 @@
     return 1;
 }
 
-init();
+init(options => { "dh" => \$dh{FLAG_DH} });
 
+my $all_packages = @{$dh{DOPACKAGES}} == getpackages();
+my $mercy_mode = $dh{FLAG_DH} && $all_packages;
+
 load_packaged_js();
 
 my @paths = @ARGV;
@@ -340,7 +343,7 @@
             }, $pkgpath);
         }
     }
-    if ($done == 0)
+    if ($done == 0 and not $mercy_mode)
     {
         my $message = 'Sphinx documentation not found';
         $message .= " at $path" if defined $path;
Index: debian/dh-sphinxdoc/sphinxdoc.pm
===================================================================
--- debian/dh-sphinxdoc/sphinxdoc.pm	(revision 18535)
+++ debian/dh-sphinxdoc/sphinxdoc.pm	(working copy)
@@ -4,5 +4,6 @@
 use Debian::Debhelper::Dh_Lib;
 
 insert_after('dh_installdocs', 'dh_sphinxdoc');
+add_command_options('dh_sphinxdoc', '--dh');
 
 1;