release 0.6.7 (see the debian changelog for a proper list of changes)

diff --git a/Makefile b/Makefile
index 65e42ee..3b105d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: fapman
-# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Oct 26 16:23:42 2010
+# Generated by qmake (2.01a) (Qt 4.7.0) on: Tue Nov 9 23:45:22 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ moc_sortselector.cpp: packageview.h \
                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 @@ 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 @@ 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:
@@ -433,7 +433,6 @@ mainwindow.o: mainwindow.cpp mainwindow.h \
                blacklistselect.h \
                version.h \
                ui_mainwindow.h \
-               rotatingbackground.h \
                packageview.h \
                package.h \
                confirmdialog.h \
@@ -442,6 +441,7 @@ mainwindow.o: mainwindow.cpp mainwindow.h \
                help.h \
                settings.h \
                logview.h \
+               rotatingbackground.h \
                dpkginterface.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp
 

diff --git a/TODO.txt b/TODO.txt
index 1713db3..eceb41e 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,17 +4,14 @@
  Note that many of these are just random ideas, not all of them will get implemented
 -------------------------------------------------------------------------------------
 
-0.6.7:
-* scale package icons to proper size in the package details dialog
-* minor UI tweaks and fixes for Qt 4.7
-* fix: show free space and size correctly for large filesystems
-- use QNetworkSession
-- fix: date fetching is very slow with qt4.7
-- test blacklist functionality with very large lists
-
 
 0.7:
 - app list backup & restore
+- better blacklist editor
+- save/load selections to/from any user-selectable file
+- don't lose package selections when returning to main menu
+  (autostore/load selections - to different file than normal store)
+- ability to import/export blacklist?
 
 
 0.8:
@@ -27,23 +24,16 @@
 
 later/any/uncertain:
 - fetch dates from other repositories than maemo.org?
-- don't lose package selections when returning to main menu
-  (autostore/load selections - to different file than normal store)
+- fetch dates for other than user categories?
 - update install/remove changes directly to internal package db & don't require re-reading package lists afterwards
-- keep a list of recently removed apps for easy reinstallation
 - add an option to start fetching changelogs automatically for all upgradeable packages?
 - how to handle package names that end in '-'? (theoretically they are valid but nonexistent?)
-- filtering by repository / repository color coding?
-- fetch dates for other than user categories?
 - ability to easily add extras-devel and extras-testing to repos if they don't exist
 - load package lists in the background when the main menu is visible?
-- read all hildon app manager repository settings (requires too much work...)
-- option to select cache location?
 - possibility to force reinstall of an already installed package
 - warn about unauthenticated packages / option to disable installing unauthenticated packages
-- show download speed and current repo for apt-get update (very hard since apt-get update output does not show
+- show download speed and current repo for apt-get update (very hard to do since apt-get update output does not show
   all the information needed to get the current list file names?)
-- ability to import/export blacklist
 - "problem solver" feature (find broken packages, handle recovery from broken packages better)
 
 
@@ -51,4 +41,5 @@ known bugs:
 - no window menu indicator in stacked windows (probably a Qt bug)
 - updating menu icons after installation does not work or works only sometimes (currently disabled)
 - does not warn about system upgrade?
+- date fetching is quite slow with qt4.7
 

diff --git a/aaptinterface.cpp b/aaptinterface.cpp
index b00f257..fc4e616 100644 (file)
--- a/aaptinterface.cpp
+++ b/aaptinterface.cpp
@@ -86,12 +86,6 @@ AAptInterface::AAptInterface(QObject* parent = 0) : QObject(parent)
        QFile logfile(KLogFile);
        logfile.remove();
 
-       // clear files left from old versions
-       QFile f1("/root/.fapman/dates.cache");
-       f1.remove();
-       QFile f2("/root/.fapman/lastupdate");
-       f2.remove();
-
        readRepositoryInfo();
 }
 
@@ -1025,8 +1019,10 @@ void AAptInterface::readRepositoryInfo()
                return;
        }
 
-       if( ownFound )
+       if( ownFound ) {
+               qDebug() << "own repo lists found";
                return;
+       }
 
        QFile ham( KHamRepoListFile );
        if( ham.open(QIODevice::ReadOnly | QIODevice::Text ) )
@@ -1037,21 +1033,26 @@ void AAptInterface::readRepositoryInfo()
                        Repository* r = new Repository();
                        if( r->setFromString(line) ) {
                                iRepositories.append(r);
+
+#ifdef Q_WS_MAEMO_5
+                               // disable the ovi repository by default
+                               if( line.contains("https://downloads.maemo.nokia.com/fremantle1.2/ovi/") ) {
+                                       r->setEnabled(false);
+                               }
+#endif
                        } else {
                                delete r;
                                r=0;
                        }
                }
                ham.close();
+               qDebug() << "system repo list loaded";
        }
+
 }
 
 bool AAptInterface::writeRepositories()
 {
-#ifndef Q_WS_MAEMO_5   // for simulator
-       return true;
-#endif
-
        iNeedListRefresh = true;
 
        QFile own( KOwnRepoFile );
@@ -1090,10 +1091,6 @@ bool AAptInterface::writeRepositories()
 
 bool AAptInterface::needRepoRefresh()
 {
-#ifndef Q_WS_MAEMO_5   // for simulator
-       return false;
-#endif
-
        if( iNeedRepoRefresh || iSettings->qsettings()->value("need_repo_refresh", false).toBool() ) {
                iNeedRepoRefresh = false;
                iSettings->qsettings()->setValue("need_repo_refresh", false);
@@ -1602,13 +1599,29 @@ void AAptInterface::removeFromBlacklist(Package *pkg, BlacklistSelect::blackList
                return;
        }
 
-       QStringList newlist;
+       //QStringList newlist;
        bool removed = false;
 
        for( int i=0; i<iBlacklist.count(); i++ )
        {
                if( oldstate == BlacklistSelect::BlacklistAll )
                {
+                       if( iBlacklist.at(i) == pkg->name() ) {
+                               iBlacklist.removeAt(i);
+                               i--;
+                               removed = true;
+                       }
+               } else if( oldstate == BlacklistSelect::BlacklistThis ) {
+                       if( iBlacklist.at(i) == (pkg->name()+" "+pkg->version()) ) {
+                               iBlacklist.removeAt(i);
+                               i--;
+                               removed = true;
+                       }
+               }
+
+               /*
+               if( oldstate == BlacklistSelect::BlacklistAll )
+               {
                        if( !(iBlacklist.at(i) == pkg->name()) ) {
                                newlist << iBlacklist.at(i);
                        } else removed = true;
@@ -1616,7 +1629,9 @@ void AAptInterface::removeFromBlacklist(Package *pkg, BlacklistSelect::blackList
                        if( !(iBlacklist.at(i) == (pkg->name()+" "+pkg->version())) ) {
                                newlist << iBlacklist.at(i);
                        } else removed = true;
-               }
+               } else {
+                       newlist << iBlacklist.at(i);
+               }*/
        }
 
        if( removed )
@@ -1624,7 +1639,7 @@ void AAptInterface::removeFromBlacklist(Package *pkg, BlacklistSelect::blackList
        else
                qDebug() << "blacklist:" << pkg->name() << "not in saved list";
 
-       iBlacklist = newlist;
+       //iBlacklist = newlist;
 }
 
 
@@ -1738,7 +1753,7 @@ void AAptInterface::startFetchDates()
                                                QApplication::processEvents(QEventLoop::WaitForMoreEvents);
                                        }
                                } else {
-                                       while( iDateRequestsWaiting>1 ) {
+                                       while( iDateRequestsWaiting>5 ) {
                                                QApplication::processEvents(QEventLoop::WaitForMoreEvents);
                                        }
                                }
@@ -1820,10 +1835,10 @@ void AAptInterface::dateFetchNetworkReply(QNetworkReply* reply)
 {
        iDateRequestsWaiting--;
        iDateRequestsReceived++;
-       //qDebug() << "reply" << reply->header(QNetworkRequest::LastModifiedHeader).toDateTime();
        iNetworkError = reply->error();
+       QDateTime dateModified = reply->header(QNetworkRequest::LastModifiedHeader).toDateTime();
 
-       if( reply->error() == QNetworkReply::NoError && reply->header(QNetworkRequest::LastModifiedHeader).toDateTime().isValid() )
+       if( reply->error() == QNetworkReply::NoError && dateModified.isValid() )
        {
                QString pkgname = reply->url().fragment();
                //qDebug() << pkgname;
@@ -1833,7 +1848,7 @@ void AAptInterface::dateFetchNetworkReply(QNetworkReply* reply)
 
                Package* pkg = iPackagesAvailable.value(pkgname, 0);
                if( pkg ) {
-                       pkg->setDate( reply->header(QNetworkRequest::LastModifiedHeader).toDateTime() );
+                       pkg->setDate( dateModified );
                } else {
                        qDebug() << "warning: unknown packagename in reply:" << pkgname;
                }

diff --git a/aaptinterface.h b/aaptinterface.h
index 1fd9e03..e009b5e 100644 (file)
--- a/aaptinterface.h
+++ b/aaptinterface.h
@@ -31,7 +31,11 @@ const QString KBlacklistFile = "/root/.fapman/black.list";
 const QString KOwnRepoFile = "/root/.fapman/repos.list";
 const QString KOwnRepoNamesFile = "/root/.fapman/repos.names";
 
-const QString KHamRepoListFile = "/etc/apt/sources.list.d/hildon-application-manager.list";
+#ifdef Q_WS_MAEMO_5
+       const QString KHamRepoListFile = "/etc/apt/sources.list.d/hildon-application-manager.list";
+#else
+       const QString KHamRepoListFile = "/etc/apt/sources.list";
+#endif
 
 const QString KLastUpdateFile = "/opt/fapman-cache/lastupdate";
 const QString KDateCacheFile = "/opt/fapman-cache/dates.cache";

diff --git a/debian/changelog b/debian/changelog
index 98911f4..2c088d8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 fapman (0.6.7-1) unstable; urgency=low
 
-  * 
-
- -- Heikki Holstila <heikki.holstila@gmail.com>  Tue, 26 Oct 2010 16:24:13 +0300
+  * fix: blacklist can get unintentionally cleared
+  * fix: show free space correctly for large filesystems
+  * connect to default network access point if there is no connection
+  * scale package icons to proper size in the package details dialog
+  * menu item to re-import repository settings from HAM
+  * automatically disable the ovi repository on import
+  * minor UI tweaks
+
+ -- Heikki Holstila <heikki.holstila@gmail.com>  Tue,  9 Nov 2010 23:44:52 +0200
 
 fapman (0.6.6-1) unstable; urgency=low
 

diff --git a/fapman b/fapman
index 8a9a351..5c30428 100755 (executable)
Binary files a/fapman and b/fapman differ

diff --git a/logview.cpp b/logview.cpp
index 58afbde..0f5d7f5 100644 (file)
--- a/logview.cpp
+++ b/logview.cpp
@@ -120,5 +120,7 @@ void LogView::on_btnCopy_clicked()
        ui->plainTextEdit->selectAll();
        ui->plainTextEdit->copy();
 
+#ifdef Q_WS_MAEMO_5
        QMaemo5InformationBox::information ( this, "Copied" );
+#endif
 }

diff --git a/main.cpp b/main.cpp
index 766c0d6..0626c37 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -51,12 +51,7 @@ int main(int argc, char *argv[])
        }
 
        MainWindow w;
-
-#if defined(Q_WS_S60)
-    w.showMaximized();
-#else
     w.show();
-#endif
 
        uid_t userUID = getuid();
        if( userUID != 0 ) {

diff --git a/mainwindow.cpp b/mainwindow.cpp
index d63700f..844f065 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -138,27 +138,17 @@ MainWindow::MainWindow(QWidget *parent) :
        }
 
 
-       /*
-       // does not work
-
-       QDBusConnection conn = QDBusConnection::connectToBus(QDBusConnection::SystemBus, "faster_application_manager");
-
-       QString service = "com.nokia.icd";
-       QString path = "/com/nokia/icd";
-       QString method = "connect";
-
-       QDBusInterface net(service, path, service, conn, this);
-       net.call(method,"[ANY]",0);
-       */
-
        iMediaObject = new Phonon::MediaObject(this);
        Phonon::AudioOutput* aout = new Phonon::AudioOutput(Phonon::NotificationCategory, this);
        Phonon::createPath(iMediaObject, aout);
 
        showFreeSpace();
 
+       iNetworkConfigurationManager = new QNetworkConfigurationManager(this);
+       iNetworkSession = new QNetworkSession(iNetworkConfigurationManager->defaultConfiguration(),this);
+
        show();
-       orientationChanged();
+       rescaleMenuView();
 }
 
 MainWindow::~MainWindow()
@@ -166,6 +156,11 @@ MainWindow::~MainWindow()
        // save "need repo refresh" status
        iSettings->qsettings()->setValue("need_repo_refresh", iAptInterface->needRepoRefresh());
 
+       if( iNetworkSession && iNetworkSession->isOpen() ) {
+               iNetworkSession->close();
+       }
+       // iNetworkSession automatically deleted by parent
+
        delete iWinPackageView; iWinPackageView=0;
        delete iWinRepoView; iWinRepoView=0;
        delete iAptInterface; iAptInterface=0;
@@ -176,6 +171,20 @@ MainWindow::~MainWindow()
        //iMediaObject and aout automatically deleted by their parent
 }
 
+void MainWindow::openNetworkConnection()
+{
+       if( iNetworkSession->isOpen() )
+               return;
+
+       iNetworkSession->open();
+       if( !iNetworkSession->waitForOpened(20000) )
+       {
+               ConfirmDialog d(false, this);
+               d.setText("Network error","Unable to open a network connection");
+               d.exec();
+       }
+}
+
 void MainWindow::changeEvent(QEvent *e)
 {
     QMainWindow::changeEvent(e);
@@ -197,6 +206,8 @@ void MainWindow::on_btnUpdate_clicked()
 {      
        // update catalogs
 
+       openNetworkConnection();
+
        busyDialog(true, tr("Operation in progress"), tr("Updating catalogs"));
 
        iAptInterface->addQueuedOperation(AAptInterface::ModeAptGetUpdate);
@@ -243,6 +254,8 @@ void MainWindow::on_btnListInstallable_clicked()
 {
        //install
 
+       openNetworkConnection();
+
        int listupd = -1;
        int dpkgupd = -1;
        if( iAptInterface->lastListUpdate() < QDateTime::currentDateTime().addSecs(-KListExpireTime) )
@@ -270,6 +283,8 @@ void MainWindow::on_btnUpgrade_clicked()
 {
        // upgrade
 
+       openNetworkConnection();
+
        int listupd = -1;
        int dpkgupd = -1;
        if( iAptInterface->lastListUpdate() < QDateTime::currentDateTime().addSecs(-KListExpireTime) )
@@ -660,6 +675,17 @@ void MainWindow::on_actionLoad_file_triggered()
 
 void MainWindow::resizeEvent(QResizeEvent* event)
 {
+       rescaleMenuView();
+
+       if( iDimmer ) {
+               iDimmer->resize( this->size() );
+       }
+
+       QMainWindow::resizeEvent(event);
+}
+
+void MainWindow::rescaleMenuView()
+{
        QRect sg = ui->listWidget->rect();
 
        if( sg.width() > sg.height() ) {
@@ -667,12 +693,6 @@ void MainWindow::resizeEvent(QResizeEvent* event)
        } else {
                ui->listWidget->setGridSize( QSize((sg.width()-12)/3, (sg.height()-12)/3) );
        }
-
-       if( iDimmer ) {
-               iDimmer->resize( this->size() );
-       }
-
-       QMainWindow::resizeEvent(event);
 }
 
 void MainWindow::orientationChanged()

diff --git a/mainwindow.h b/mainwindow.h
index 4b6266a..2c97ec6 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -50,6 +50,8 @@ public:
     explicit MainWindow(QWidget *parent = 0);
        virtual ~MainWindow();
 
+       void openNetworkConnection();
+
        void operationQueueFinished(QList<AAptInterface::interfaceMode> lastModes, bool success, QString title, QStringList msgs);
        void busyDialog(bool show_, QString title="", QString text="");
        void closeEvent(QCloseEvent *event);
@@ -76,6 +78,7 @@ private:
 
        void dateFetchAsk();
        void showFreeSpace();
+       void rescaleMenuView();
 
     Ui::MainWindow *ui;
        AAptInterface* iAptInterface;
@@ -90,6 +93,8 @@ private:
        bool iUpgradeAutoUpdate;
        nextOperation iNextOperation;
        Phonon::MediaObject* iMediaObject;
+       QNetworkSession* iNetworkSession;
+       QNetworkConfigurationManager* iNetworkConfigurationManager;
 
        void on_btnRepos_clicked();
        void on_btnUpgrade_clicked();
@@ -98,7 +103,7 @@ private:
 
 private slots:
        void on_listWidget_itemClicked(QListWidgetItem* item);
- void on_actionLoad_file_triggered();
+       void on_actionLoad_file_triggered();
        void on_actionOptions_triggered();
        void on_actionView_log_triggered();
        void on_actionClean_triggered();

diff --git a/packageview.cpp b/packageview.cpp
index f50f115..73d0dd7 100644 (file)
--- a/packageview.cpp
+++ b/packageview.cpp
@@ -260,6 +260,7 @@ PackageView::PackageView(QWidget *parent) : QMainWindow(parent), ui(new Ui::Pack
        iSearchDescLong = false;
 
        // fine-tune kinetic scrolling parameters
+#ifdef Q_WS_MAEMO_5
        QAbstractKineticScroller* listscroller = ui->listWidget->property("kineticScroller").value<QAbstractKineticScroller*>();
        if( listscroller )
        {
@@ -272,6 +273,7 @@ PackageView::PackageView(QWidget *parent) : QMainWindow(parent), ui(new Ui::Pack
                // not good because it alse sets horizontal overshoot:
                //listscroller->setOvershootPolicy( QAbstractKineticScroller::OvershootAlwaysOn );
        }
+#endif
 }
 
 PackageView::~PackageView()
@@ -730,6 +732,14 @@ void PackageView::on_btn_CategoryFilter_clicked()
                iSortNoticeShown = false;
 
                openWin();
+
+               if( iSelectedCatFilter==CatFilterBlacklisted && iAptInterface->needListOrDateRefresh() )
+               {
+                       ConfirmDialog d(false, this);
+                       d.setText("Notice","Since you don't have all package lists currently loaded, not all blacklisted "
+                                         "packages are necessarily shown");
+                       d.exec();
+               }
        }
 }
 
@@ -761,6 +771,8 @@ void PackageView::on_btn_StatusFilter_clicked()
                if( oldfilter==Package::PkgStatInstalled && iSelectedStatFilter!=Package::PkgStatInstalled &&
                        iAptInterface->needListOrDateRefresh() )
                {
+                       iMainWindow->openNetworkConnection();
+
                        iMainWindow->setNextOperation(MainWindow::OpOpenPkgView);
                        iMainWindow->busyDialog(true,"Operation in progress","Reading the rest of the package lists");
 

diff --git a/packageview.h b/packageview.h
index 9111ca8..c5ce12e 100644 (file)
--- a/packageview.h
+++ b/packageview.h
@@ -101,7 +101,6 @@ public:
        void setSearchText(QString text);
        void setSearchOptions(bool pkgname, bool dispname, bool dshort, bool dlong);
 
-#ifdef Q_WS_MAEMO_5            // workaround for buggy Qt autorotation
        void show() {
                if( !isVisible() ) {
                        /*
@@ -119,12 +118,13 @@ public:
                                this->setWindowFlags( Qt::Window );
                        }
                        */
+#ifdef Q_WS_MAEMO_5
                        this->setAttribute(Qt::WA_Maemo5StackedWindow);
                        this->setWindowFlags( Qt::Window );
+#endif
                }
                QMainWindow::show();
        }
-#endif
 
        static const int CatFilterAllMarked = 0;
        static const int CatFilterAllUser = 1;

diff --git a/repoview.cpp b/repoview.cpp
index b848b00..dba197a 100644 (file)
--- a/repoview.cpp
+++ b/repoview.cpp
@@ -125,3 +125,20 @@ void RepoView::on_listWidget_itemClicked(QListWidgetItem* item)
                openWin();
        }
 }
+
+void RepoView::on_actionRe_import_HAM_repo_settings_triggered()
+{
+       ConfirmDialog d(true, this);
+       d.setText("Confirm repository import","You're about to re-read the repository settings from Hildon Application Manager. This will import the "
+                         "repositories that are currently enabled in HAM and it will clear your current repository settings here. Continue?");
+       if( d.exec() )
+       {
+               QFile r(KOwnRepoFile);
+               QFile n(KOwnRepoNamesFile);
+               r.remove();
+               n.remove();
+               iAptInterface->readRepositoryInfo();
+               iModified = true;
+               openWin();      // refresh view
+       }
+}

diff --git a/repoview.h b/repoview.h
index ae14183..0b699f6 100644 (file)
--- a/repoview.h
+++ b/repoview.h
@@ -41,7 +41,6 @@ public:
        void openWin();
        void closeEvent(QCloseEvent *event);
 
-#ifdef Q_WS_MAEMO_5            // workaround for buggy Qt autorotation
        void show() {
                if( !isVisible() ) {
                        /*
@@ -55,12 +54,13 @@ public:
                                        this->setAttribute( Qt::WA_Maemo5LandscapeOrientation );
                        }
                        */
+#ifdef Q_WS_MAEMO_5
                        this->setAttribute(Qt::WA_Maemo5StackedWindow);
                        this->setWindowFlags( Qt::Window );
+#endif
                }
                QMainWindow::show();
        }
-#endif
 
 
 protected:
@@ -77,6 +77,7 @@ private:
        AAptInterface* iAptInterface;
 
 private slots:
+       void on_actionRe_import_HAM_repo_settings_triggered();
        void on_listWidget_itemClicked(QListWidgetItem* item);
        void on_btnNew_clicked();
 };

diff --git a/repoview.ui b/repoview.ui
index 5b692dc..a04b3b6 100644 (file)
--- a/repoview.ui
+++ b/repoview.ui
@@ -16,10 +16,10 @@
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
     <property name="spacing">
-     <number>4</number>
+     <number>2</number>
     </property>
     <property name="margin">
-     <number>4</number>
+     <number>2</number>
     </property>
     <item>
      <widget class="QListWidget" name="listWidget">
@@ -75,16 +75,28 @@
     </item>
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menubar">
+  <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>23</height>
+     <height>24</height>
     </rect>
    </property>
+   <widget class="QMenu" name="menuMenu">
+    <property name="title">
+     <string>menu</string>
+    </property>
+    <addaction name="actionRe_import_HAM_repo_settings"/>
+   </widget>
+   <addaction name="menuMenu"/>
   </widget>
+  <action name="actionRe_import_HAM_repo_settings">
+   <property name="text">
+    <string>Re-import HAM repo settings</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>