merge of '2f874ef26d3d188bdba338d64271407ff2d178e5'

     and '5e009cc3f1463fd909ab544e5d857738234928ba'

2 files changed, 129 insertions, 101 deletions

diff --git a/packages/corsair/corsair_0.2.5.bb b/packages/corsair/corsair_0.2.6.bb
index d765c51e37..d45570f337 100644
--- a/packages/corsair/corsair_0.2.5.bb
+++ b/packages/corsair/corsair_0.2.6.bb
@@ -4,7 +4,6 @@ LICENSE = "GPL"
 AUTHOR = "Joe Rumsey <joe@rumsey.org>"
 HOMEPAGE = "http://corsair.sf.net/"
 DEPENDS = "opie-pics"
-RDEPENDS = "opie-pics"
 
 inherit palmtop
 
diff --git a/packages/corsair/files/corsair-opie.patch b/packages/corsair/files/corsair-opie.patch
index ea651bef44..d1f9401c19 100644
--- a/packages/corsair/files/corsair-opie.patch
+++ b/packages/corsair/files/corsair-opie.patch
@@ -1,11 +1,6 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
 --- corsair/corsair.cpp~corsair-opie
 +++ corsair/corsair.cpp
-@@ -172,7 +172,7 @@
+@@ -177,7 +177,7 @@
  
  QString CorsairWindow::homeDir()
  {
@@ -14,7 +9,7 @@
  	if(home == "/home" && option("homeReallyIsHome", "false") != "true") {
  		home = "/media";
  	}
-@@ -265,7 +265,8 @@
+@@ -274,7 +274,8 @@
  	QString corsairDir = topDir();
  	
  	// Don't let device power off while downloading.  Will be reenabled when download completes.
@@ -24,7 +19,7 @@
  
  	Download *dl = NULL;
  
-@@ -401,7 +402,8 @@
+@@ -410,7 +410,8 @@
  
  	if(m_runningDownloads.isEmpty()) {
  		emit statusUpdate(res == Download::Success ? "Ready" : "Error");
@@ -34,32 +29,37 @@
  	}
  	
  	delete dl;
---- corsair/Makefile~corsair-opie
-+++ corsair/Makefile
-@@ -14,10 +14,10 @@
+--- corsair/Makefile	2006-07-12 09:13:51.000000000 +0200
++++ corsair/Makefile.opie	2006-12-31 09:43:08.000000000 +0100
+@@ -13,12 +13,12 @@
+ #  You should have received a copy of the GNU General Public License
  #  along with this program; if not, write to the Free Software
  #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
+-
 -INCLUDES=-I/opt/Qtopia/include/
 -CXXFLAGS=-O $(INCLUDES) -DQWS -fno-rtti -fno-exceptions
 -LDFLAGS=-L $(QTDIR)/lib/
 -LIBS=-lqte -lqpe -lqtopia -ljpeg -luuid
+-
++ 
 +INCLUDES=-I$(QTDIR)/include
 +CXXFLAGS += $(INCLUDES) -DQWS -fno-rtti -fno-exceptions
 +LDFLAGS +=-L $(QTDIR)/lib/
 +LIBS=-lqte -lqpe
- 
++ 
  SOURCES = main.cpp corsair.cpp feeds.cpp download.cpp info.cpp
  MOCS = corsair_moc.cpp download_moc.cpp feeds_moc.cpp info_moc.cpp
-@@ -28,12 +28,15 @@
+ 
+@@ -28,12 +28,16 @@ ICONS=icons/newfeed.png \
  	icons/play.png
  
  %_moc.cpp: %.h
 -	$(QTDIR)/bin/moc -o $@ $^
 +	$(OE_QMAKE_MOC) -o $@ $^
 +
-+#%.o: %.cpp
++#	%.o: %.cpp
 +#	$(CXX) $(CXXFLAGS) -I$(QTDIR)/include -c -o $@ $^
++
  
  OBJS = $(SOURCES:.cpp=.o) $(MOCS:.cpp=.o)
  
@@ -69,10 +69,12 @@
  
  install: corsair
  	cp corsair.desktop $(QPEDIR)/apps/Applications
-@@ -54,263 +57,3 @@
- web:
- 	rsync -e ssh CHANGELOG FAQ README website/* tinyogre@shell.sourceforge.net:/home/groups/c/co/corsair/htdocs/
+@@ -52,291 +56,4 @@ depend:
+ 	makedepend $(INCLUDES) $(SOURCES)
  
+ web:
+-	rsync -e ssh CHANGELOG FAQ README website/* tinyogre@shell.sourceforge.net:/home/groups/c/co/corsair/htdocs/
+-
 -# DO NOT DELETE
 -
 -main.o: /opt/Qtopia/include/qmainwindow.h /opt/Qtopia/include/qwidget.h
@@ -83,7 +85,9 @@
 -main.o: /opt/Qtopia/include/qgarray.h /opt/Qtopia/include/qshared.h
 -main.o: /usr/include/string.h /usr/include/features.h
 -main.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
+-main.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stddef.h
 -main.o: /opt/Qtopia/include/qnamespace.h /usr/include/limits.h
+-main.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/limits.h
 -main.o: /opt/Qtopia/include/qobject.h /opt/Qtopia/include/qevent.h
 -main.o: /opt/Qtopia/include/qregion.h /opt/Qtopia/include/qrect.h
 -main.o: /opt/Qtopia/include/qsize.h /opt/Qtopia/include/qpoint.h
@@ -106,7 +110,8 @@
 -main.o: /opt/Qtopia/include/qtopia/qcom.h /opt/Qtopia/include/qtopia/quuid.h
 -main.o: /usr/include/memory.h /opt/Qtopia/include/qmetaobject.h
 -main.o: /opt/Qtopia/include/qconnection.h /opt/Qtopia/include/qstrlist.h
--main.o: /opt/Qtopia/include/qlist.h /opt/Qtopia/include/qglist.h corsair.h
+-main.o: /opt/Qtopia/include/qlist.h /opt/Qtopia/include/qglist.h
+-main.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stdarg.h corsair.h
 -main.o: feeds.h /opt/Qtopia/include/qxml.h /opt/Qtopia/include/qmodules.h
 -main.o: /opt/Qtopia/include/qtextstream.h /usr/include/stdio.h
 -main.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
@@ -124,7 +129,7 @@
 -main.o: /opt/Qtopia/include/qsocketdevice.h
 -main.o: /opt/Qtopia/include/qhostaddress.h
 -main.o: /opt/Qtopia/include/qsocketnotifier.h /opt/Qtopia/include/qurl.h
--main.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qfileinfo.h
+-main.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qfileinfo.h version.h
 -corsair.o: /opt/Qtopia/include/qmainwindow.h /opt/Qtopia/include/qwidget.h
 -corsair.o: /opt/Qtopia/include/qwindowdefs.h
 -corsair.o: /opt/Qtopia/include/qobjectdefs.h /opt/Qtopia/include/qglobal.h
@@ -133,19 +138,21 @@
 -corsair.o: /opt/Qtopia/include/qarray.h /opt/Qtopia/include/qgarray.h
 -corsair.o: /opt/Qtopia/include/qshared.h /usr/include/string.h
 -corsair.o: /usr/include/features.h /usr/include/sys/cdefs.h
--corsair.o: /usr/include/gnu/stubs.h /opt/Qtopia/include/qnamespace.h
--corsair.o: /usr/include/limits.h /opt/Qtopia/include/qobject.h
--corsair.o: /opt/Qtopia/include/qevent.h /opt/Qtopia/include/qregion.h
--corsair.o: /opt/Qtopia/include/qrect.h /opt/Qtopia/include/qsize.h
--corsair.o: /opt/Qtopia/include/qpoint.h /opt/Qtopia/include/qmime.h
--corsair.o: /opt/Qtopia/include/qstringlist.h /opt/Qtopia/include/qvaluelist.h
--corsair.o: /opt/Qtopia/include/qdatastream.h /opt/Qtopia/include/qiodevice.h
--corsair.o: /opt/Qtopia/include/qregexp.h /opt/Qtopia/include/qpaintdevice.h
--corsair.o: /opt/Qtopia/include/qpalette.h /opt/Qtopia/include/qcolor.h
--corsair.o: /opt/Qtopia/include/qbrush.h /opt/Qtopia/include/qcursor.h
--corsair.o: /opt/Qtopia/include/qfont.h /opt/Qtopia/include/qfontmetrics.h
--corsair.o: /opt/Qtopia/include/qfontinfo.h /opt/Qtopia/include/qstyle.h
--corsair.o: /opt/Qtopia/include/qsizepolicy.h
+-corsair.o: /usr/include/gnu/stubs.h
+-corsair.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stddef.h
+-corsair.o: /opt/Qtopia/include/qnamespace.h /usr/include/limits.h
+-corsair.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/limits.h
+-corsair.o: /opt/Qtopia/include/qobject.h /opt/Qtopia/include/qevent.h
+-corsair.o: /opt/Qtopia/include/qregion.h /opt/Qtopia/include/qrect.h
+-corsair.o: /opt/Qtopia/include/qsize.h /opt/Qtopia/include/qpoint.h
+-corsair.o: /opt/Qtopia/include/qmime.h /opt/Qtopia/include/qstringlist.h
+-corsair.o: /opt/Qtopia/include/qvaluelist.h /opt/Qtopia/include/qdatastream.h
+-corsair.o: /opt/Qtopia/include/qiodevice.h /opt/Qtopia/include/qregexp.h
+-corsair.o: /opt/Qtopia/include/qpaintdevice.h /opt/Qtopia/include/qpalette.h
+-corsair.o: /opt/Qtopia/include/qcolor.h /opt/Qtopia/include/qbrush.h
+-corsair.o: /opt/Qtopia/include/qcursor.h /opt/Qtopia/include/qfont.h
+-corsair.o: /opt/Qtopia/include/qfontmetrics.h /opt/Qtopia/include/qfontinfo.h
+-corsair.o: /opt/Qtopia/include/qstyle.h /opt/Qtopia/include/qsizepolicy.h
 -corsair.o: /opt/Qtopia/include/qpe/qpeapplication.h
 -corsair.o: /opt/Qtopia/include/qtopia/qpeglobal.h
 -corsair.o: /opt/Qtopia/include/qapplication.h
@@ -167,6 +174,7 @@
 -corsair.o: /usr/include/bits/typesizes.h /usr/include/libio.h
 -corsair.o: /usr/include/_G_config.h /usr/include/wchar.h
 -corsair.o: /usr/include/bits/wchar.h /usr/include/gconv.h
+-corsair.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stdarg.h
 -corsair.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
 -corsair.o: /opt/Qtopia/include/qfile.h /opt/Qtopia/include/qvaluestack.h
 -corsair.o: /opt/Qtopia/include/qlistview.h /opt/Qtopia/include/qscrollview.h
@@ -179,16 +187,17 @@
 -corsair.o: /opt/Qtopia/include/qhostaddress.h
 -corsair.o: /opt/Qtopia/include/qsocketnotifier.h /opt/Qtopia/include/qurl.h
 -corsair.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qfileinfo.h
--corsair.o: /opt/Qtopia/include/qtextbrowser.h /opt/Qtopia/include/qpixmap.h
--corsair.o: /opt/Qtopia/include/qtextview.h /opt/Qtopia/include/qtoolbar.h
--corsair.o: /opt/Qtopia/include/qtoolbutton.h /opt/Qtopia/include/qbutton.h
--corsair.o: /opt/Qtopia/include/qiconset.h /opt/Qtopia/include/qstatusbar.h
--corsair.o: /opt/Qtopia/include/qlineedit.h /opt/Qtopia/include/qhbox.h
--corsair.o: /opt/Qtopia/include/qlayout.h
+-corsair.o: version.h /opt/Qtopia/include/qtextbrowser.h
+-corsair.o: /opt/Qtopia/include/qpixmap.h /opt/Qtopia/include/qtextview.h
+-corsair.o: /opt/Qtopia/include/qtoolbar.h /opt/Qtopia/include/qtoolbutton.h
+-corsair.o: /opt/Qtopia/include/qbutton.h /opt/Qtopia/include/qiconset.h
+-corsair.o: /opt/Qtopia/include/qstatusbar.h /opt/Qtopia/include/qlineedit.h
+-corsair.o: /opt/Qtopia/include/qhbox.h /opt/Qtopia/include/qlayout.h
 -corsair.o: /opt/Qtopia/include/qabstractlayout.h /opt/Qtopia/include/qlabel.h
 -corsair.o: /opt/Qtopia/include/qclipboard.h /opt/Qtopia/include/qpushbutton.h
 -corsair.o: /opt/Qtopia/include/qmenubar.h /opt/Qtopia/include/qpopupmenu.h
 -corsair.o: /opt/Qtopia/include/qmenudata.h /opt/Qtopia/include/qprogressbar.h
+-corsair.o: /opt/Qtopia/include/qmessagebox.h /opt/Qtopia/include/qaccel.h
 -corsair.o: /opt/Qtopia/include/qtopia/resource.h /opt/Qtopia/include/qimage.h
 -corsair.o: /opt/Qtopia/include/qbitmap.h /opt/Qtopia/include/qtopia/config.h
 -corsair.o: /opt/Qtopia/include/qtopia/qtopiawinexport.h
@@ -202,14 +211,17 @@
 -feeds.o: /opt/Qtopia/include/qglobal.h /opt/Qtopia/include/qconfig.h
 -feeds.o: /opt/Qtopia/include/qfeatures.h /usr/include/string.h
 -feeds.o: /usr/include/features.h /usr/include/sys/cdefs.h
--feeds.o: /usr/include/gnu/stubs.h /opt/Qtopia/include/qlist.h
--feeds.o: /opt/Qtopia/include/qglist.h /opt/Qtopia/include/qcollection.h
--feeds.o: /opt/Qtopia/include/qxml.h /opt/Qtopia/include/qmodules.h
--feeds.o: /opt/Qtopia/include/qtextstream.h /opt/Qtopia/include/qiodevice.h
--feeds.o: /usr/include/stdio.h /usr/include/bits/types.h
--feeds.o: /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h
--feeds.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
+-feeds.o: /usr/include/gnu/stubs.h
+-feeds.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stddef.h
+-feeds.o: /opt/Qtopia/include/qlist.h /opt/Qtopia/include/qglist.h
+-feeds.o: /opt/Qtopia/include/qcollection.h /opt/Qtopia/include/qxml.h
+-feeds.o: /opt/Qtopia/include/qmodules.h /opt/Qtopia/include/qtextstream.h
+-feeds.o: /opt/Qtopia/include/qiodevice.h /usr/include/stdio.h
+-feeds.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
+-feeds.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+-feeds.o: /usr/include/_G_config.h /usr/include/wchar.h
 -feeds.o: /usr/include/bits/wchar.h /usr/include/gconv.h
+-feeds.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stdarg.h
 -feeds.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
 -feeds.o: /opt/Qtopia/include/qfile.h /opt/Qtopia/include/qstringlist.h
 -feeds.o: /opt/Qtopia/include/qvaluelist.h /opt/Qtopia/include/qdatastream.h
@@ -218,46 +230,52 @@
 -feeds.o: /opt/Qtopia/include/qscrollview.h /opt/Qtopia/include/qframe.h
 -feeds.o: /opt/Qtopia/include/qwidget.h /opt/Qtopia/include/qwindowdefs.h
 -feeds.o: /opt/Qtopia/include/qobjectdefs.h /opt/Qtopia/include/qnamespace.h
--feeds.o: /usr/include/limits.h /opt/Qtopia/include/qobject.h
--feeds.o: /opt/Qtopia/include/qevent.h /opt/Qtopia/include/qregion.h
--feeds.o: /opt/Qtopia/include/qrect.h /opt/Qtopia/include/qsize.h
--feeds.o: /opt/Qtopia/include/qpoint.h /opt/Qtopia/include/qmime.h
--feeds.o: /opt/Qtopia/include/qpaintdevice.h /opt/Qtopia/include/qpalette.h
--feeds.o: /opt/Qtopia/include/qcolor.h /opt/Qtopia/include/qbrush.h
--feeds.o: /opt/Qtopia/include/qcursor.h /opt/Qtopia/include/qfont.h
--feeds.o: /opt/Qtopia/include/qfontmetrics.h /opt/Qtopia/include/qfontinfo.h
--feeds.o: /opt/Qtopia/include/qstyle.h /opt/Qtopia/include/qsizepolicy.h
--feeds.o: /opt/Qtopia/include/qscrollbar.h /opt/Qtopia/include/qrangecontrol.h
--feeds.o: /opt/Qtopia/include/qdrawutil.h /opt/Qtopia/include/qpainter.h
--feeds.o: /opt/Qtopia/include/qpen.h /opt/Qtopia/include/qpointarray.h
--feeds.o: /opt/Qtopia/include/qwmatrix.h /opt/Qtopia/include/qdatetime.h log.h
--feeds.o: download.h /opt/Qtopia/include/qsocket.h
--feeds.o: /opt/Qtopia/include/qsocketdevice.h
+-feeds.o: /usr/include/limits.h
+-feeds.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/limits.h
+-feeds.o: /opt/Qtopia/include/qobject.h /opt/Qtopia/include/qevent.h
+-feeds.o: /opt/Qtopia/include/qregion.h /opt/Qtopia/include/qrect.h
+-feeds.o: /opt/Qtopia/include/qsize.h /opt/Qtopia/include/qpoint.h
+-feeds.o: /opt/Qtopia/include/qmime.h /opt/Qtopia/include/qpaintdevice.h
+-feeds.o: /opt/Qtopia/include/qpalette.h /opt/Qtopia/include/qcolor.h
+-feeds.o: /opt/Qtopia/include/qbrush.h /opt/Qtopia/include/qcursor.h
+-feeds.o: /opt/Qtopia/include/qfont.h /opt/Qtopia/include/qfontmetrics.h
+-feeds.o: /opt/Qtopia/include/qfontinfo.h /opt/Qtopia/include/qstyle.h
+-feeds.o: /opt/Qtopia/include/qsizepolicy.h /opt/Qtopia/include/qscrollbar.h
+-feeds.o: /opt/Qtopia/include/qrangecontrol.h /opt/Qtopia/include/qdrawutil.h
+-feeds.o: /opt/Qtopia/include/qpainter.h /opt/Qtopia/include/qpen.h
+-feeds.o: /opt/Qtopia/include/qpointarray.h /opt/Qtopia/include/qwmatrix.h
+-feeds.o: /opt/Qtopia/include/qdatetime.h log.h download.h
+-feeds.o: /opt/Qtopia/include/qsocket.h /opt/Qtopia/include/qsocketdevice.h
 -feeds.o: /opt/Qtopia/include/qhostaddress.h
 -feeds.o: /opt/Qtopia/include/qsocketnotifier.h /opt/Qtopia/include/qurl.h
 -feeds.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qstrlist.h
--feeds.o: /opt/Qtopia/include/qfileinfo.h /opt/Qtopia/include/qmainwindow.h
+-feeds.o: /opt/Qtopia/include/qfileinfo.h version.h
+-feeds.o: /opt/Qtopia/include/qmainwindow.h
 -feeds.o: /opt/Qtopia/include/qtopia/resource.h
 -feeds.o: /opt/Qtopia/include/qtopia/qpeglobal.h /opt/Qtopia/include/qimage.h
 -feeds.o: /opt/Qtopia/include/qpixmap.h /opt/Qtopia/include/qbitmap.h
 -feeds.o: /opt/Qtopia/include/qiconset.h opmlparser.h feedparser.h
+-feeds.o: /usr/include/ctype.h /usr/include/endian.h
+-feeds.o: /usr/include/bits/endian.h
 -download.o: corsair.h feeds.h /opt/Qtopia/include/qstring.h
 -download.o: /opt/Qtopia/include/qcstring.h /opt/Qtopia/include/qarray.h
 -download.o: /opt/Qtopia/include/qgarray.h /opt/Qtopia/include/qshared.h
 -download.o: /opt/Qtopia/include/qglobal.h /opt/Qtopia/include/qconfig.h
 -download.o: /opt/Qtopia/include/qfeatures.h /usr/include/string.h
 -download.o: /usr/include/features.h /usr/include/sys/cdefs.h
--download.o: /usr/include/gnu/stubs.h /opt/Qtopia/include/qlist.h
--download.o: /opt/Qtopia/include/qglist.h /opt/Qtopia/include/qcollection.h
--download.o: /opt/Qtopia/include/qxml.h /opt/Qtopia/include/qmodules.h
--download.o: /opt/Qtopia/include/qtextstream.h /opt/Qtopia/include/qiodevice.h
--download.o: /usr/include/stdio.h /usr/include/bits/types.h
--download.o: /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h
--download.o: /usr/include/libio.h /usr/include/_G_config.h
--download.o: /usr/include/wchar.h /usr/include/bits/wchar.h
--download.o: /usr/include/gconv.h /usr/include/bits/stdio_lim.h
--download.o: /usr/include/bits/sys_errlist.h /opt/Qtopia/include/qfile.h
--download.o: /opt/Qtopia/include/qstringlist.h
+-download.o: /usr/include/gnu/stubs.h
+-download.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stddef.h
+-download.o: /opt/Qtopia/include/qlist.h /opt/Qtopia/include/qglist.h
+-download.o: /opt/Qtopia/include/qcollection.h /opt/Qtopia/include/qxml.h
+-download.o: /opt/Qtopia/include/qmodules.h /opt/Qtopia/include/qtextstream.h
+-download.o: /opt/Qtopia/include/qiodevice.h /usr/include/stdio.h
+-download.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
+-download.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+-download.o: /usr/include/_G_config.h /usr/include/wchar.h
+-download.o: /usr/include/bits/wchar.h /usr/include/gconv.h
+-download.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stdarg.h
+-download.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+-download.o: /opt/Qtopia/include/qfile.h /opt/Qtopia/include/qstringlist.h
 -download.o: /opt/Qtopia/include/qvaluelist.h
 -download.o: /opt/Qtopia/include/qdatastream.h /opt/Qtopia/include/qregexp.h
 -download.o: /opt/Qtopia/include/qvaluestack.h /opt/Qtopia/include/qmap.h
@@ -266,6 +284,7 @@
 -download.o: /opt/Qtopia/include/qwindowdefs.h
 -download.o: /opt/Qtopia/include/qobjectdefs.h
 -download.o: /opt/Qtopia/include/qnamespace.h /usr/include/limits.h
+-download.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/limits.h
 -download.o: /opt/Qtopia/include/qobject.h /opt/Qtopia/include/qevent.h
 -download.o: /opt/Qtopia/include/qregion.h /opt/Qtopia/include/qrect.h
 -download.o: /opt/Qtopia/include/qsize.h /opt/Qtopia/include/qpoint.h
@@ -285,21 +304,25 @@
 -download.o: /opt/Qtopia/include/qhostaddress.h
 -download.o: /opt/Qtopia/include/qsocketnotifier.h /opt/Qtopia/include/qurl.h
 -download.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qstrlist.h
--download.o: /opt/Qtopia/include/qfileinfo.h /opt/Qtopia/include/qmainwindow.h
+-download.o: /opt/Qtopia/include/qfileinfo.h version.h
+-download.o: /opt/Qtopia/include/qmainwindow.h
 -info.o: corsair.h feeds.h /opt/Qtopia/include/qstring.h
 -info.o: /opt/Qtopia/include/qcstring.h /opt/Qtopia/include/qarray.h
 -info.o: /opt/Qtopia/include/qgarray.h /opt/Qtopia/include/qshared.h
 -info.o: /opt/Qtopia/include/qglobal.h /opt/Qtopia/include/qconfig.h
 -info.o: /opt/Qtopia/include/qfeatures.h /usr/include/string.h
 -info.o: /usr/include/features.h /usr/include/sys/cdefs.h
--info.o: /usr/include/gnu/stubs.h /opt/Qtopia/include/qlist.h
--info.o: /opt/Qtopia/include/qglist.h /opt/Qtopia/include/qcollection.h
--info.o: /opt/Qtopia/include/qxml.h /opt/Qtopia/include/qmodules.h
--info.o: /opt/Qtopia/include/qtextstream.h /opt/Qtopia/include/qiodevice.h
--info.o: /usr/include/stdio.h /usr/include/bits/types.h
--info.o: /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h
--info.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h
+-info.o: /usr/include/gnu/stubs.h
+-info.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stddef.h
+-info.o: /opt/Qtopia/include/qlist.h /opt/Qtopia/include/qglist.h
+-info.o: /opt/Qtopia/include/qcollection.h /opt/Qtopia/include/qxml.h
+-info.o: /opt/Qtopia/include/qmodules.h /opt/Qtopia/include/qtextstream.h
+-info.o: /opt/Qtopia/include/qiodevice.h /usr/include/stdio.h
+-info.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
+-info.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+-info.o: /usr/include/_G_config.h /usr/include/wchar.h
 -info.o: /usr/include/bits/wchar.h /usr/include/gconv.h
+-info.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/stdarg.h
 -info.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
 -info.o: /opt/Qtopia/include/qfile.h /opt/Qtopia/include/qstringlist.h
 -info.o: /opt/Qtopia/include/qvaluelist.h /opt/Qtopia/include/qdatastream.h
@@ -308,28 +331,34 @@
 -info.o: /opt/Qtopia/include/qscrollview.h /opt/Qtopia/include/qframe.h
 -info.o: /opt/Qtopia/include/qwidget.h /opt/Qtopia/include/qwindowdefs.h
 -info.o: /opt/Qtopia/include/qobjectdefs.h /opt/Qtopia/include/qnamespace.h
--info.o: /usr/include/limits.h /opt/Qtopia/include/qobject.h
--info.o: /opt/Qtopia/include/qevent.h /opt/Qtopia/include/qregion.h
--info.o: /opt/Qtopia/include/qrect.h /opt/Qtopia/include/qsize.h
--info.o: /opt/Qtopia/include/qpoint.h /opt/Qtopia/include/qmime.h
--info.o: /opt/Qtopia/include/qpaintdevice.h /opt/Qtopia/include/qpalette.h
--info.o: /opt/Qtopia/include/qcolor.h /opt/Qtopia/include/qbrush.h
--info.o: /opt/Qtopia/include/qcursor.h /opt/Qtopia/include/qfont.h
--info.o: /opt/Qtopia/include/qfontmetrics.h /opt/Qtopia/include/qfontinfo.h
--info.o: /opt/Qtopia/include/qstyle.h /opt/Qtopia/include/qsizepolicy.h
--info.o: /opt/Qtopia/include/qscrollbar.h /opt/Qtopia/include/qrangecontrol.h
--info.o: /opt/Qtopia/include/qdrawutil.h /opt/Qtopia/include/qpainter.h
--info.o: /opt/Qtopia/include/qpen.h /opt/Qtopia/include/qpointarray.h
--info.o: /opt/Qtopia/include/qwmatrix.h /opt/Qtopia/include/qdatetime.h log.h
--info.o: download.h /opt/Qtopia/include/qsocket.h
--info.o: /opt/Qtopia/include/qsocketdevice.h
+-info.o: /usr/include/limits.h
+-info.o: /usr/lib/gcc/i386-redhat-linux/3.4.4/include/limits.h
+-info.o: /opt/Qtopia/include/qobject.h /opt/Qtopia/include/qevent.h
+-info.o: /opt/Qtopia/include/qregion.h /opt/Qtopia/include/qrect.h
+-info.o: /opt/Qtopia/include/qsize.h /opt/Qtopia/include/qpoint.h
+-info.o: /opt/Qtopia/include/qmime.h /opt/Qtopia/include/qpaintdevice.h
+-info.o: /opt/Qtopia/include/qpalette.h /opt/Qtopia/include/qcolor.h
+-info.o: /opt/Qtopia/include/qbrush.h /opt/Qtopia/include/qcursor.h
+-info.o: /opt/Qtopia/include/qfont.h /opt/Qtopia/include/qfontmetrics.h
+-info.o: /opt/Qtopia/include/qfontinfo.h /opt/Qtopia/include/qstyle.h
+-info.o: /opt/Qtopia/include/qsizepolicy.h /opt/Qtopia/include/qscrollbar.h
+-info.o: /opt/Qtopia/include/qrangecontrol.h /opt/Qtopia/include/qdrawutil.h
+-info.o: /opt/Qtopia/include/qpainter.h /opt/Qtopia/include/qpen.h
+-info.o: /opt/Qtopia/include/qpointarray.h /opt/Qtopia/include/qwmatrix.h
+-info.o: /opt/Qtopia/include/qdatetime.h log.h download.h
+-info.o: /opt/Qtopia/include/qsocket.h /opt/Qtopia/include/qsocketdevice.h
 -info.o: /opt/Qtopia/include/qhostaddress.h
 -info.o: /opt/Qtopia/include/qsocketnotifier.h /opt/Qtopia/include/qurl.h
 -info.o: /opt/Qtopia/include/qdir.h /opt/Qtopia/include/qstrlist.h
--info.o: /opt/Qtopia/include/qfileinfo.h /opt/Qtopia/include/qmainwindow.h
--info.o: info.h /opt/Qtopia/include/qtextbrowser.h
--info.o: /opt/Qtopia/include/qpixmap.h /opt/Qtopia/include/qtextview.h
--info.o: /opt/Qtopia/include/qtopia/qprocess.h
+-info.o: /opt/Qtopia/include/qfileinfo.h version.h
+-info.o: /opt/Qtopia/include/qmainwindow.h info.h
+-info.o: /opt/Qtopia/include/qtextbrowser.h /opt/Qtopia/include/qpixmap.h
+-info.o: /opt/Qtopia/include/qtextview.h /opt/Qtopia/include/qdialog.h
+-info.o: /opt/Qtopia/include/qlayout.h /opt/Qtopia/include/qabstractlayout.h
+-info.o: /opt/Qtopia/include/qlabel.h /opt/Qtopia/include/qlineedit.h
+-info.o: /opt/Qtopia/include/qhbox.h /opt/Qtopia/include/qcheckbox.h
+-info.o: /opt/Qtopia/include/qbutton.h /opt/Qtopia/include/qtopia/qprocess.h
 -info.o: /opt/Qtopia/include/qtopia/qpeglobal.h
 -info.o: /opt/Qtopia/include/qtopia/qcopenvelope_qws.h
 -info.o: /opt/Qtopia/include/qcopchannel_qws.h
++ 	rsync -e ssh CHANGELOG FAQ README website/* tinyogre@shell.sourceforge.net:/home/groups/c/co/corsair/htdocs/