[kismac] [binaervarianz] r202 - in branches/usb-drivers: . KisMAC.xcodeproj Sources/Core image

Author: gkruse
Date: 2006-10-08 20:17:13 +0200 (Sun, 08 Oct 2006)
New Revision: 202

Added:
   branches/usb-drivers/image/KisMACraw.sparseimage
Removed:
   branches/usb-drivers/image/KisMACraw.dmg
Modified:
   branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj
   branches/usb-drivers/Sources/Core/WavePacket.mm
   branches/usb-drivers/compile.command
Log:
Merge 188 and 190 from trunk to enable image building again.

Modified: branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj
===================================================================
--- branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj       2006-10-06 
12:50:10 UTC (rev 201)
+++ branches/usb-drivers/KisMAC.xcodeproj/project.pbxproj       2006-10-08 
18:17:13 UTC (rev 202)
@@ -833,7 +833,7 @@
                6CE206E7C5B0502200A26C3A /* RalinkJack.mm */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; 
name = RalinkJack.mm; path = USBJack/RalinkJack.mm; sourceTree = "<group>"; };
                87CEBA8009AEF03700AEB0B8 /* GrowlController.h */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = 
GrowlController.h; sourceTree = "<group>"; };
                87CEBA8109AEF03700AEB0B8 /* GrowlController.m */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; 
path = GrowlController.m; sourceTree = "<group>"; };
-               8D1107320486CEB800E47090 /* KisMAC.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = KisMAC.app; sourceTree = BUILT_PRODUCTS_DIR; };
+               8D1107320486CEB800E47090 /* KisMAC.app */ = {isa = 
PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; 
path = KisMAC.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */

Modified: branches/usb-drivers/Sources/Core/WavePacket.mm
===================================================================
--- branches/usb-drivers/Sources/Core/WavePacket.mm     2006-10-06 12:50:10 UTC 
(rev 201)
+++ branches/usb-drivers/Sources/Core/WavePacket.mm     2006-10-08 18:17:13 UTC 
(rev 202)
@@ -267,7 +267,7 @@
                     [self parseTaggedData:((unsigned 
char*)f)+sizeof(WLFrame)+10 length:_length-10]; //10 byte fixed info
                     break;
                 case IEEE80211_SUBTYPE_DEAUTH:
-                    //NSLog(@"ATTENTION! Recieved deauthentication frame. You 
might want to check for other WiFi people.");
+                    NSLog(@"ATTENTION! Recieved deauthentication frame. You 
might want to check for other WiFi people.");
                                        break;
             }
             break;

Modified: branches/usb-drivers/compile.command
===================================================================
--- branches/usb-drivers/compile.command        2006-10-06 12:50:10 UTC (rev 
201)
+++ branches/usb-drivers/compile.command        2006-10-08 18:17:13 UTC (rev 
202)
@@ -187,7 +187,7 @@
       sleep 10
   fi
   
-       cp image/KisMACraw.dmg image/KisMAC.dmg
+       cp image/KisMACraw.sparseimage image/KisMAC.dmg
        hdiutil attach image/KisMAC.dmg > /dev/null
        
        sleep 1
@@ -203,7 +203,7 @@
   cp -r build/$configuration/KisMAC.app image
   cd "image/KisMAC.app"
        rm `find . -type f -name .DS_Store` 2>/dev/null
-       rm -rf `find . -name .svn`
+       rm -rf `find . -name .svn`
        cd ..
        tar -czf "/Volumes/KisMAC/KisMAC 
Installer.app/Contents/Resources/KisMAC.tgz" KisMAC.app>/dev/null
        rm -rf KisMAC.app
@@ -211,7 +211,7 @@
        
        rm `find "/Volumes/KisMAC/KisMAC Installer.app" -type f -name 
.DS_Store` 2>/dev/null
        rm -rf `find "/Volumes/KisMAC/KisMAC Installer.app" -name .svn`
-  #rm /Volumes/KisMAC/Desktop*
+  #rm /Volumes/KisMAC/Desktop*
   
   while [ -d  /Volumes/KisMAC ]; do
     hdiutil detach /Volumes/KisMAC >/dev/null

Deleted: branches/usb-drivers/image/KisMACraw.dmg
===================================================================
(Binary files differ)

Copied: branches/usb-drivers/image/KisMACraw.sparseimage (from rev 190, 
trunk/image/KisMACraw.sparseimage)

Other related posts: