Package: camstream
Version: 0.27+dfsg-1
Severity: normal
User: [EMAIL PROTECTED]
Usertag: libqt3-compat-headers
Hi,
We are currently attempting to remove the antiquated libqt3-compat-headers from
the archive.
Here is a patch to build camstream without libqt3-compat-headers.
Thank you,
Barry deFreese
diff -urN camstream-0.27+dfsg.orig/audiodevs/include/AudioCollector.h camstream-0.27+dfsg/audiodevs/include/AudioCollector.h
--- camstream-0.27+dfsg.orig/audiodevs/include/AudioCollector.h 2004-10-28 18:23:57.000000000 -0400
+++ camstream-0.27+dfsg/audiodevs/include/AudioCollector.h 2008-02-05 22:36:53.000000000 -0500
@@ -27,7 +27,7 @@
#endif
#include <qmap.h>
-#include <qlist.h>
+#include <qptrlist.h>
#include "AudioDevice.h"
diff -urN camstream-0.27+dfsg.orig/audiodevs/include/RingBuffer.h camstream-0.27+dfsg/audiodevs/include/RingBuffer.h
--- camstream-0.27+dfsg.orig/audiodevs/include/RingBuffer.h 2004-10-28 18:23:57.000000000 -0400
+++ camstream-0.27+dfsg/audiodevs/include/RingBuffer.h 2008-02-05 22:36:53.000000000 -0500
@@ -26,7 +26,7 @@
#include "config.h"
#endif
-#include <qlist.h>
+#include <qptrlist.h>
#include <qobject.h>
#include <qthread.h>
diff -urN camstream-0.27+dfsg.orig/audiodevs/linux/AudioMixerControlLinux.h camstream-0.27+dfsg/audiodevs/linux/AudioMixerControlLinux.h
--- camstream-0.27+dfsg.orig/audiodevs/linux/AudioMixerControlLinux.h 2005-05-19 20:46:34.000000000 -0400
+++ camstream-0.27+dfsg/audiodevs/linux/AudioMixerControlLinux.h 2008-02-05 22:36:53.000000000 -0500
@@ -38,7 +38,7 @@
#include <qscrollview.h>
#include <qslider.h>
#include <qsocket.h>
-#include <qvector.h>
+#include <qptrvector.h>
#include <qwidget.h>
#if (QT_VERSION >= 0x030000)
diff -urN camstream-0.27+dfsg.orig/camstream/CamStreamMainWindow.h camstream-0.27+dfsg/camstream/CamStreamMainWindow.h
--- camstream-0.27+dfsg.orig/camstream/CamStreamMainWindow.h 2006-02-15 18:16:30.000000000 -0500
+++ camstream-0.27+dfsg/camstream/CamStreamMainWindow.h 2008-02-05 22:36:53.000000000 -0500
@@ -5,7 +5,7 @@
#include "config.h"
#endif
-#include <qlist.h>
+#include <qptrlist.h>
#include <qmainwindow.h>
#include <qworkspace.h>
diff -urN camstream-0.27+dfsg.orig/camstream/codec/CodecFrame.h camstream-0.27+dfsg/camstream/codec/CodecFrame.h
--- camstream-0.27+dfsg.orig/camstream/codec/CodecFrame.h 2001-04-05 23:29:11.000000000 -0400
+++ camstream-0.27+dfsg/camstream/codec/CodecFrame.h 2008-02-05 22:36:53.000000000 -0500
@@ -2,7 +2,7 @@
#define CODECFRAME_HPP
#include <qdict.h>
-#include <qlist.h>
+#include <qptrlist.h>
#include <qpainter.h>
#include "PanelSelector.h"
diff -urN camstream-0.27+dfsg.orig/camstream/ftpput.h camstream-0.27+dfsg/camstream/ftpput.h
--- camstream-0.27+dfsg.orig/camstream/ftpput.h 2003-02-04 20:50:22.000000000 -0500
+++ camstream-0.27+dfsg/camstream/ftpput.h 2008-02-05 22:36:53.000000000 -0500
@@ -6,7 +6,7 @@
#endif
#include <qapplication.h>
-#include <qlist.h>
+#include <qptrlist.h>
#include <qvariant.h>
#include "lib/FTPClient.h"
diff -urN camstream-0.27+dfsg.orig/camstream/gui/AudioSettingsDlg.h camstream-0.27+dfsg/camstream/gui/AudioSettingsDlg.h
--- camstream-0.27+dfsg.orig/camstream/gui/AudioSettingsDlg.h 2005-07-03 19:13:53.000000000 -0400
+++ camstream-0.27+dfsg/camstream/gui/AudioSettingsDlg.h 2008-02-05 22:36:53.000000000 -0500
@@ -5,7 +5,7 @@
#include "config.h"
#endif
-#include <qvector.h>
+#include <qptrvector.h>
#include "AudioDevice.h"
diff -urN camstream-0.27+dfsg.orig/ccvt/show.cc camstream-0.27+dfsg/ccvt/show.cc
--- camstream-0.27+dfsg.orig/ccvt/show.cc 2001-12-02 19:34:19.000000000 -0500
+++ camstream-0.27+dfsg/ccvt/show.cc 2008-02-05 22:37:25.000000000 -0500
@@ -2,7 +2,7 @@
#include <sys/times.h>
#include <qaccel.h>
-#include <qapp.h>
+#include <qapplication.h>
#include <qimage.h>
#include <qnamespace.h>
#include <qpainter.h>
diff -urN camstream-0.27+dfsg.orig/misc/AudioDisplayVolume.h camstream-0.27+dfsg/misc/AudioDisplayVolume.h
--- camstream-0.27+dfsg.orig/misc/AudioDisplayVolume.h 2005-07-03 19:13:54.000000000 -0400
+++ camstream-0.27+dfsg/misc/AudioDisplayVolume.h 2008-02-05 22:36:53.000000000 -0500
@@ -5,9 +5,9 @@
#include "config.h"
#endif
-#include <qarray.h>
+#include <qpointarray.h>
#include <qthread.h>
-#include <qvector.h>
+#include <qptrvector.h>
#include <qwidget.h>
#include "AudioDevice.h"
diff -urN camstream-0.27+dfsg.orig/tracer/TraceManager.h camstream-0.27+dfsg/tracer/TraceManager.h
--- camstream-0.27+dfsg.orig/tracer/TraceManager.h 2006-02-15 18:16:30.000000000 -0500
+++ camstream-0.27+dfsg/tracer/TraceManager.h 2008-02-05 22:36:53.000000000 -0500
@@ -3,7 +3,7 @@
#include <qdict.h>
#include <qdom.h>
-#include <qlist.h>
+#include <qptrlist.h>
#include <qlistview.h>
#include <qstring.h>
diff -urN camstream-0.27+dfsg.orig/videodevs/common/ChannelEditorDlg.h camstream-0.27+dfsg/videodevs/common/ChannelEditorDlg.h
--- camstream-0.27+dfsg.orig/videodevs/common/ChannelEditorDlg.h 2006-01-14 21:47:26.000000000 -0500
+++ camstream-0.27+dfsg/videodevs/common/ChannelEditorDlg.h 2008-02-05 22:36:53.000000000 -0500
@@ -2,10 +2,10 @@
#define CHANNELEDITORDLG_H
#include <qdom.h>
-#include <qlist.h>
+#include <qptrlist.h>
#include <qlistview.h>
#include <qstring.h>
-#include <qvector.h>
+#include <qptrvector.h>
#include "ChannelEditor.h"
#include "TVChannel.h"
diff -urN camstream-0.27+dfsg.orig/videodevs/include/TVChannel.h camstream-0.27+dfsg/videodevs/include/TVChannel.h
--- camstream-0.27+dfsg.orig/videodevs/include/TVChannel.h 2006-02-04 20:59:07.000000000 -0500
+++ camstream-0.27+dfsg/videodevs/include/TVChannel.h 2008-02-05 22:36:53.000000000 -0500
@@ -3,7 +3,7 @@
#include <qobject.h>
#include <qstring.h>
-#include <qvector.h>
+#include <qptrvector.h>
class TVChannel: public QObject
{
diff -urN camstream-0.27+dfsg.orig/videodevs/include/VideoCollector.h camstream-0.27+dfsg/videodevs/include/VideoCollector.h
--- camstream-0.27+dfsg.orig/videodevs/include/VideoCollector.h 2004-04-06 20:46:05.000000000 -0400
+++ camstream-0.27+dfsg/videodevs/include/VideoCollector.h 2008-02-05 22:36:53.000000000 -0500
@@ -6,7 +6,7 @@
#endif
#include <qmap.h>
-#include <qlist.h>
+#include <qptrlist.h>
#ifdef _OS_WIN32_
#include <windows.h>
diff -urN camstream-0.27+dfsg.orig/videodevs/include/VideoDevice.h camstream-0.27+dfsg/videodevs/include/VideoDevice.h
--- camstream-0.27+dfsg.orig/videodevs/include/VideoDevice.h 2006-02-16 19:01:29.000000000 -0500
+++ camstream-0.27+dfsg/videodevs/include/VideoDevice.h 2008-02-05 22:36:53.000000000 -0500
@@ -33,16 +33,16 @@
#include <qmutex.h>
#endif
-#include <qarray.h>
+#include <qpointarray.h>
#include <qcolor.h>
#include <qdom.h>
#include <qimage.h>
-#include <qlist.h>
+#include <qptrlist.h>
#include <qobject.h>
#include <qsocketnotifier.h>
#include <qtimer.h>
#include <qthread.h>
-#include <qvector.h>
+#include <qptrvector.h>
#include "VideoFrame.h"
diff -urN camstream-0.27+dfsg.orig/videodevs/linux/old-vdev.h camstream-0.27+dfsg/videodevs/linux/old-vdev.h
--- camstream-0.27+dfsg.orig/videodevs/linux/old-vdev.h 2002-12-03 17:29:08.000000000 -0500
+++ camstream-0.27+dfsg/videodevs/linux/old-vdev.h 2008-02-05 22:36:53.000000000 -0500
@@ -8,13 +8,13 @@
#include <sys/types.h>
#include <linux/videodev.h>
-#include <qarray.h>
+#include <qpointarray.h>
#include <qcolor.h>
#include <qimage.h>
#include <qobject.h>
#include <qsocketnotifier.h>
#include <qtimer.h>
-#include <qvector.h>
+#include <qptrvector.h>
#include "VideoDeviceInput.h"
#include "VideoAudioInput.h"
diff -urN camstream-0.27+dfsg.orig/videodevs/linux/VideoAudioInput.h camstream-0.27+dfsg/videodevs/linux/VideoAudioInput.h
--- camstream-0.27+dfsg.orig/videodevs/linux/VideoAudioInput.h 2002-07-12 20:40:56.000000000 -0400
+++ camstream-0.27+dfsg/videodevs/linux/VideoAudioInput.h 2008-02-05 22:36:53.000000000 -0500
@@ -6,7 +6,7 @@
#endif
#include <qobject.h>
-#include <qvector.h>
+#include <qptrvector.h>
class CVideoDeviceLinux;
diff -urN camstream-0.27+dfsg.orig/videodevs/linux/VideoDeviceInput.h camstream-0.27+dfsg/videodevs/linux/VideoDeviceInput.h
--- camstream-0.27+dfsg.orig/videodevs/linux/VideoDeviceInput.h 2005-09-28 17:03:40.000000000 -0400
+++ camstream-0.27+dfsg/videodevs/linux/VideoDeviceInput.h 2008-02-05 22:36:53.000000000 -0500
@@ -6,7 +6,7 @@
#endif
#include <qobject.h>
-#include <qvector.h>
+#include <qptrvector.h>
#include <linux/videodev.h>
diff -urN camstream-0.27+dfsg.orig/videodevs/linux/VideoSettingsDlg.h camstream-0.27+dfsg/videodevs/linux/VideoSettingsDlg.h
--- camstream-0.27+dfsg.orig/videodevs/linux/VideoSettingsDlg.h 2006-01-14 21:47:26.000000000 -0500
+++ camstream-0.27+dfsg/videodevs/linux/VideoSettingsDlg.h 2008-02-05 22:36:53.000000000 -0500
@@ -1,7 +1,7 @@
#ifndef VIDEOSETTINGSDLG_H
#define VIDEOSETTINGSDLG_H
-#include <qarray.h>
+#include <qpointarray.h>
#include <qdom.h>
#include <qsize.h>
#include <qtimer.h>
