Hi, On Mon, Mar 31, 2008 at 11:30:19PM +0200, Arthur Loiret wrote: > tags 466757 + patch > > My AM wants me to do some NMU for my T&S, here is one. > > > Thanks, > > Arthur.
> diff -u miro-1.1.2/debian/control miro-1.1.2/debian/control > --- miro-1.1.2/debian/control > +++ miro-1.1.2/debian/control > @@ -19,7 +19,8 @@ > libxine-dev (>= 1.1.6-2), > chrpath, > libxv-dev, > - libssl-dev > + libssl-dev, > + libffi-dev Look good, though the indentation seems broken (cosmetic issue only, though). > Standards-Version: 3.7.3 > Homepage: http://www.getmiro.com > > diff -u miro-1.1.2/debian/changelog miro-1.1.2/debian/changelog > --- miro-1.1.2/debian/changelog > +++ miro-1.1.2/debian/changelog > @@ -1,3 +1,11 @@ > +miro (1.1.2-3.1) unstable; urgency=low > + > + * Non-maintainer Upload. > + * Add libffi-dev to Build-Depends. This also closes a bug. > + * debian/patches/80_gcc-4.3_headers.patch: Add. Closes: #466757 > + > + -- Arthur Loiret <[EMAIL PROTECTED]> Mon, 31 Mar 2008 21:03:51 +0000 > + > miro (1.1.2-3) unstable; urgency=low > > * Provide "real" transitional packages for democracyplayer -> miro > upgrades. > only in patch2: > unchanged: > --- miro-1.1.2.orig/debian/patches/80_gcc-4.3_headers.patch > +++ miro-1.1.2/debian/patches/80_gcc-4.3_headers.patch > @@ -0,0 +1,30 @@ > +--- ./portable/libtorrent/include/libtorrent/peer_id.hpp 2008-03-31 > 20:47:32.000000000 +0000 > ++++ ./portable/libtorrent/include/libtorrent/peer_id.hpp 2008-03-31 > 20:47:44.000000000 +0000 > +@@ -38,6 +38,7 @@ > + #include <cctype> > + #include <algorithm> > + #include <string> > ++#include <cstring> > + > + #include "libtorrent/config.hpp" > + #include "libtorrent/assert.hpp" > +--- ./portable/libtorrent/src/file.cpp 2008-03-31 20:51:16.000000000 > +0000 > ++++ ./portable/libtorrent/src/file.cpp 2008-03-31 20:52:11.000000000 > +0000 > +@@ -57,6 +57,7 @@ > + #include <sys/stat.h> > + #include <sys/types.h> > + #include <errno.h> > ++#include <cstring> > + > + #include <boost/static_assert.hpp> > + // make sure the _FILE_OFFSET_BITS define worked > +--- ./portable/libtorrent/src/entry.cpp 2008-03-31 20:53:14.000000000 > +0000 > ++++ ./portable/libtorrent/src/entry.cpp 2008-03-31 21:05:16.000000000 > +0000 > +@@ -34,6 +34,7 @@ > + > + #include <algorithm> > + #include <iomanip> > ++#include <ostream> Typo or is this intentional? I assume you mean "<iostream>"? Are you sure these are all changes which are required for gcc 4.3 support? I haven't yet tested it myself but I'm under the impression that there should be quite a few more issues which need fixing (especially in ./portable/libtorrent/*). Also, I have informed upstream about the issue a while ago, the next upstream has this probably fixed anyway. Either way, please do _not_ NMU the package. I'll integrate your fixes in the next upload, but I don't want to do any uploads until one version of miro has entered testing. There is no version at _all_ in testing at the moment, which is bad, and an NMU would further delay this. There are various things which need to happen until it can enter testing, one of them is waiting for a few dependencies on other architectures, so miro can be built there (or pinging debian-release for manual fixup, I'll probably do that soon). Thanks, Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
