fixes
authorHeikki Holstila <heikki.holstila@gmail.com>
Wed, 18 Aug 2010 21:53:07 +0000 (00:53 +0300)
committerHeikki Holstila <heikki.holstila@gmail.com>
Wed, 18 Aug 2010 21:53:07 +0000 (00:53 +0300)
21 files changed:
.gitignore
Makefile
TODO.txt
aaptinterface.cpp
aaptinterface.h
debian/changelog
fapman
fapman.pro.user
fapman.pro.user.1.3 [new file with mode: 0644]
mainwindow.cpp
mainwindow.h
package.cpp
package.h
packageselector.cpp
packageselector.h
packageview.cpp
repoedit.cpp
settings.cpp
settings.h
settings.ui
updateversion.sh

index 96b3054..4d42a06 100644 (file)
@@ -1,4 +1,3 @@
-fapman
 moc_*.cpp
 ui_*.h
 qrc_*.cpp
@@ -7,3 +6,4 @@ debian/fapman.tarlist
 debian/files
 *.o
 *.deb
+fapman
index 0bafa35..b97e55e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: fapman
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Thu Aug 12 21:00:19 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed Aug 18 17:34:07 2010
 # Project:  fapman.pro
 # Template: app
-# Command: /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/qmake -spec /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -unix -o Makefile fapman.pro
+# Command: /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/qmake -spec /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -unix -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-10.2010.19-1-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/include/QtCore -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/include/QtNetwork -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/include/QtGui -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/include/QtDBus -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/include/phonon -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/include/QtMaemo5 -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/include -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/include/phonon_compat -I. -I.
+INCPATH       = -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/include/QtCore -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/include/QtNetwork -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/include/QtGui -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/include/QtDBus -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/include/phonon -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/include/QtMaemo5 -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/include -I/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/include/phonon_compat -I. -I.
 LINK          = g++
 LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/usr/lib
-LIBS          = $(SUBLIBS)  -L/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib -lQtMaemo5 -L/usr/lib -L/usr/X11R6/lib -lphonon -lQtGui -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread 
+LIBS          = $(SUBLIBS)  -L/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/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-pr12/bin/qmake
+QMAKE         = /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/qmake
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
@@ -122,26 +122,26 @@ OBJECTS       = main.o \
                moc_searchoptions.o \
                moc_dpkginterface.o \
                qrc_resources.o
-DIST          = /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/common/unix.conf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/common/linux.conf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/qconfig.pri \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/release.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/default_post.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/qt.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/moc.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/resources.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/uic.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/yacc.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/lex.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+DIST          = /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/common/unix.conf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/common/linux.conf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/qconfig.pri \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/release.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/default_post.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/qt.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/moc.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/resources.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/uic.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/yacc.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/lex.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                fapman.pro
 QMAKE_TARGET  = fapman
 DESTDIR       = 
@@ -174,63 +174,63 @@ 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-10.2010.19-1-slim/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/common/unix.conf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/common/linux.conf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/qconfig.pri \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/release.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/default_post.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/qt.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/moc.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/resources.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/uic.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/yacc.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/lex.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtMaemo5.prl \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtDBus.prl \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtXml.prl \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtCore.prl \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtGui.prl \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libphonon.prl \
-               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtNetwork.prl
-       $(QMAKE) -spec /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -unix -o Makefile fapman.pro
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/common/unix.conf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/common/linux.conf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/qconfig.pri:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/qt_config.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/default_pre.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/release.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/default_post.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/warn_on.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/qt.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/moc.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/resources.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/uic.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/yacc.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/lex.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtMaemo5.prl:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtDBus.prl:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtXml.prl:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtCore.prl:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtGui.prl:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libphonon.prl:
-/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/lib/libQtNetwork.prl:
+Makefile: fapman.pro  /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/common/unix.conf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/common/linux.conf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/qconfig.pri \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/release.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/default_post.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/qt.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/moc.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/resources.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/uic.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/yacc.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/lex.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtMaemo5.prl \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtDBus.prl \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtXml.prl \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtCore.prl \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtGui.prl \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libphonon.prl \
+               /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtNetwork.prl
+       $(QMAKE) -spec /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -unix -o Makefile fapman.pro
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/common/unix.conf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/common/linux.conf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/qconfig.pri:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/qt_config.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/default_pre.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/release.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/default_post.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/warn_on.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/qt.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/moc.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/resources.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/uic.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/yacc.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/lex.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtMaemo5.prl:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtDBus.prl:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtXml.prl:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtCore.prl:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtGui.prl:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libphonon.prl:
+/opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/lib/libQtNetwork.prl:
 qmake:  FORCE
-       @$(QMAKE) -spec /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-10.2010.19-1-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -unix -o Makefile fapman.pro
+       @$(QMAKE) -spec /opt/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1030-slim/usr/share/qt4/mkspecs/linux-g++-maemo5 -unix -o Makefile fapman.pro
 
 dist: 
        @$(CHK_DIR_EXISTS) .tmp/fapman1.0.0 || $(MKDIR) .tmp/fapman1.0.0 
@@ -259,47 +259,47 @@ compiler_moc_header_clean:
 moc_mainwindow.cpp: aaptinterface.h \
                blacklistselect.h \
                mainwindow.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/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-pr12/bin/moc $(DEFINES) $(INCPATH) packageview.h -o moc_packageview.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) packageview.h -o moc_packageview.cpp
 
 moc_filterselect.cpp: filterselect.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) filterselect.h -o moc_filterselect.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) filterselect.h -o moc_filterselect.cpp
 
 moc_confirmdialog.cpp: confirmdialog.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) confirmdialog.h -o moc_confirmdialog.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) confirmdialog.h -o moc_confirmdialog.cpp
 
 moc_dimmer.cpp: dimmer.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) dimmer.h -o moc_dimmer.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) dimmer.h -o moc_dimmer.cpp
 
 moc_repoview.cpp: repoview.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) repoview.h -o moc_repoview.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/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-pr12/bin/moc $(DEFINES) $(INCPATH) packageselector.h -o moc_packageselector.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) packageselector.h -o moc_packageselector.cpp
 
 moc_help.cpp: help.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) help.h -o moc_help.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) help.h -o moc_help.cpp
 
 moc_settings.cpp: settings.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) settings.h -o moc_settings.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/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-pr12/bin/moc $(DEFINES) $(INCPATH) aaptinterface.h -o moc_aaptinterface.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) aaptinterface.h -o moc_aaptinterface.cpp
 
 moc_repoedit.cpp: repoedit.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) repoedit.h -o moc_repoedit.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) repoedit.h -o moc_repoedit.cpp
 
 moc_logview.cpp: logview.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) logview.h -o moc_logview.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) logview.h -o moc_logview.cpp
 
 moc_sortselector.cpp: packageview.h \
                mainwindow.h \
@@ -307,19 +307,19 @@ moc_sortselector.cpp: packageview.h \
                blacklistselect.h \
                package.h \
                sortselector.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) sortselector.h -o moc_sortselector.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) sortselector.h -o moc_sortselector.cpp
 
 moc_blacklistselect.cpp: blacklistselect.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) blacklistselect.h -o moc_blacklistselect.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) blacklistselect.h -o moc_blacklistselect.cpp
 
 moc_rotatingbackground.cpp: rotatingbackground.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) rotatingbackground.h -o moc_rotatingbackground.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) rotatingbackground.h -o moc_rotatingbackground.cpp
 
 moc_searchoptions.cpp: searchoptions.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) searchoptions.h -o moc_searchoptions.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) searchoptions.h -o moc_searchoptions.cpp
 
 moc_dpkginterface.cpp: dpkginterface.h
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/moc $(DEFINES) $(INCPATH) dpkginterface.h -o moc_dpkginterface.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/moc $(DEFINES) $(INCPATH) dpkginterface.h -o moc_dpkginterface.cpp
 
 compiler_dbus_interface_source_make_all:
 compiler_dbus_interface_source_clean:
@@ -349,7 +349,7 @@ qrc_resources.cpp: resources.qrc \
                icons/upgrade.png \
                icons/remove.png \
                icons/pkg_upgrade.png
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/rcc -name resources resources.qrc -o qrc_resources.cpp
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/rcc -name resources resources.qrc -o qrc_resources.cpp
 
 compiler_image_collection_make_all: qmake_image_collection.cpp
 compiler_image_collection_clean:
@@ -369,43 +369,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-pr12/bin/uic mainwindow.ui -o ui_mainwindow.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic mainwindow.ui -o ui_mainwindow.h
 
 ui_packageview.h: packageview.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic packageview.ui -o ui_packageview.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic packageview.ui -o ui_packageview.h
 
 ui_filterselect.h: filterselect.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic filterselect.ui -o ui_filterselect.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic filterselect.ui -o ui_filterselect.h
 
 ui_confirmdialog.h: confirmdialog.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic confirmdialog.ui -o ui_confirmdialog.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic confirmdialog.ui -o ui_confirmdialog.h
 
 ui_repoview.h: repoview.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic repoview.ui -o ui_repoview.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic repoview.ui -o ui_repoview.h
 
 ui_packageselector.h: packageselector.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic packageselector.ui -o ui_packageselector.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic packageselector.ui -o ui_packageselector.h
 
 ui_help.h: help.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic help.ui -o ui_help.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic help.ui -o ui_help.h
 
 ui_settings.h: settings.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic settings.ui -o ui_settings.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic settings.ui -o ui_settings.h
 
 ui_repoedit.h: repoedit.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic repoedit.ui -o ui_repoedit.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic repoedit.ui -o ui_repoedit.h
 
 ui_logview.h: logview.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic logview.ui -o ui_logview.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic logview.ui -o ui_logview.h
 
 ui_sortselector.h: sortselector.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic sortselector.ui -o ui_sortselector.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic sortselector.ui -o ui_sortselector.h
 
 ui_blacklistselect.h: blacklistselect.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic blacklistselect.ui -o ui_blacklistselect.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic blacklistselect.ui -o ui_blacklistselect.h
 
 ui_searchoptions.h: searchoptions.ui
-       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-pr12/bin/uic searchoptions.ui -o ui_searchoptions.h
+       /opt/NokiaQtSDK/Maemo/4.6.2/targets/fremantle-1030/bin/uic searchoptions.ui -o ui_searchoptions.h
 
 compiler_yacc_decl_make_all:
 compiler_yacc_decl_clean:
@@ -428,7 +428,6 @@ mainwindow.o: mainwindow.cpp mainwindow.h \
                blacklistselect.h \
                version.h \
                ui_mainwindow.h \
-               rotatingbackground.h \
                packageview.h \
                package.h \
                confirmdialog.h \
@@ -437,6 +436,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
 
@@ -493,7 +493,8 @@ packageselector.o: packageselector.cpp packageselector.h \
                packageview.h \
                mainwindow.h \
                aaptinterface.h \
-               repository.h
+               repository.h \
+               settings.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o packageselector.o packageselector.cpp
 
 help.o: help.cpp help.h \
index 273c6e9..15411f5 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,45 +1,56 @@
+-------------------------------------------------------------------------------------
+ TODO for Faster Application Manager
+
+ Note that many of these are just random ideas, not all of them will get implemented
+-------------------------------------------------------------------------------------
+
+
 0.6.4:
 * show user/hidden category apps in the list of installed apps (remove only)
 * show "recommends" and "suggests" in package dependencies if there are any
 * check rootfs and opt free space on startup and warn if low
+* option to disable automatic catalog updates
+* option to start fetching changelogs immediately when package view is opened
+* warn about immediate conflicts when selecting a package for operation (note that this doesn't check all possible conflicts)
+* don't use hildon banner in portrait mode
+* use the proxy settings for fetching package date information and changelogs
 * switched to garage bugtracker
-- option to disable automatic catalog updates
-- add an option to start fetching changelogs immediately when package view is opened
-- require lists refresh if more than 60 min from previous refresh when opening packageview
-  (currently only checks idling time in main menu)
-- read hildon app manager repository settings (get disabled repos, correct names)
-- check dependencies when selecting packages (at least warn about conflicts)
-- update install/remove changes directly to internal package db & don't require re-reading package lists afterwards
-- use proxy settings for fetching package date information and changelogs
 
-* source code now available from garage (git)
+- move stuff away from Package class for possible speed increase
+
+* source code now available also from garage (git)
+
+
+0.6.5
+- a bugfix release (if needed)
+- promote to extras-testing
 
 
 0.7:
+- update install/remove changes directly to internal package db & don't require re-reading package lists afterwards
 - support loading .install files
 - support installing local .debs
-- mime type handling for .install and .deb
-- can ovi store .debs be installed?
+- mime type handling for .install and .deb (can it be done without conflicting HAM?)
 
 
-0.8:
+0.8 (possibly):
 - "problem solver" window/feature (find broken packages, handle recovery from broken packages better)
 
 
 later/any/uncertain:
 - don't lose package selections when returning to main menu
   (autostore/load selections - to different file than normal store)
-- 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?
+- show download speed for apt-get update
+- 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?
-- load system proxy settings (libgq-gconf)?
 - make sure network is online on startup?
 - fetch dates for other than user categories?
-- show download speed for apt-get update
-- a better blacklist editor?
-- add an option to start fetching changelogs automatically for all upgradeable packages?
 - "online search" (a new button to main menu): use maemo.org search to find packages without loading local package lists (?)
+- 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...)
 
 
 known bugs:
index b27304a..7ff8033 100644 (file)
@@ -42,6 +42,8 @@ AAptInterface::AAptInterface(QObject* parent = 0) : QObject(parent)
        iNeedDateRefresh = true;
        iNeedDpkgRefresh = true;
        iSkipRefreshListAndDates = false;
+       iLastListUpdate.setTime_t(0);
+       iLastDpkgUpdate.setTime_t(0);
 
        iProcAptGetUpdate = new QProcess(this);
        iProcAptGetSimulate = new QProcess(this);
@@ -1188,7 +1190,7 @@ void AAptInterface::startPkgListRead()
                                                QApplication::processEvents();
                                        }
                                        pkgcount_apt++;
-                                       if( newpkg )
+                                       if( newpkg )//&& !newpkg->name().isEmpty() )
                                        {
                                                newpkg->addRepository( currentRepo );
 
@@ -1214,7 +1216,10 @@ void AAptInterface::startPkgListRead()
                                                                newpkg=0;
                                                        }
                                                }
-                                       }
+                                       }/* else if( newpkg ) {
+                                               delete newpkg;
+                                               newpkg = 0;
+                                       }*/
                                }
                                db.close();
                        }
@@ -1233,6 +1238,7 @@ void AAptInterface::startPkgListRead()
 
                iNeedListRefresh = false;
                iNeedDateRefresh = true;
+               iLastListUpdate = QDateTime::currentDateTime();
        }
 
 // read dpkg database (installed packages)
@@ -1264,7 +1270,7 @@ void AAptInterface::startPkgListRead()
                        }
                        pkgcount_dpkg++;
                        if( newpkg ) {
-                               if( newpkg->isInstalled() ) {
+                               if( newpkg->isInstalled() && !newpkg->name().isEmpty() ) {
                                        iPackagesInstalled.insert(newpkg->name(), newpkg);
                                } else {
                                        delete newpkg;
@@ -1286,6 +1292,7 @@ void AAptInterface::startPkgListRead()
                        return;
                }
                iNeedDpkgRefresh = false;
+               iLastDpkgUpdate = QDateTime::currentDateTime();
        }
 
        logToFile( QString("Finished reading package lists") );
@@ -1596,6 +1603,13 @@ void AAptInterface::startFetchDates()
        }
 
        QNetworkAccessManager* nam = new QNetworkAccessManager(this);
+
+       if( iSettings->qsettings()->value("use_proxies").toBool() && iSettings->qsettings()->value("http_proxy").toString()!="" )
+       {
+                QNetworkProxy proxy = Settings::createProxyFromString( iSettings->qsettings()->value("http_proxy").toString() );
+                nam->setProxy(proxy);
+       }
+
        iCanCancel = true;
 
        int count = 0;
index ed270bc..c7f1eeb 100644 (file)
@@ -42,6 +42,7 @@ const QString KAptArchivePartialDir = "/var/cache/apt/archives/partial";
 const QString KDpkgStatusFile = "/var/lib/dpkg/status";
 const QString KDpkgInfoDir = "/var/lib/dpkg/info";
 
+const int KListExpireTime = 3600;
 
 class MainWindow;
 class FileReadThread;
@@ -96,6 +97,9 @@ public:
 
        bool loadInstallFiles(QStringList files_);
 
+       QDateTime lastListUpdate() { return iLastListUpdate; }
+       QDateTime lastDpkgUpdate() { return iLastDpkgUpdate; }
+
 private:
        void runNext();
        void cleanAfterRunEach();
@@ -166,6 +170,8 @@ private:
        bool iNeedDpkgRefresh;
        bool iNeedDateRefresh;
        bool iSkipRefreshListAndDates;
+       QDateTime iLastListUpdate;
+       QDateTime iLastDpkgUpdate;
 
        QProcess* iProcAptGetUpdate;
        QProcess* iProcAptGetSimulate;
index bed6421..f8f9194 100644 (file)
@@ -2,7 +2,7 @@ fapman (0.6.4-1) unstable; urgency=low
 
   *
 
- -- Heikki Holstila <heikki.holstila@gmail.com>  Wed, 11 Aug 2010 17:22:50 +0300
+ -- Heikki Holstila <heikki.holstila@gmail.com>  Wed, 18 Aug 2010 17:35:44 +0300
 
 fapman (0.6.3-1) unstable; urgency=low
 
diff --git a/fapman b/fapman
index c308f21..ea1f22c 100755 (executable)
Binary files a/fapman and b/fapman differ
index 51aa091..f99500f 100644 (file)
@@ -34,7 +34,7 @@
      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoPackageCreationStep</value>
      <valuelist key="Qt4ProjectManager.BuildStep.MaemoPackage.LocalFiles" type="QVariantList"/>
-     <value key="Qt4ProjectManager.BuildStep.MaemoPackage.Modified" type="bool">false</value>
+     <value key="Qt4ProjectManager.BuildStep.MaemoPackage.Modified" type="bool">true</value>
      <value key="Qt4ProjectManager.BuildStep.MaemoPackage.RemoteExe" type="QString">/usr/local/bin/fapman</value>
      <valuelist key="Qt4ProjectManager.BuildStep.MaemoPackage.RemoteFiles" type="QVariantList"/>
     </valuemap>
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/heikki/Projects/fapman-build-maemo</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">7</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/scratchbox/users/heikki/home/heikki/fapman-build-maemo</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">9</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">9</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
    </valuemap>
    <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
@@ -96,8 +96,8 @@
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Release</value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/heikki/Projects/fapman-build-maemo</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">7</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/scratchbox/users/heikki/home/heikki/fapman-build-maemo</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">9</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">9</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
    </valuemap>
     <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/heikki/Projects/fapman-build-simulator</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">6</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/scratchbox/users/heikki/home/heikki/fapman-build-simulator</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
    </valuemap>
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Release</value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/heikki/Projects/fapman-build-simulator</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">6</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/scratchbox/users/heikki/home/heikki/fapman-build-simulator</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
    </valuemap>
diff --git a/fapman.pro.user.1.3 b/fapman.pro.user.1.3
new file mode 100644 (file)
index 0000000..e69de29
index 8fa98fd..5e01956 100644 (file)
@@ -142,8 +142,6 @@ MainWindow::MainWindow(QWidget *parent) :
        iMediaObject = new Phonon::MediaObject(this);
        Phonon::AudioOutput* aout = new Phonon::AudioOutput(Phonon::NotificationCategory, this);
        Phonon::createPath(iMediaObject, aout);
-
-       resetIdlingTime();
 }
 
 MainWindow::~MainWindow()
@@ -227,12 +225,17 @@ void MainWindow::on_btnListInstallable_clicked()
 {
        //install
 
-       if( iIdlingSince < QDateTime::currentDateTime().addSecs(-30*60) )
-               iAptInterface->setNeedRefresh(-1,1,1,1);
+       int listupd = -1;
+       int dpkgupd = -1;
+       if( iAptInterface->lastListUpdate() < QDateTime::currentDateTime().addSecs(-KListExpireTime) )
+               listupd = 1;
+       if( iAptInterface->lastDpkgUpdate() < QDateTime::currentDateTime().addSecs(-KListExpireTime) )
+               dpkgupd = 1;
+       iAptInterface->setNeedRefresh(-1,listupd,dpkgupd,listupd);
 
        iWinPackageView->setStatFilter( Package::PkgStatNotInstalled );
 
-       if( iAptInterface->needRepoRefresh() )
+       if( iAptInterface->needRepoRefresh() && !iSettings->qsettings()->value("no_catalogs_autoupdate",false).toBool() )
                iAptInterface->addQueuedOperation(AAptInterface::ModeAptGetUpdate);
 
        busyDialog(true, tr("Operation in progress"), tr("Reading package lists"));
@@ -249,12 +252,17 @@ void MainWindow::on_btnUpgrade_clicked()
 {
        // upgrade
 
-       if( iIdlingSince < QDateTime::currentDateTime().addSecs(-30*60) )
-               iAptInterface->setNeedRefresh(-1,1,1,1);
+       int listupd = -1;
+       int dpkgupd = -1;
+       if( iAptInterface->lastListUpdate() < QDateTime::currentDateTime().addSecs(-KListExpireTime) )
+               listupd = 1;
+       if( iAptInterface->lastDpkgUpdate() < QDateTime::currentDateTime().addSecs(-KListExpireTime) )
+               dpkgupd = 1;
+       iAptInterface->setNeedRefresh(-1,listupd,dpkgupd,listupd);
 
        iWinPackageView->setStatFilter( Package::PkgStatUpgradeable );
 
-       if( iAptInterface->needRepoRefresh() )
+       if( iAptInterface->needRepoRefresh() && !iSettings->qsettings()->value("no_catalogs_autoupdate",false).toBool() )
                iAptInterface->addQueuedOperation(AAptInterface::ModeAptGetUpdate);
 
        busyDialog(true, tr("Operation in progress"), tr("Reading package lists"));
@@ -274,8 +282,10 @@ void MainWindow::on_btnListInstalled_clicked()
        if( !iSettings->qsettings()->value("remove_readfull",false).toBool() )
                iAptInterface->setSkipListAndDates();
 
-       if( iIdlingSince < QDateTime::currentDateTime().addSecs(-30*60) )
-               iAptInterface->setNeedRefresh(-1,-1,1,-1);
+       int dpkgupd = -1;
+       if( iAptInterface->lastDpkgUpdate() < QDateTime::currentDateTime().addSecs(-KListExpireTime) )
+               dpkgupd = 1;
+       iAptInterface->setNeedRefresh(-1,-1,dpkgupd,-1);
 
        iWinPackageView->setStatFilter( Package::PkgStatInstalled );
 
@@ -449,11 +459,19 @@ void MainWindow::operationQueueFinished(QList<AAptInterface::interfaceMode> last
                }
 
                QString text = "<br><b><u>Faster Application Manager</u></b><br>"
-                               "<b>"+title+"</b><br>" + msgs.join("<br>") + "<br>";
+                                          "<b>"+title+"</b><br>" + msgs.join("<br>") + "<br>";
 
+               QRect r = QApplication::desktop()->rect();
+               if(r.width() < r.height()) {
+                       ConfirmDialog d(false, this);
+                       d.setText(title,msgs.join("<br>"));
+                       d.exec();
+               } else {
 #ifdef Q_WS_MAEMO_5
-               QMaemo5InformationBox::information(0, text, QMaemo5InformationBox::NoTimeout);
+                       QMaemo5InformationBox::information(0, text, QMaemo5InformationBox::NoTimeout);
 #endif
+               }
+
        }
 
 }
index b7dfcb7..1114354 100644 (file)
@@ -55,7 +55,6 @@ public:
        void GdkEventIconThemeReload();
        void notifyDialog(QString title, QString msg);
        bool confirmDialog(QString title, QString msg);
-       void resetIdlingTime() { iIdlingSince = QDateTime::currentDateTime(); }
        void setNextOperation(nextOperation op_) { iNextOperation=op_; }
 
 public slots:
@@ -84,8 +83,6 @@ private:
        nextOperation iNextOperation;
        Phonon::MediaObject* iMediaObject;
 
-       QDateTime iIdlingSince;
-
 private slots:
        void on_actionLoad_file_triggered();
        void on_actionOptions_triggered();
index 233cb3a..19ba186 100644 (file)
 #include "apt-src/debversion.h"
 #include "blacklistselect.h"
 
-Package::Package(QByteArray name_, AAptInterface *apt_)
+Package::Package(QByteArray name_, AAptInterface *apt_):
+               iAptInterface(apt_), iName(name_), iIsInstalled(false), iMarkedForOperation(false),
+               iPkgStatus(PkgStatUnknown), iSize(0), iInstalledSize(0), iMarkedOperation(PkgOpNone),
+               iBlacklist(BlacklistSelect::BlacklistNone), iIcon(0)
 {
-       iAptInterface = apt_;
-       iName = name_;
-       iIsInstalled = false;
-       iMarkedForOperation = false;
-       iSize = 0;
-       iInstalledSize = 0;
-       iMarkedOperation = PkgOpNone;
-       iPkgStatus = PkgStatUnknown;
-       iIcon = 0;
-       iBlacklist = BlacklistSelect::BlacklistNone;
 }
 
 Package::~Package()
@@ -170,165 +163,97 @@ bool Package::versionCompare(QString isNewer, QString compare)
        return false;
 }
 
-void Package::appendDepends(QByteArray line_)
+QStringList Package::toTrimmedRichTextList(QList<QByteArray> list_in)
 {
-       iDepends << line_.split(',');
-}
-
-void Package::appendConflicts(QByteArray line_)
-{
-       iConflicts << line_.split(',');
-}
-
-void Package::appendPreDepends(QByteArray line_)
-{
-       iPreDepends << line_.split(',');
-}
-
-void Package::appendProvides(QByteArray line_)
-{
-       iProvides << line_.split(',');
-}
-
-void Package::appendReplaces(QByteArray line_)
-{
-       iReplaces << line_.split(',');
-}
-
-void Package::appendBreaks(QByteArray line_)
-{
-       iBreaks << line_.split(',');
-}
-
-void Package::appendRecommends(QByteArray line_)
-{
-       iRecommends << line_.split(',');
-}
-
-void Package::appendSuggests(QByteArray line_)
-{
-       iSuggests << line_.split(',');
-}
-
-QStringList Package::dependsRichText()
-{
-       //qDebug() << iName;
-       //qDebug() << iDepends;
+       QStringList list_out;
 
-       QStringList list;
-
-       for(int i=0; i<iDepends.count(); i++)
+       for(int i=0; i<list_in.count(); i++)
        {
-               QString s = iDepends.at(i).trimmed();
+               QString s = list_in.at(i).trimmed();
                s.replace('<',"&lt;");
                s.replace('>',"&gt;");
-               list << s;
+               list_out << s;
        }
 
-       return list;
+       return list_out;
 }
 
-QStringList Package::conflictsRichText()
+QStringList Package::checkConflicts_RichText()
 {
        QStringList list;
 
+       if( iConflicts.count() == 0 )
+               return list;
+
        for(int i=0; i<iConflicts.count(); i++)
        {
                QString s = iConflicts.at(i).trimmed();
-               s.replace('<',"&lt;");
-               s.replace('>',"&gt;");
-               list << s;
-       }
-
-       return list;
-}
-
-QStringList Package::preDependsRichText()
-{
-       QStringList list;
-
-       for(int i=0; i<iPreDepends.count(); i++)
-       {
-               QString s = iPreDepends.at(i).trimmed();
-               s.replace('<',"&lt;");
-               s.replace('>',"&gt;");
-               list << s;
-       }
-
-       return list;
-}
-
-QStringList Package::providesRichText()
-{
-       QStringList list;
-
-       for(int i=0; i<iProvides.count(); i++)
-       {
-               QString s = iProvides.at(i).trimmed();
-               s.replace('<',"&lt;");
-               s.replace('>',"&gt;");
-               list << s;
-       }
-
-       return list;
-}
-
-QStringList Package::replacesRichText()
-{
-       QStringList list;
-
-       for(int i=0; i<iReplaces.count(); i++)
-       {
-               QString s = iReplaces.at(i).trimmed();
-               s.replace('<',"&lt;");
-               s.replace('>',"&gt;");
-               list << s;
-       }
-
-       return list;
-}
-
-QStringList Package::breaksRichText()
-{
-       QStringList list;
-
-       for(int i=0; i<iBreaks.count(); i++)
-       {
-               QString s = iBreaks.at(i).trimmed();
-               s.replace('<',"&lt;");
-               s.replace('>',"&gt;");
-               list << s;
-       }
-
-       return list;
-}
+               QString name = s;
+               QString ver = "";
+               int pos = s.indexOf('(');
+               bool confl = false;
+               if( pos != -1 ) {
+                       name = s.left(pos).trimmed();
+                       ver = s.mid(pos).trimmed();
+               }
+               Package* p_inst = iAptInterface->packagesInstalled()->value(name,0);
+               Package* p_avail = iAptInterface->packagesAvailable()->value(name,0);
 
-QStringList Package::recommendsRichText()
-{
-       QStringList list;
+               if( p_inst && p_inst->isInstalled() ) {
+                       confl = versionConflicts(ver, p_inst->version());
+               }
+               if( p_avail && p_avail->markedOperation()==Package::PkgOpInstallUpgrade ) {
+                       if( !confl )
+                               confl = versionConflicts(ver, p_avail->version());
+               }
 
-       for(int i=0; i<iRecommends.count(); i++)
-       {
-               QString s = iRecommends.at(i).trimmed();
-               s.replace('<',"&lt;");
-               s.replace('>',"&gt;");
-               list << s;
+               if( confl )
+               {
+                       qDebug() << "package" << iName << "conflicts:" << name << ver;
+                       s.replace('<',"&lt;");
+                       s.replace('>',"&gt;");
+                       list << s;
+               }
        }
 
        return list;
 }
 
-QStringList Package::suggestsRichText()
+bool Package::versionConflicts(QString conflictVer, QString operVer)
 {
-       QStringList list;
+       if( conflictVer=="" )
+               return true;
 
-       for(int i=0; i<iSuggests.count(); i++)
-       {
-               QString s = iSuggests.at(i).trimmed();
-               s.replace('<',"&lt;");
-               s.replace('>',"&gt;");
-               list << s;
+       bool confl = false;
+       conflictVer.remove('(');
+       conflictVer.remove(')');
+
+       if( conflictVer.startsWith("<<") ) {
+               conflictVer = conflictVer.mid(2).trimmed();
+               int res = debVS.CmpVersion(conflictVer.toStdString(), operVer.toStdString());
+               if( res < 0 )
+                       confl = true;
+       } else if( conflictVer.startsWith("<=") ) {
+               conflictVer = conflictVer.mid(2).trimmed();
+               int res = debVS.CmpVersion(conflictVer.toStdString(), operVer.toStdString());
+               if( res <= 0 )
+                       confl = true;
+       } else if( conflictVer.startsWith("=") ) {
+               conflictVer = conflictVer.mid(1).trimmed();
+               int res = debVS.CmpVersion(conflictVer.toStdString(), operVer.toStdString());
+               if( res == 0 )
+                       confl = true;
+       } else if( conflictVer.startsWith(">=") ) {
+               conflictVer = conflictVer.mid(2).trimmed();
+               int res = debVS.CmpVersion(conflictVer.toStdString(), operVer.toStdString());
+               if( res >= 0 )
+                       confl = true;
+       } else if( conflictVer.startsWith(">>") ) {
+               conflictVer = conflictVer.mid(2).trimmed();
+               int res = debVS.CmpVersion(conflictVer.toStdString(), operVer.toStdString());
+               if( res > 0 )
+                       confl = true;
        }
 
-       return list;
+       return confl;
 }
index cc721fb..fa0eafb 100644 (file)
--- a/package.h
+++ b/package.h
@@ -36,71 +36,77 @@ public:
 
        Package(QByteArray name_, AAptInterface* apt_);
        ~Package();
-       void setName(QByteArray n_) { iName=n_; }
-       void setMaemoDisplayName(QByteArray n_) { iMaemoDisplayName=n_; }
-       void setInstalled(bool i_) { iIsInstalled=i_; }
+       inline void setName(QByteArray n_) { iName=n_; }
+       inline void setMaemoDisplayName(QByteArray n_) { iMaemoDisplayName=n_; }
+       inline void setInstalled(bool i_) { iIsInstalled=i_; }
        void setMarkedForOperation(operation op_);
-       void setVersion(QByteArray v_) { iVersion=v_; }
-       void setDescShort(QByteArray d_) { iDescriptionShort=d_; }
-       void appendDescLong(QByteArray d_) { iDescriptionLong.append(d_); }
-       void setSection(QByteArray s_) { iSection=s_; }
-       void setSize(int i_) { iSize=i_; }
-       void setInstalledSize(int i_) { iInstalledSize=i_; }
-       void appendIconData(QByteArray d_) { iIconData.append(d_); }
-       void addFullFileName(QString f_) { iFullFileNames.append(f_); }
+       inline void setVersion(QByteArray v_) { iVersion=v_; }
+       inline void setDescShort(QByteArray d_) { iDescriptionShort=d_; }
+       inline void appendDescLong(QByteArray d_) { iDescriptionLong.append(d_); }
+       inline void setSection(QByteArray s_) { iSection=s_; }
+       inline void setSize(int i_) { iSize=i_; }
+       inline void setInstalledSize(int i_) { iInstalledSize=i_; }
+       inline void appendIconData(QByteArray d_) { iIconData.append(d_); }
+       inline void addFullFileName(QString f_) { iFullFileNames.append(f_); }
        void updateStatus();
-       void addRepository(Repository* r_) { iRepositories.append(r_); }
-       void setDate(QDateTime d_) { iDate=d_; }
-       void setBlacklisted(BlacklistSelect::blackList bl_) { iBlacklist=bl_; }
-       void appendDepends(QByteArray line_);
-       void appendConflicts(QByteArray line_);
-       void appendPreDepends(QByteArray line_);
-       void appendProvides(QByteArray line_);
-       void appendReplaces(QByteArray line_);
-       void appendBreaks(QByteArray line_);
-       void appendRecommends(QByteArray line_);
-       void appendSuggests(QByteArray line_);
-       void appendUpgradeDescription(QByteArray d_) { iUpgradeDescription.append(d_); }
+       inline void addRepository(Repository* r_) { iRepositories.append(r_); }
+       inline void setDate(QDateTime d_) { iDate=d_; }
+       inline void setBlacklisted(BlacklistSelect::blackList bl_) { iBlacklist=bl_; }
+       inline void appendDepends(QByteArray line_) { iDepends << line_.split(','); }
+       inline void appendConflicts(QByteArray line_) { iConflicts << line_.split(','); }
+       inline void appendPreDepends(QByteArray line_) { iPreDepends << line_.split(','); }
+       inline void appendProvides(QByteArray line_) { iProvides << line_.split(','); }
+       inline void appendReplaces(QByteArray line_) { iReplaces << line_.split(','); }
+       inline void appendBreaks(QByteArray line_) { iBreaks << line_.split(','); }
+       inline void appendRecommends(QByteArray line_) { iRecommends << line_.split(','); }
+       inline void appendSuggests(QByteArray line_) { iSuggests << line_.split(','); }
+       inline void appendUpgradeDescription(QByteArray d_) { iUpgradeDescription.append(d_); }
 
        void convertIcon();
 
-       QString name() { return iName; }
-       QString maemoDisplayName() { return QString::fromUtf8(iMaemoDisplayName); }
+       inline QString name() { return iName; }
+       inline QString maemoDisplayName() { return QString::fromUtf8(iMaemoDisplayName); }
        QString displayName();
-       bool isInstalled() { return iIsInstalled; }
-       bool isMarkedForOperation() { return iMarkedForOperation; }
-       operation markedOperation() { return iMarkedOperation; }
-       QString version() { return iVersion; }
-       QString descShort() { return QString::fromUtf8(iDescriptionShort); }
-       QString descLong() { return QString::fromUtf8(iDescriptionLong); }
-       QString section() { return iSection; }
-       int size() { return iSize; }
-       int installedSize() { return iInstalledSize; }
-       QPixmap* icon() { return iIcon; }
+       inline bool isInstalled() { return iIsInstalled; }
+       inline bool isMarkedForOperation() { return iMarkedForOperation; }
+       inline operation markedOperation() { return iMarkedOperation; }
+       inline QString version() { return iVersion; }
+       inline QString descShort() { return QString::fromUtf8(iDescriptionShort); }
+       inline QString descLong() { return QString::fromUtf8(iDescriptionLong); }
+       inline QString section() { return iSection; }
+       inline int size() { return iSize; }
+       inline int installedSize() { return iInstalledSize; }
+       inline QPixmap* icon() { return iIcon; }
        bool hasIconData();
        bool isUpgradeable();
        QString upgradeableVersion();
        Package* availablePackage();
        packageStatus status();
        QString fileName();
-       QStringList fullFileNames() { return iFullFileNames; }
-       QDateTime date() { return iDate; }
-       QList<Repository*> repositories() { return iRepositories; }
-       BlacklistSelect::blackList blacklisted() { return iBlacklist; }
-       bool isBlacklisted() { if(iBlacklist==BlacklistSelect::BlacklistNone) return false; else return true; }
-       QStringList dependsRichText();
-       QStringList conflictsRichText();
-       QStringList preDependsRichText();
-       QStringList providesRichText();
-       QStringList replacesRichText();
-       QStringList breaksRichText();
-       QStringList recommendsRichText();
-       QStringList suggestsRichText();
-       QString upgradeDescription() { return QString::fromUtf8(iUpgradeDescription); }
+       inline QStringList fullFileNames() { return iFullFileNames; }
+       inline QDateTime date() { return iDate; }
+       inline QList<Repository*> repositories() { return iRepositories; }
+       inline BlacklistSelect::blackList blacklisted() { return iBlacklist; }
+       inline bool isBlacklisted() { if(iBlacklist==BlacklistSelect::BlacklistNone) return false; else return true; }
+       inline QString upgradeDescription() { return QString::fromUtf8(iUpgradeDescription); }
+       inline QList<QByteArray> depends() { return iDepends; }
+       inline QList<QByteArray> conflicts() { return iConflicts; }
+       inline QList<QByteArray> preDepends() { return iPreDepends; }
+       inline QList<QByteArray> provides() { return iProvides; }
+       inline QList<QByteArray> replaces() { return iReplaces; }
+       inline QList<QByteArray> breaks() { return iBreaks; }
+       inline QList<QByteArray> recommends() { return iRecommends; }
+       inline QList<QByteArray> suggests() { return iSuggests; }
+
+       QStringList checkConflicts_RichText();
 
        static bool versionCompare(QString isNewer, QString compare);
+       static QStringList toTrimmedRichTextList(QList<QByteArray> list_in);
 
 private:
+
+       static bool versionConflicts(QString conflictVer, QString operVer);
+
        AAptInterface* iAptInterface;
 
        QByteArray iName;
index a8561ed..392189a 100644 (file)
 #include "repository.h"
 #include "blacklistselect.h"
 #include "aaptinterface.h"
+#include "settings.h"
 
-PackageSelector::PackageSelector(Package* pkg, AAptInterface* apt, QWidget *parent) :
+PackageSelector::PackageSelector(Package* pkg, AAptInterface* apt, Settings* set, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::PackageSelector)
 {
     ui->setupUi(this); 
        iPkg = pkg;
        iAptInterface = apt;
+       iSettings = set;
        iNetworkAccessManager = 0;
        iChangelogFetched = false;
+       iFetchInProgress = false;
        iChangelog = "";
 
        ui->pushButton_website->setIcon(QPixmap("/usr/share/icons/hicolor/48x48/hildon/general_web.png"));
@@ -101,12 +104,20 @@ PackageSelector::PackageSelector(Package* pkg, AAptInterface* apt, QWidget *pare
                ui->label_statusicon->setPixmap(QPixmap(":/icons/icons/pkg_remove.png"));
                ui->radioRemove->setChecked(true);
        }
+
+       if( getMaemoOrgUrl(upg_pkg)!="" && !iChangelogFetched && !iFetchInProgress &&
+               iSettings->qsettings()->value("always_fetch_changes",false).toBool() )
+       {
+               queryChangelog();
+       }
 }
 
 PackageSelector::~PackageSelector()
 {
-       delete iNetworkAccessManager;
-       iNetworkAccessManager = 0;
+       if( iNetworkAccessManager ) {
+               delete iNetworkAccessManager;
+               iNetworkAccessManager = 0;
+       }
     delete ui;
 }
 
@@ -405,12 +416,14 @@ void PackageSelector::on_radioTabChanges_clicked()
        }
 
        QString changelog;
-       if( getMaemoOrgUrl(upg_pkg)!="" && !iChangelogFetched ) {
+       if( getMaemoOrgUrl(upg_pkg)!="" && !iChangelogFetched && !iFetchInProgress ) {
                queryChangelog();
                changelog = "Fetching changelog...";
        } else {
                changelog = iChangelog;
-               if( changelog == "" )
+               if( iFetchInProgress )
+                       changelog = "Fetching changelog...";
+               else if( changelog == "" )
                        changelog = "Not available";
        }
 
@@ -427,14 +440,14 @@ void PackageSelector::on_radioTabDepends_clicked()
        ui->label_header2->setText("");
        ui->label_text->setText("");
 
-       QStringList deps = iPkg->dependsRichText();
-       QStringList confl = iPkg->conflictsRichText();
-       QStringList predeps = iPkg->preDependsRichText();
-       QStringList repl = iPkg->replacesRichText();
-       QStringList prov = iPkg->providesRichText();
-       QStringList brks = iPkg->breaksRichText();
-       QStringList recs = iPkg->recommendsRichText();
-       QStringList sugs = iPkg->suggestsRichText();
+       QStringList deps = Package::toTrimmedRichTextList( iPkg->depends() );
+       QStringList confl = Package::toTrimmedRichTextList( iPkg->conflicts() );
+       QStringList predeps = Package::toTrimmedRichTextList( iPkg->preDepends() );
+       QStringList repl = Package::toTrimmedRichTextList( iPkg->replaces() );
+       QStringList prov = Package::toTrimmedRichTextList( iPkg->provides() );
+       QStringList brks = Package::toTrimmedRichTextList( iPkg->breaks() );
+       QStringList recs = Package::toTrimmedRichTextList( iPkg->recommends() );
+       QStringList sugs = Package::toTrimmedRichTextList( iPkg->suggests() );
 
        QString text;
 
@@ -505,10 +518,11 @@ void PackageSelector::on_radioTabDepends_clicked()
 
 void PackageSelector::queryChangelog()
 {
-       if( iChangelogFetched )
+       if( iChangelogFetched || iFetchInProgress )
                return;
 
        iChangelogFetched = false;
+       iFetchInProgress = true;
        iChangelog = "";
 
        Package* pkg = iPkg->availablePackage();
@@ -523,6 +537,12 @@ void PackageSelector::queryChangelog()
        if( !iNetworkAccessManager ) {
                iNetworkAccessManager = new QNetworkAccessManager(this);
                connect(iNetworkAccessManager,SIGNAL(finished(QNetworkReply*)),this,SLOT(changelogFetchNetworkReply(QNetworkReply*)));
+
+               if( iSettings->qsettings()->value("use_proxies").toBool() && iSettings->qsettings()->value("http_proxy").toString()!="" )
+               {
+                        QNetworkProxy proxy = Settings::createProxyFromString( iSettings->qsettings()->value("http_proxy").toString() );
+                        iNetworkAccessManager->setProxy(proxy);
+               }
        }
 
        QUrl url( getMaemoOrgUrl(pkg) );
@@ -542,18 +562,20 @@ void PackageSelector::changelogFetchNetworkReply(QNetworkReply* reply)
                int pos2 = data.indexOf("</div>", pos);
 
                if( pos!=-1 && pos2!=-1 ) {
-                       iChangelog = parseChangeTable( data.mid(pos,pos2-pos+6) );
+                       iChangelog = parseChangeTable( QString::fromUtf8( data.mid(pos,pos2-pos+6) ) );
                } else {
                        iChangelog = "";
                }
 
-               iChangelogFetched = true;
                qDebug() << "changelog fetched";
        } else {
+               iChangelog = "Not available (Network error)";
                qDebug() << "changelog fetch error:" << reply->error() << reply->errorString();
        }
 
        reply->deleteLater();
+       iFetchInProgress = false;
+       iChangelogFetched = true;
 
        if( this->isVisible() && ui->radioTabChanges->isChecked() )
                on_radioTabChanges_clicked();
index 775b327..ef37ee1 100644 (file)
@@ -29,13 +29,14 @@ namespace Ui {
 }
 
 class AAptInterface;
+class Settings;
 
 class PackageSelector : public QDialog
 {
     Q_OBJECT
 
 public:
-       explicit PackageSelector(Package* pkg, AAptInterface* apt, QWidget *parent);
+       explicit PackageSelector(Package* pkg, AAptInterface* apt, Settings* set, QWidget *parent);
     ~PackageSelector();
 
 #ifdef Q_WS_MAEMO_5            // workaround for buggy Qt autorotation
@@ -63,8 +64,10 @@ private:
     Ui::PackageSelector *ui;
        Package* iPkg;
        AAptInterface* iAptInterface;
+       Settings* iSettings;
        QNetworkAccessManager* iNetworkAccessManager;
        bool iChangelogFetched;
+       bool iFetchInProgress;
        QString iChangelog;
 
 private slots:
index c0fe01b..6ca121f 100644 (file)
@@ -648,11 +648,24 @@ void PackageView::on_listWidget_itemClicked(QListWidgetItem* item)
        if( upg_pkg )
                bl_u = upg_pkg->isBlacklisted();
 
-       PackageSelector s(pkg, iAptInterface, this);
+       PackageSelector s(pkg, iAptInterface, iSettings, this);
        s.exec();
+       Package::operation op = s.selectedOperation();
 
-       pkg->setMarkedForOperation( s.selectedOperation() );
-       item->setData(UserRoleMarked, (int)s.selectedOperation());
+       QStringList confl = pkg->checkConflicts_RichText();
+       if( confl.count() > 0 && op != Package::PkgOpNone ) {
+               ConfirmDialog d(true, this);
+               QString t = "Package " + pkg->name() + " conflicts with another installed or marked package. Mark anyway?";
+               t += "<font size=\"-1\"><br><br>Conflicts: ";
+               t += confl.join(", ");
+               t += "</font>";
+               d.setText("Conflicting packages", t);
+               if( !d.exec() )
+                       op = Package::PkgOpNone;
+       }
+
+       pkg->setMarkedForOperation( op );
+       item->setData( UserRoleMarked, (int)op );
        updateLabel();
 
        if( pkg->isBlacklisted() != bl ) {
@@ -745,7 +758,7 @@ void PackageView::on_btn_StatusFilter_clicked()
                        iMainWindow->setNextOperation(MainWindow::OpOpenPkgView);
                        iMainWindow->busyDialog(true,"Operation in progress","Reading the rest of the package lists");
 
-                       if( iAptInterface->needRepoRefresh() )
+                       if( iAptInterface->needRepoRefresh() && !iSettings->qsettings()->value("no_catalogs_autoupdate",false).toBool() )
                                iAptInterface->addQueuedOperation(AAptInterface::ModeAptGetUpdate);
 
                        iAptInterface->addQueuedOperation(AAptInterface::ModeReadPackages);
@@ -757,8 +770,6 @@ void PackageView::on_btn_StatusFilter_clicked()
 
 void PackageView::resetWindow()
 {
-       iMainWindow->resetIdlingTime();
-
        iAptInterface->writeBlacklist();
 
        ui->btn_StatusFilter->setEnabled(true);
index 78f1742..430eaa8 100644 (file)
@@ -61,8 +61,8 @@ void RepoEdit::changeEvent(QEvent *e)
 
 void RepoEdit::on_btn_OK_clicked()
 {
-               iRepo->set( ui->lineEdit_name->text(), ui->lineEdit_url->text(),
-                                       ui->lineEdit_dist->text(), ui->lineEdit_components->text(),
+               iRepo->set( ui->lineEdit_name->text().trimmed(), ui->lineEdit_url->text().trimmed(),
+                                       ui->lineEdit_dist->text().trimmed(), ui->lineEdit_components->text().trimmed(),
                                        ui->checkBox_Enabled->isChecked() );
 
                accept();
index c26a96c..d8f826a 100644 (file)
@@ -17,6 +17,7 @@
        (C) Heikki Holstila 2010
 */
 
+#include <QtNetwork>
 #include "settings.h"
 #include "ui_settings.h"
 #include "mainwindow.h"
@@ -61,6 +62,8 @@ void Settings::openWin()
        ui->checkBox_autoremove->setChecked( iQSettings->value("enable_autoremove", true).toBool() );
        ui->checkBox_autoclean->setChecked( iQSettings->value("enable_autoclean", true).toBool() );
        ui->checkBox_remove_readfull->setChecked( iQSettings->value("remove_readfull", false).toBool() );
+       ui->checkBox_no_catalogs_autoupdate->setChecked( iQSettings->value("no_catalogs_autoupdate",false).toBool() );
+       ui->checkBox_always_fetch_changes->setChecked( iQSettings->value("always_fetch_changes",false).toBool() );
 
        ui->checkBox_proxies->setChecked( iQSettings->value("use_proxies", false).toBool() );
        ui->lineEdit_http_proxy->setText( iQSettings->value("http_proxy","").toString() );
@@ -88,10 +91,12 @@ void Settings::on_btn_OK_clicked()
        iQSettings->setValue("enable_autoremove", ui->checkBox_autoremove->isChecked() );
        iQSettings->setValue("enable_autoclean", ui->checkBox_autoclean->isChecked() );
        iQSettings->setValue("remove_readfull", ui->checkBox_remove_readfull->isChecked() );
+       iQSettings->setValue("no_catalogs_autoupdate", ui->checkBox_no_catalogs_autoupdate->isChecked() );
+       iQSettings->setValue("always_fetch_changes", ui->checkBox_always_fetch_changes->isChecked() );
 
        iQSettings->setValue("use_proxies", ui->checkBox_proxies->isChecked() );
-       iQSettings->setValue("http_proxy", ui->lineEdit_http_proxy->text() );
-       iQSettings->setValue("https_proxy", ui->lineEdit_https_proxy->text() );
+       iQSettings->setValue("http_proxy", ui->lineEdit_http_proxy->text().trimmed() );
+       iQSettings->setValue("https_proxy", ui->lineEdit_https_proxy->text().trimmed() );
 
        iQSettings->setValue("default_sort_order", ui->comboBox_sortorder->currentIndex() );
 
@@ -145,3 +150,54 @@ void Settings::on_pushButton_searchOptions_clicked()
                                                                           s.searchDescShort(), s.searchDescLong() );
        }
 }
+
+QNetworkProxy Settings::createProxyFromString(QString proxystr)
+{
+       proxystr = proxystr.trimmed();
+       QString hostname = "";
+       quint16 port = 8080;
+       QString user;
+       QString pass;
+
+       QString proto;
+       int pos_proto = proxystr.indexOf("://");
+       if( pos_proto != -1 )
+       {
+               proto = proxystr.left(pos_proto+3);
+               proxystr = proxystr.mid(pos_proto+3);
+       }
+
+       QString temp;
+       QString temp2;
+       int pos_half = proxystr.indexOf('@');
+       if( pos_half==-1 ) {
+               temp = proxystr;
+       } else {
+               temp = proxystr.mid(pos_half+1);
+               temp2 = proxystr.left(pos_half);
+       }
+
+       if( !temp2.isNull() ) {
+               int pos_pass = temp2.indexOf(':');
+               if( pos_pass==-1 ) {
+                       user = temp2;
+               } else {
+                       user = temp2.left(pos_pass);
+                       pass = temp2.mid(pos_pass+1);
+               }
+       }
+
+       int pos_port = temp.indexOf(':');
+       if( pos_port==-1 ) {
+               hostname = temp;
+       } else {
+               hostname = temp.left(pos_port);
+               port = temp.mid(pos_port+1).remove('/').toInt();
+       }
+
+       hostname = proto + hostname;
+       qDebug() << "creating proxy" << hostname << port << user << pass;
+
+       QNetworkProxy p(QNetworkProxy::HttpProxy, hostname, port, user, pass);
+       return p;
+}
index 3a696fa..8725f71 100644 (file)
@@ -21,6 +21,7 @@
 #define SETTINGS_H
 
 #include <QtGui>
+#include <QtNetwork>
 
 class AAptInterface;
 class PackageView;
@@ -57,6 +58,8 @@ public:
 
        QSettings* qsettings() { return iQSettings; }
 
+       static QNetworkProxy createProxyFromString(QString proxystr);
+
 protected:
     void changeEvent(QEvent *e);
 
index b612d3c..2af57c6 100644 (file)
@@ -123,6 +123,22 @@ after successful installation</string>
           </widget>
          </item>
          <item>
+          <widget class="QCheckBox" name="checkBox_no_catalogs_autoupdate">
+           <property name="text">
+            <string>Don't auto-update catalogs
+(not recommended)</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="checkBox_always_fetch_changes">
+           <property name="text">
+            <string>Always fetch changelogs when viewing
+package info</string>
+           </property>
+          </widget>
+         </item>
+         <item>
           <widget class="Line" name="line">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
index add306b..971b1a6 100755 (executable)
@@ -1,2 +1,3 @@
 #!/bin/sh
-ver=`pwd | cut -d - -f 2-`; echo "const QString PROGRAM_VERSION=\"$ver\";" > version.h
+ver=`cat debian/changelog | sed -n -e '1p'| cut -d ' ' -f 2 | tr -d "()" | cut -d '-' -f 1`
+echo "const QString PROGRAM_VERSION=\"$ver\";" > version.h