On Wed, May 11, 2016 at 10:50:06PM -0400, Roberto C. Sánchez wrote: || http://anonscm.debian.org/cgit/users/roberto/xl2tpd.git/ I've cloned it, thanks. || As far as the upstream repository goes, upstream previously tried to || always merge my Debian packaging into their repository. Of course, they || did it on the master branch (probably owing to the fact that they were || probably still on Subversion when they began this practice). In any || event, it caused problems every time I tried to make a new upstream || release. If you look in the debian/ directory if repo I just published, || you will see a repack.sh script. That script removes upstream's debian/ || directory and a non-free RFC text that they ship in their tarball. It looks like things have got easier for me: * Upstream has incorporated the changes you had in quilt patches, removing the need for quilt. * Upstream has removed the RFC text, removing the need for repacking. * Upstream has modified its debian directory to *almost* work, except that the changelog file is bogus. That last point doesn't matter really, as upstream's debian directory is discarded by dpkg-source -x anyway. Still, their changes to their debian directory can be taken over. Am I correct in concluding that you were importing upstream releases whenever they came out, and not using git to merge their sources? I'm considering stopping repacking upstream sources. Is there a concensus in Debian on whether it is better not to repack and be as close to upstream as possible, or to repack to get the debian directory out of there and save some space? Or is it just left up to the maintainer? Do you have a close contact with upstream, or should I go through the regular channels? This in connection with forwarding the RC bug upstream. Vincent. -- Vincent Zweije <vincent@zweije.nl> | "If you're flamed in a group you <http://www.xs4all.nl/~zweije/> | don't read, does anybody get burnt?" [Xhost should be taken out and shot] | -- Paul Tomblin on a.s.r.
Attachment:
signature.asc
Description: PGP signature