Control: tag -1 moreinfo On Wed, Nov 12, 2014 at 10:45:57AM -0500, Darryl L. Pierce wrote: > On Wed, Nov 12, 2014 at 01:47:11PM +0100, Cyril Brulebois wrote: > > You've got a link to the dsc file for the version(s) currently in > > testing in sid at [1] (on the right of version number in the "versions" > > box). You can use "dget $url_to_dsc" to fetch the source package, then > > run "debdiff $old_dsc $new_dsc" and attach that. > > > > 1. https://packages.qa.debian.org/q/qpid-proton.html > > Thank you! I've downloaded the set of files needed to do the debdiff. > Here is the output generated between 0.7-1 and 0.7-8:
I'm interested in the fix for the FTBFS bug, but most of the rest isn't really suitable at this stage. Could you prepare a targetted upload to fix just that bug instead please? As long as it's a minimal fix you don't need a pre-approval to upload it, but do ping this bug so we notice. I have some more general comments that you might find helpful in the future: > diff -Nru qpid-proton-0.7/debian/changelog qpid-proton-0.7/debian/changelog > --- qpid-proton-0.7/debian/changelog 2014-06-02 16:05:32.000000000 -0400 > +++ qpid-proton-0.7/debian/changelog 2014-11-12 10:20:17.000000000 -0500 > @@ -1,3 +1,70 @@ > +qpid-proton (0.7-8) unstable; urgency=low > + > + * Bumped the release to include the FTBFS bug id. (Closes: #768617) > + > + -- Darryl L. Pierce <mcpie...@gmail.com> Tue, 11 Nov 2014 08:07:12 -0500 > + > +qpid-proton (0.7-7) unstable; urgency=low > + > + * Fix FTBFS for on Jessie. > + * Removed dependency on libsslcommon2, replaced it with libssl-dev. > + > + -- Darryl L. Pierce <mcpie...@gmail.com> Mon, 10 Nov 2014 16:28:20 -0500 > + > +qpid-proton (0.7-6) unstable; urgency=low > + > + * Added package control statements to handle any name conflicts for -dev. > + > + -- Darryl L. Pierce <mcpie...@gmail.com> Thu, 04 Sep 2014 18:36:35 -0400 > + > +qpid-proton (0.7-5) unstable; urgency=low > + > + * Added CMake files to libqpid-proton-dev. > + * Added pkg-config files to libqpid-proton-dev. > + > + -- Darryl L. Pierce <mcpie...@gmail.com> Thu, 04 Sep 2014 11:07:38 -0400 > + > +qpid-proton (0.7-4) unstable; urgency=medium > + > + * Bumped the release number. > + > + -- Darryl L. Pierce <mcpie...@gmail.com> Wed, 30 Jul 2014 16:37:43 -0400 > + > +qpid-proton (0.7-3) unstable; urgency=medium > + > + * Renamed libqpid-proton2-dev package to libqpid-proton-dev. > + * Manually linking rt and uuid to libqpid-proton since CMake does not find > them. > + > + -- Darryl L. Pierce <mcpie...@gmail.com> Wed, 30 Jul 2014 10:24:55 -0400 > + > +qpid-proton (0.7-2) unstable; urgency=medium > + > + * Fixed the licensing to be GPLv3 for all Debian packaging files. > + > + -- Darryl Pierce <mcpie...@gmail.com> Mon, 21 Jul 2014 08:36:31 -0400 > + > +qpid-proton (0.7-1.2) unstable; urgency=low > + > + * Fixed various lintian error messages. > + > + -- Darryl Pierce <mcpie...@gmail.com> Mon, 14 Jul 2014 10:02:46 -0400 > + > +qpid-proton (0.7-1.1) unstable; urgency=low > + > + * Non-maintainer upload. > + * Removed examples from libqpid-proton-dev-docs. > + * Added an extended description to libqpid-proton. > + * Renamed libqpid-proton to libqpid-proton2 to reflect soversion. > + * Removed dependencies from -doc packages on binary packages. > + * Fixed multi-arch for qpid-proton package. > + * Fixed the descriptions for each package. > + * Added the qpid-proton-dump package. > + * Added a Debian watch file. > + * Fixed license for free getopt code from Mark Kim. > + * Fixed the sections for packages. > + > + -- Darryl Pierce <mcpie...@gmail.com> Fri, 09 May 2014 07:59:57 -0400 > + > qpid-proton (0.7-1) unstable; urgency=low > > * Initial release. (Closes: #732302) As none of these versions are yet in the archive, you can collapse the changelogs into just one entry. It's also not quite correct to close a bug in a changelog for a version that you didn't fix it in. IIRC mentors will accept and overwrite a version number where the real archive doesn't, so that this is possible. At least, it used to. > diff -Nru qpid-proton-0.7/debian/control qpid-proton-0.7/debian/control > --- qpid-proton-0.7/debian/control 2014-06-02 16:57:51.000000000 -0400 > +++ qpid-proton-0.7/debian/control 2014-11-12 10:20:30.000000000 -0500 > @@ -2,18 +2,18 @@ > Section: libs > Priority: optional > Maintainer: Debian Middleware Maintainers > <pkg-middleware-maintain...@lists.alioth.debian.org> > -Uploaders: Darryl L. Pierce <dpie...@redhat.com>, Daniel Pocock > <dan...@pocock.pro> > +Uploaders: Darryl L. Pierce <mcpie...@gmail.com>, Daniel Pocock > <dan...@pocock.pro> > Build-Depends: debhelper (>= 9.0.0~), > cmake, > swig, > pkg-config, > doxygen, > uuid-dev, > - libsslcommon2-dev, > + libssl-dev, > python-epydoc, > python (>=2.6.6-3~), > python-dev (>=2.6.6-3~) > -Standards-Version: 3.9.3 > +Standards-Version: 3.9.5 The most recent policy version is 3.9.6. I'm not sure whether that build-depends spacing was deliberate or if it's just my mail client playing havoc? > Homepage: http://qpid.apache.org/proton > Vcs-Browser: http://git.debian.org/?p=pkg-middleware/qpid-proton.git > Vcs-Git: git://git.debian.org/git/pkg-middleware/qpid-proton.git > @@ -34,6 +34,7 @@ > Architecture: any > Depends: ${shlibs:Depends}, ${misc:Depends} > Pre-Depends: ${misc:Pre-Depends} > +Multi-Arch: same For an unblock, multi-arch changes at this stage are a definite no-no. > diff -Nru qpid-proton-0.7/debian/source/lintian-overrides > qpid-proton-0.7/debian/source/lintian-overrides > --- qpid-proton-0.7/debian/source/lintian-overrides 1969-12-31 > 19:00:00.000000000 -0500 > +++ qpid-proton-0.7/debian/source/lintian-overrides 2014-11-11 > 13:17:17.000000000 -0500 > @@ -0,0 +1,2 @@ > +# Python lib package prepared using non-standard CMake build system, but > deps appear to be detected OK > +qpid-proton source: python-depends-but-no-python-helper python-qpid-proton You almost certainly still need a python helper, which will do nice things like clean up .pyc files in your binary packages, and instead compile them during installation on the user's machine. Try dh_python2 (the one helper to unite them all, and in the darkness bind them. Until someone invents another way to do it). -- Jonathan Wiltshire j...@debian.org Debian Developer http://people.debian.org/~jmw 4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
signature.asc
Description: Digital signature
