Some more changes for NS2

updated toplevel Makefile

added new target  packages-mt and packages

these replaces, render obsolete and dramatically improve : ipks ipks-mt
see separate mail

8 files changed, 352 insertions, 129 deletions

diff --git a/Makefile b/Makefile
index a1fc32c..89c3470 100644
--- a/Makefile
+++ b/Makefile
@@ -133,4 +133,18 @@ mrproper : clean-configs
 	find plugins -name "lib*.*"|xargs rm -f
 	find . -name "*.pro"|xargs touch
 
 include $(TOPDIR)/Rules.make
+
+# to speed up (avoid include/generation of packaging rules)
+ifneq ($(filter package%,$(MAKECMDGOALS)),)
+
+# packaging requested
+
+$(TOPDIR)/Package.make :
+	@echo "Generating packaging rules"
+	@$(TOPDIR)/scripts/GeneratePackageMake > $(TOPDIR)/Package.make
+
+# load rules to make packages
+-include $(TOPDIR)/Package.make
+
+endif
diff --git a/development/performance/opie-performance.control b/development/performance/opie-performance.control
index 194b378..21c3433 100644
--- a/development/performance/opie-performance.control
+++ b/development/performance/opie-performance.control
@@ -1,4 +1,5 @@
+Package: opie-performance
 Files: plugins/applications/libperformance.so* bin/performance apps/Applications/performance.desktop
 Priority: optional
 Section: opie/other
 Maintainer: Trolltech (www.trolltech.com)
diff --git a/noncore/multimedia/powerchord/opie-powerchord.control b/noncore/multimedia/powerchord/opie-powerchord.control
index 4b5bc88..490e8a2 100644
--- a/noncore/multimedia/powerchord/opie-powerchord.control
+++ b/noncore/multimedia/powerchord/opie-powerchord.control
@@ -1,4 +1,5 @@
+Package: opie-powercord
 Files: plugins/applications/libpowerchord.so* bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord
 Priority: optional
 Section: opie/multimedia
 Maintainer: Camilo Mesias <camilo@mesias.co.uk>, ljp <lpotter@trolltech.com>
diff --git a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
index d9038ae..5bce0e1 100644
--- a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
+++ b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
@@ -10,10 +10,10 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>257</width>
-            <height>296</height>
+            <width>225</width>
+            <height>334</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
@@ -33,29 +33,8 @@
         <property stdset="1">
             <name>spacing</name>
             <number>0</number>
         </property>
-        <spacer>
-            <property>
-                <name>name</name>
-                <cstring>Spacer20</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
-            </property>
-            <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
-            </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
@@ -175,9 +154,9 @@
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Select to manage your local Bluetooth hardware</string>
+                        <string>Manage your local Bluetooth hardware</string>
                     </property>
                     <property stdset="1">
                         <name>alignment</name>
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
@@ -282,9 +261,100 @@
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout10</cstring>
+                <cstring>Layout13</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer7_2_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Fixed</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel5</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>1</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Use device :</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QComboBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>DeviceList_CB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                </widget>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer16</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout15</cstring>
             </property>
             <hbox>
                 <property stdset="1">
                     <name>margin</name>
@@ -315,101 +385,31 @@
                         </size>
                     </property>
                 </spacer>
                 <widget>
-                    <class>QLayoutWidget</class>
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout9</cstring>
-                    </property>
-                    <grid>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
-                        </property>
-                        <widget row="0"  column="1" >
-                            <class>QComboBox</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>DeviceList_CB</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                </sizepolicy>
-                            </property>
-                        </widget>
-                        <spacer row="0"  column="2" >
-                            <property>
-                                <name>name</name>
-                                <cstring>Spacer16</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>orientation</name>
-                                <enum>Horizontal</enum>
-                            </property>
-                            <property stdset="1">
-                                <name>sizeType</name>
-                                <enum>Expanding</enum>
-                            </property>
-                            <property>
-                                <name>sizeHint</name>
-                                <size>
-                                    <width>20</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget row="1"  column="0"  rowspan="1"  colspan="3" >
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>TextLabel1_2</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>7</hsizetype>
-                                    <vsizetype>1</vsizetype>
-                                </sizepolicy>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>Select to scan the bluetooth network for reachable devices using the selected local device</string>
-                            </property>
-                            <property stdset="1">
-                                <name>alignment</name>
-                                <set>WordBreak|AlignVCenter|AlignLeft</set>
-                            </property>
-                            <property>
-                                <name>wordwrap</name>
-                            </property>
-                        </widget>
-                        <widget row="0"  column="0" >
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>TextLabel5</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>1</vsizetype>
-                                </sizepolicy>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>Use device :</string>
-                            </property>
-                        </widget>
-                    </grid>
+                        <cstring>TextLabel1_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>5</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>San the bluetooth network neighbourhood using the selected local device</string>
+                    </property>
+                    <property stdset="1">
+                        <name>alignment</name>
+                        <set>WordBreak|AlignVCenter|AlignLeft</set>
+                    </property>
+                    <property>
+                        <name>wordwrap</name>
+                    </property>
                 </widget>
             </hbox>
         </widget>
         <spacer>
@@ -553,9 +553,9 @@
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Select to manage all pairings known on the local device to any remote device regardless if it is currently reachable or not</string>
+                        <string>Manage device pairings to or from the local device</string>
                     </property>
                     <property stdset="1">
                         <name>alignment</name>
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
@@ -590,9 +590,9 @@
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout2</cstring>
+                <cstring>Layout9_2</cstring>
             </property>
             <hbox>
                 <property stdset="1">
                     <name>margin</name>
@@ -602,18 +602,161 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
                 <widget>
-                    <class>QCheckBox</class>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>BTSniffing_But</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Sniffing</string>
+                    </property>
+                </widget>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer9_3_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout6_2</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer7_3_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Fixed</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>EnableTracing_CB</cstring>
+                        <cstring>TextLabel1_2_2_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>1</vsizetype>
+                        </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Trace Bluetooth</string>
+                        <string>Sniff the bluetooth network</string>
+                    </property>
+                    <property stdset="1">
+                        <name>alignment</name>
+                        <set>WordBreak|AlignVCenter|AlignLeft</set>
+                    </property>
+                    <property>
+                        <name>wordwrap</name>
                     </property>
                 </widget>
+            </hbox>
+        </widget>
+        <spacer>
+            <property>
+                <name>name</name>
+                <cstring>Spacer20_2_2_2_3</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Vertical</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout11</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer21</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
                 <widget>
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
@@ -653,16 +796,16 @@
         <receiver>OTMainGUI</receiver>
         <slot>SLOT_Pairing()</slot>
     </connection>
     <connection>
-        <sender>EnableTracing_CB</sender>
-        <signal>toggled(bool)</signal>
+        <sender>BTSniffing_But</sender>
+        <signal>clicked()</signal>
         <receiver>OTMainGUI</receiver>
-        <slot>SLOT_EnableTracing( bool )</slot>
+        <slot>SLOT_Sniffing()</slot>
     </connection>
     <slot access="public">SLOT_EnableBluetooth(bool)</slot>
+    <slot access="public">SLOT_Sniffing()</slot>
     <slot access="public">SLOT_Manage()</slot>
     <slot access="public">SLOT_Pairing()</slot>
     <slot access="public">SLOT_Scan()</slot>
-    <slot access="public">SLOT_EnableTracing( bool )</slot>
 </connections>
 </UI>
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
index 8ea3a48..2d4885c 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
@@ -109,8 +109,29 @@ private :
 //
 //
 //
 
+OTSniffing::OTSniffing( QWidget * parent ) : OTSniffGUI( parent ) {
+
+      OT = OTGateway::getOTGateway();
+
+}
+
+OTSniffing::~OTSniffing() {
+}
+
+void OTSniffing::SLOT_Trace( void ) {
+}
+
+void OTSniffing::SLOT_ClearLog( void ) {
+}
+
+//
+//
+//
+//
+//
+
 OTPairing::OTPairing( QWidget * parent, OTIcons * _IC ) :
                 OTPairingGUI( parent ) {
 
       OT = OTGateway::getOTGateway();
@@ -872,8 +893,9 @@ void OTManage::SLOT_SetRefreshTimer( int v ) {
 
 OTMain::OTMain( QWidget * parent ) : OTMainGUI( parent ) {
 
       Icons = new OTIcons();
+      SnifWindow = 0;
       OT = OTGateway::getOTGateway();
 
       connect( OT,
                SIGNAL( deviceEnabled( bool ) ),
@@ -1002,4 +1024,14 @@ void OTMain::SLOT_Pairing( void ) {
       Dlg->exec();
 
       delete Dlg;
 }
+
+void OTMain::SLOT_Sniffing( void ) {
+
+      if( SnifWindow == 0 ) {
+        SnifWindow = new OTSniffing( this );
+      }
+
+      SnifWindow->showMaximized();
+      SnifWindow->show();
+}
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.h b/noncore/settings/networksettings2/opietooth2/Opietooth.h
index 16a22d6..211ae65 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.h
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.h
@@ -2,19 +2,46 @@
 #define OPIETOOTH_H
 
 #include <OTIcons.h>
 
-#include <OTPairingGUI.h>
 namespace Opie { namespace Ui { class OLedBox; }; };
 
+#include <OTSniffGUI.h>
 namespace Opietooth2 {
 
 class OTGateway;
 class OTDriver;
 class OTInquiry;
 class OTPeer;
 class PeerLVI;
 
+class OTSniffing : public OTSniffGUI {
+
+      Q_OBJECT
+
+public :
+
+      OTSniffing( QWidget * parent );
+      ~OTSniffing();
+
+private slots :
+
+      void SLOT_Trace( void );
+      void SLOT_ClearLog( void );
+
+signals :
+
+protected :
+
+private :
+
+      OTGateway *       OT;
+};
+};
+
+#include <OTPairingGUI.h>
+
+namespace Opietooth2 {
 class OTPairing : public OTPairingGUI {
 
       Q_OBJECT
 
@@ -173,8 +200,9 @@ public slots :
 private slots :
 
       void SLOT_Pairing( void );
       void SLOT_Manage( void );
+      void SLOT_Sniffing( void );
       void SLOT_Scan( void );
       void SLOT_EnableBluetooth( bool );
       void SLOT_DriverListChanged();
       void SLOT_DeviceIsEnabled( bool );
@@ -188,7 +216,8 @@ private :
 
       // load scanned devices
       OTIcons *         Icons;
       OTGateway *       OT;
+      OTSniffing *      SnifWindow;
 };
 };
 #endif
diff --git a/noncore/settings/networksettings2/opietooth2/opietooth2.pro b/noncore/settings/networksettings2/opietooth2/opietooth2.pro
index 590b656..cfb527d 100644
--- a/noncore/settings/networksettings2/opietooth2/opietooth2.pro
+++ b/noncore/settings/networksettings2/opietooth2/opietooth2.pro
@@ -29,9 +29,9 @@ SOURCES		= OTDevice.cpp \
                   Opietooth.cpp
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lbluetooth
-INTERFACES	= OTMainGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui
+INTERFACES	= OTMainGUI.ui OTSniffGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui
 TARGET		= opietooth2
 VERSION		= 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/packagemanager/opackagemanager.cpp b/noncore/settings/packagemanager/opackagemanager.cpp
index c9fdec1..ac16954 100644
--- a/noncore/settings/packagemanager/opackagemanager.cpp
+++ b/noncore/settings/packagemanager/opackagemanager.cpp
@@ -82,11 +82,12 @@ void OPackageManager::loadAvailablePackages()
                     {
                         OPackage *package = packageIt.current();
 
                         // Load package info
-                        if ( !m_packages.find( package->name() ) )
+                        if ( !m_packages.find( package->name() ) ) {
+                          printf( "ADD AVAILABLE '%s'\n", package->name().latin1());
                             m_packages.insert( package->name(), package );
-                        else
+                        } else
                         {
                             // If new package is newer version, replace existing package
                             OPackage *currPackage = m_packages[package->name()];
                             if ( compareVersions( package->version(), currPackage->version() ) == 1 )
@@ -137,8 +138,9 @@ void OPackageManager::loadInstalledPackages()
                 ++destCount;
                 emit statusBar( destCount );
                 qApp->processEvents();
 
+                        printf( "DESGTINATION %s\n", destination->name().latin1());
                 OPackageList *packageList = m_ipkg.installedPackages( destination->name(),
                                                                       destination->value() );
                 if ( packageList )
                 {
@@ -156,8 +158,9 @@ void OPackageManager::loadInstalledPackages()
                         }
                         else
                         {
                             // Package isn't in a current feed, add to list
+                            printf( "ADD INSTALLED '%s'\n", package->name().latin1());
                             m_packages.insert( package->name(), package );
 
                             // Add category to list if it doesn't already exist
                             if ( m_categories.grep( package->category() ).isEmpty() )