I've NMUed with the following diff:
diff -urN avifile-0.7.44.20051021~/debian/changelog
avifile-0.7.44.20051021/debian/changelog
--- avifile-0.7.44.20051021~/debian/changelog 2005-10-21 14:19:07.000000000
+0000
+++ avifile-0.7.44.20051021/debian/changelog 2006-06-03 19:17:44.000000000
+0000
@@ -1,3 +1,12 @@
+avifile (1:0.7.44.20051021-2) unstable; urgency=low
+
+ * NMU as part of the GCC 4.1 transition.
+ * Update the paths of the man page so the package builds again,
+ thanks Florent Bayle (Closes: #369094).
+ * Remove extra qualifications from C++ files (Closes: #356968).
+
+ -- Martin Michlmayr <[EMAIL PROTECTED]> Sat, 03 Jun 2006 21:14:01 +0200
+
avifile (1:0.7.44.20051021-1) unstable; urgency=medium
* thread were already fixed long time ago - just forget to close
this bug (Closes: 223101)
diff -urN avifile-0.7.44.20051021~/debian/rules
avifile-0.7.44.20051021/debian/rules
--- avifile-0.7.44.20051021~/debian/rules 2005-10-21 12:22:50.000000000
+0000
+++ avifile-0.7.44.20051021/debian/rules 2006-06-03 19:15:49.000000000
+0000
@@ -134,10 +134,10 @@
@rm $(installprefix)/usr/lib/libqavm*.so
@rm $(installprefix)/usr/lib/libqavm*.la
@mv $(installprefix)/usr/lib/libqavm* debian/$(player)/usr/lib
- @mv $(installprefix)/usr/man/man1/aviplay*
debian/$(player)/usr/share/man/man1
+ @mv $(installprefix)/usr/share/man/man1/aviplay*
debian/$(player)/usr/share/man/man1
@mv $(installprefix)/usr/share/$(aviversion) debian/$(player)/usr/share/
- @mv $(installprefix)/usr/man/man1/avifile-config*
debian/$(devel)/usr/share/man/man1
+ @mv $(installprefix)/usr/share/man/man1/avifile-config*
debian/$(devel)/usr/share/man/man1
@mv $(installprefix)/usr/lib/*.so debian/$(devel)/usr/lib
@mv $(installprefix)/usr/lib/*.la debian/$(devel)/usr/lib
for i in $(allplugins) ; do \
@@ -149,10 +149,10 @@
if test -e $(installprefix)/usr/lib/$(aviversion)/xvid4.so ; then mv
$(installprefix)/usr/lib/$(aviversion)/xvid*
debian/$(xvidplugin)/usr/lib/$(aviversion)/ ; fi
if test -e $(installprefix)/usr/lib/$(aviversion)/divx4.so ; then mv
$(installprefix)/usr/lib/$(aviversion)/divx4*
debian/$(divxplugin)/usr/lib/$(aviversion)/ ; fi
- @mv $(installprefix)/usr/man/man1/* debian/$(utils)/usr/share/man/man1
+ @mv $(installprefix)/usr/share/man/man1/*
debian/$(utils)/usr/share/man/man1
# clean some files from library package
- @rm -rf debian/$(libraries)/usr/bin debian/$(libraries)/usr/man
+ @rm -rf debian/$(libraries)/usr/bin debian/$(libraries)/usr/share/man
@rm -f debian/$(libraries)/usr/lib/*.so
@rm -rf core `find debian/$(libraries) -name "*.a"`
diff -urN avifile-0.7.44.20051021~/lib/aviplay/aviplay_impl.h
avifile-0.7.44.20051021/lib/aviplay/aviplay_impl.h
--- avifile-0.7.44.20051021~/lib/aviplay/aviplay_impl.h 2005-03-23
18:18:42.000000000 +0000
+++ avifile-0.7.44.20051021/lib/aviplay/aviplay_impl.h 2006-06-03
19:15:27.000000000 +0000
@@ -136,7 +136,7 @@
void createAudioRenderer();
int restartVideoStreaming(const char* codec = 0);
- mutable int AviPlayer::propertyRead[LAST_PROPERTY]; // have we read at
least once from Registry::
+ mutable int propertyRead[LAST_PROPERTY]; // have we read at least once
from Registry::
avm::vector<IVideoRenderer*> m_VideoRenderers; // we could draw image to
more places
IAudioRenderer* m_pAudioRenderer; // not sure about the sound - this will
be
diff -urN avifile-0.7.44.20051021~/plugins/libaudiodec/audiodecoder.cpp
avifile-0.7.44.20051021/plugins/libaudiodec/audiodecoder.cpp
--- avifile-0.7.44.20051021~/plugins/libaudiodec/audiodecoder.cpp
2003-05-18 16:33:23.000000000 +0000
+++ avifile-0.7.44.20051021/plugins/libaudiodec/audiodecoder.cpp
2006-06-03 19:15:27.000000000 +0000
@@ -114,7 +114,7 @@
class MSGSM_Decoder : public IAudioDecoder
{
public:
- MSGSM_Decoder::MSGSM_Decoder(const CodecInfo& info, const WAVEFORMATEX* wf)
+ MSGSM_Decoder(const CodecInfo& info, const WAVEFORMATEX* wf)
:IAudioDecoder(info, wf)
{
GSM_Init();
diff -urN
avifile-0.7.44.20051021~/plugins/libmp3lamebin_audioenc/lameencoder.cpp
avifile-0.7.44.20051021/plugins/libmp3lamebin_audioenc/lameencoder.cpp
--- avifile-0.7.44.20051021~/plugins/libmp3lamebin_audioenc/lameencoder.cpp
2003-05-20 14:27:46.000000000 +0000
+++ avifile-0.7.44.20051021/plugins/libmp3lamebin_audioenc/lameencoder.cpp
2006-06-03 19:15:27.000000000 +0000
@@ -71,14 +71,14 @@
int CDECL (*p_lame_set_quality)(lame_global_flags *, int);
public:
- LameEncoder::LameEncoder(const CodecInfo& info, const WAVEFORMATEX* format)
+ LameEncoder(const CodecInfo& info, const WAVEFORMATEX* format)
:IAudioEncoder(info), handle(0)
{
m_Error[0] = 0;
in_fmt = *format;
}
- int LameEncoder::init()
+ int init()
{
handle = dlopen(mp3lamename, RTLD_LAZY);
diff -urN avifile-0.7.44.20051021~/samples/misc/avicat.cpp
avifile-0.7.44.20051021/samples/misc/avicat.cpp
--- avifile-0.7.44.20051021~/samples/misc/avicat.cpp 2003-05-26
08:57:33.000000000 +0000
+++ avifile-0.7.44.20051021/samples/misc/avicat.cpp 2006-06-03
19:15:27.000000000 +0000
@@ -140,8 +140,8 @@
avm::IVideoEncoder *vidEnc;
void copyAudioFrames(int, int, bool);
void createVideoEncoder(fourcc_t);
- void AviCutter::writeVideoFrame(avm::CImage *image);
- void AviCutter::copyVideoFrame();
+ void writeVideoFrame(avm::CImage *image);
+ void copyVideoFrame();
public:
AviCutter(avm::IWriteFile* outF,
--
Martin Michlmayr
http://www.cyrius.com/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
