Merge branch 'fixes0.6'

Merges fixes for 0.6.8

diff --cc Makefile
index 6dd7d2a,78d57c6..5f7be11
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,9 -1,9 +1,9 @@@
  #############################################################################
  # Makefile for building: fapman
- # Generated by qmake (2.01a) (Qt 4.7.0) on: Wed Nov 10 18:51:09 2010
 -# Generated by qmake (2.01a) (Qt 4.7.0) on: Thu Nov 25 17:44:54 2010
++# Generated by qmake (2.01a) (Qt 4.7.0) on: Thu Nov 25 18:34:51 2010
  # Project:  fapman.pro
  # Template: app
--# Command: /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/qmake -spec /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -o Makefile fapman.pro
++# Command: /usr/bin/qmake -o Makefile fapman.pro
  #############################################################################
  
  ####### Compiler, tools and options
@@@ -13,13 -13,13 +13,13 @@@ CXX           = g+
  DEFINES       = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_PHONON_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
  CFLAGS        = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall -W -D_REENTRANT $(DEFINES)
  CXXFLAGS      = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall -W -D_REENTRANT $(DEFINES)
--INCPATH       = -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/QtCore -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/QtNetwork -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/QtGui -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/QtDBus -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/phonon -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/QtMaemo5 -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/include/phonon_compat -I. -I.
++INCPATH       = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtGui -I/targets/FREMANTLE_ARMEL/usr/include/QtDBus -I/targets/FREMANTLE_ARMEL/usr/include/phonon -I/targets/FREMANTLE_ARMEL/usr/include/QtMaemo5 -I/targets/FREMANTLE_ARMEL/usr/include -I/usr/include/phonon_compat -I. -I.
  LINK          = g++
  LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu
--LIBS          = $(SUBLIBS)  -L/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib -lQtMaemo5 -L/usr/lib -L/usr/X11R6/lib -lphonon -lQtGui -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread 
++LIBS          = $(SUBLIBS)  -L/usr/lib -lQtMaemo5 -L/usr/lib -L/usr/X11R6/lib -lphonon -lQtGui -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread 
  AR            = ar cqs
  RANLIB        = 
--QMAKE         = /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/qmake
++QMAKE         = /usr/bin/qmake
  TAR           = tar -cf
  COMPRESS      = gzip -9f
  COPY          = cp -f
@@@ -122,27 -122,27 +122,27 @@@ OBJECTS       = main.o 
                moc_searchoptions.o \
                moc_dpkginterface.o \
                qrc_resources.o
--DIST          = /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/unix.conf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/linux.conf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/qconfig.pri \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_functions.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_config.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_pre.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/release.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_post.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/warn_on.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/moc.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/unix/thread.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/resources.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/uic.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/yacc.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/lex.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf \
++DIST          = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                fapman.pro
  QMAKE_TARGET  = fapman
  DESTDIR       = 
@@@ -175,65 -175,65 +175,65 @@@ all: Makefile $(TARGET
  $(TARGET): ui_mainwindow.h ui_packageview.h ui_filterselect.h ui_confirmdialog.h ui_repoview.h ui_packageselector.h ui_help.h ui_settings.h ui_repoedit.h ui_logview.h ui_sortselector.h ui_blacklistselect.h ui_searchoptions.h $(OBJECTS)  
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
  
--Makefile: fapman.pro  /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/unix.conf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/linux.conf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/qconfig.pri \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_functions.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_config.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_pre.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/release.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_post.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/warn_on.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/moc.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/unix/thread.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/resources.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/uic.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/yacc.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/lex.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtMaemo5.prl \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtGui.prl \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtDBus.prl \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtXml.prl \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtCore.prl \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libphonon.prl \
--              /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtNetwork.prl
--      $(QMAKE) -spec /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -o Makefile fapman.pro
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/unix.conf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/common/linux.conf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/qconfig.pri:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_functions.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt_config.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_pre.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/release.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/default_post.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/warn_on.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/qt.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/moc.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/unix/thread.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/resources.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/uic.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/yacc.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/lex.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtMaemo5.prl:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtGui.prl:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtDBus.prl:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtXml.prl:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtCore.prl:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libphonon.prl:
--/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/lib/libQtNetwork.prl:
++Makefile: fapman.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
++              /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
++              /usr/lib/libQtMaemo5.prl \
++              /usr/lib/libQtGui.prl \
++              /usr/lib/libQtDBus.prl \
++              /usr/lib/libQtXml.prl \
++              /usr/lib/libQtCore.prl \
++              /usr/lib/libphonon.prl \
++              /usr/lib/libQtNetwork.prl
++      $(QMAKE) -o Makefile fapman.pro
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
++/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
++/usr/lib/libQtMaemo5.prl:
++/usr/lib/libQtGui.prl:
++/usr/lib/libQtDBus.prl:
++/usr/lib/libQtXml.prl:
++/usr/lib/libQtCore.prl:
++/usr/lib/libphonon.prl:
++/usr/lib/libQtNetwork.prl:
  qmake:  FORCE
--      @$(QMAKE) -spec /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-20.2010.36-2-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -o Makefile fapman.pro
++      @$(QMAKE) -o Makefile fapman.pro
  
  dist: 
        @$(CHK_DIR_EXISTS) .tmp/fapman1.0.0 || $(MKDIR) .tmp/fapman1.0.0 
@@@ -264,47 -264,47 +264,47 @@@ compiler_moc_header_clean
  moc_mainwindow.cpp: aaptinterface.h \
                blacklistselect.h \
                mainwindow.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp
  
  moc_packageview.cpp: mainwindow.h \
                aaptinterface.h \
                blacklistselect.h \
                package.h \
                packageview.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) packageview.h -o moc_packageview.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) packageview.h -o moc_packageview.cpp
  
  moc_filterselect.cpp: filterselect.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) filterselect.h -o moc_filterselect.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) filterselect.h -o moc_filterselect.cpp
  
  moc_confirmdialog.cpp: confirmdialog.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) confirmdialog.h -o moc_confirmdialog.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) confirmdialog.h -o moc_confirmdialog.cpp
  
  moc_dimmer.cpp: dimmer.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) dimmer.h -o moc_dimmer.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) dimmer.h -o moc_dimmer.cpp
  
  moc_repoview.cpp: repoview.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) repoview.h -o moc_repoview.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) repoview.h -o moc_repoview.cpp
  
  moc_packageselector.cpp: package.h \
                blacklistselect.h \
                packageselector.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) packageselector.h -o moc_packageselector.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) packageselector.h -o moc_packageselector.cpp
  
  moc_help.cpp: help.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) help.h -o moc_help.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) help.h -o moc_help.cpp
  
  moc_settings.cpp: settings.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) settings.h -o moc_settings.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) settings.h -o moc_settings.cpp
  
  moc_aaptinterface.cpp: blacklistselect.h \
                aaptinterface.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) aaptinterface.h -o moc_aaptinterface.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) aaptinterface.h -o moc_aaptinterface.cpp
  
  moc_repoedit.cpp: repoedit.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) repoedit.h -o moc_repoedit.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) repoedit.h -o moc_repoedit.cpp
  
  moc_logview.cpp: logview.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) logview.h -o moc_logview.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) logview.h -o moc_logview.cpp
  
  moc_sortselector.cpp: packageview.h \
                mainwindow.h \
@@@ -312,19 -312,19 +312,19 @@@
                blacklistselect.h \
                package.h \
                sortselector.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) sortselector.h -o moc_sortselector.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) sortselector.h -o moc_sortselector.cpp
  
  moc_blacklistselect.cpp: blacklistselect.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) blacklistselect.h -o moc_blacklistselect.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) blacklistselect.h -o moc_blacklistselect.cpp
  
  moc_rotatingbackground.cpp: rotatingbackground.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) rotatingbackground.h -o moc_rotatingbackground.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) rotatingbackground.h -o moc_rotatingbackground.cpp
  
  moc_searchoptions.cpp: searchoptions.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) searchoptions.h -o moc_searchoptions.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) searchoptions.h -o moc_searchoptions.cpp
  
  moc_dpkginterface.cpp: dpkginterface.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/moc $(DEFINES) $(INCPATH) dpkginterface.h -o moc_dpkginterface.cpp
++      /usr/bin/moc $(DEFINES) $(INCPATH) dpkginterface.h -o moc_dpkginterface.cpp
  
  compiler_dbus_interface_source_make_all:
  compiler_dbus_interface_source_clean:
@@@ -354,7 -354,7 +354,7 @@@ qrc_resources.cpp: resources.qrc 
                icons/upgrade.png \
                icons/remove.png \
                icons/pkg_upgrade.png
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/rcc -name resources resources.qrc -o qrc_resources.cpp
++      /usr/bin/rcc -name resources resources.qrc -o qrc_resources.cpp
  
  compiler_image_collection_make_all: qmake_image_collection.cpp
  compiler_image_collection_clean:
@@@ -374,43 -374,43 +374,43 @@@ compiler_uic_clean
        -$(DEL_FILE) ui_mainwindow.h ui_packageview.h ui_filterselect.h ui_confirmdialog.h ui_repoview.h ui_packageselector.h ui_help.h ui_settings.h ui_repoedit.h ui_logview.h ui_sortselector.h ui_blacklistselect.h ui_searchoptions.h
  ui_mainwindow.h: mainwindow.ui \
                rotatingbackground.h
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic mainwindow.ui -o ui_mainwindow.h
++      /usr/bin/uic mainwindow.ui -o ui_mainwindow.h
  
  ui_packageview.h: packageview.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic packageview.ui -o ui_packageview.h
++      /usr/bin/uic packageview.ui -o ui_packageview.h
  
  ui_filterselect.h: filterselect.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic filterselect.ui -o ui_filterselect.h
++      /usr/bin/uic filterselect.ui -o ui_filterselect.h
  
  ui_confirmdialog.h: confirmdialog.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic confirmdialog.ui -o ui_confirmdialog.h
++      /usr/bin/uic confirmdialog.ui -o ui_confirmdialog.h
  
  ui_repoview.h: repoview.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic repoview.ui -o ui_repoview.h
++      /usr/bin/uic repoview.ui -o ui_repoview.h
  
  ui_packageselector.h: packageselector.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic packageselector.ui -o ui_packageselector.h
++      /usr/bin/uic packageselector.ui -o ui_packageselector.h
  
  ui_help.h: help.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic help.ui -o ui_help.h
++      /usr/bin/uic help.ui -o ui_help.h
  
  ui_settings.h: settings.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic settings.ui -o ui_settings.h
++      /usr/bin/uic settings.ui -o ui_settings.h
  
  ui_repoedit.h: repoedit.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic repoedit.ui -o ui_repoedit.h
++      /usr/bin/uic repoedit.ui -o ui_repoedit.h
  
  ui_logview.h: logview.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic logview.ui -o ui_logview.h
++      /usr/bin/uic logview.ui -o ui_logview.h
  
  ui_sortselector.h: sortselector.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic sortselector.ui -o ui_sortselector.h
++      /usr/bin/uic sortselector.ui -o ui_sortselector.h
  
  ui_blacklistselect.h: blacklistselect.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic blacklistselect.ui -o ui_blacklistselect.h
++      /usr/bin/uic blacklistselect.ui -o ui_blacklistselect.h
  
  ui_searchoptions.h: searchoptions.ui
--      /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/uic searchoptions.ui -o ui_searchoptions.h
++      /usr/bin/uic searchoptions.ui -o ui_searchoptions.h
  
  compiler_yacc_decl_make_all:
  compiler_yacc_decl_clean:

diff --cc aaptinterface.cpp
Simple merge

diff --cc debian/changelog
index a5c0e3d,06195d6..10244c4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +fapman (0.7-1) unstable; urgency=low
 +
 +  * 
 +
 + -- Heikki Holstila <heikki.holstila@gmail.com>  Wed, 10 Nov 2010 18:15:57 +0200
 +
+ fapman (0.6.8-1) unstable; urgency=low
+ 
+   * fix: #6590 (network autoconnect)
+   * fix: #6581 ("disable autorotation" is ignored most of the time)
+ 
+  -- Heikki Holstila <heikki.holstila@gmail.com>  Thu, 25 Nov 2010 18:21:45 +0200
+ 
  fapman (0.6.7-1) unstable; urgency=low
  
    * fix: blacklist can get unintentionally cleared

diff --cc fapman
index 1638d1a,f338b63..0000000
deleted file mode 100755,100755
Binary files differ

diff --cc packageview.cpp
Simple merge

diff --cc packageview.h
Simple merge