On Fri, 2014-12-05 at 22:56 +0100, Michael Hanke wrote: [...] > On Fri, Dec 5, 2014 at 10:42 PM, Adam D. Barratt > <[email protected]> wrote: > > Except for the changelog and the reported patch the debdiff > is identical > > to the one reported in (#771419). > > That doesn't appear to be the case: > > diff -Nru condor-8.2.3~dfsg.1/debian/rules > condor-8.2.3~dfsg.1/debian/rules > --- condor-8.2.3~dfsg.1/debian/rules 2014-11-29 > 08:52:02.000000000 +0000 > +++ condor-8.2.3~dfsg.1/debian/rules 2014-12-05 > 19:23:32.000000000 +0000 > @@ -106,13 +106,6 @@ > chrpath -d > debian/libclassad*/usr/lib/libclassad.so.*.* > # kill the default local config -- debconf will handle > that > rm debian/htcondor/etc/condor/condor_config.local > - # modify condor config file with default Debian config > - # no default chatter to upstream > - echo "CONDOR_DEVELOPERS = NONE" >> > debian/htcondor/etc/condor/condor_config
[...] > > I am not sure I understand. I think this change is accounted for in > > > > https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=spool_fix.patch;att=1;bug=772170 It's in the patch, yes. I don't understand how it's part of the fix for that bug, given that it doesn't involve the SPOOL configuration at all. > Functionally equivalent lines are now included in a patch for > > > > src/condor_examples/condor_config.generic.debian.patch Yes. As part of a patch claiming to fix the wrong placement of the spool folder. > The mixture of in-place modification at runtime and patches has proven > to be unreliable. Hence to move towards putting as much > as possible into patches. Right, but the section I mentioned, which is removed in the patch, was only added in the -4 package I previously unblocked. So removing it again with no explanation seems slightly odd. (Looking at it, yes the items it contains are indeed in the other patch, but that just makes things even more confusing. Why was it added in the first place, and why isn't the removal documented?) In any case, this may be academic, as condor appears to have picked up a dependency on the new version of globus-io, which is still blocked. Regards, Adam -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
