Fix menu tweaks on previous commits

menu/applications.menu

@@ -255,11 +255,9 @@
       <Filename>kde-openoctave.desktop</Filename>
       <Filename>kde-pana.desktop</Filename>
 
-      <Filename>kde4-akonaditray.desktop</Filename>
       <Filename>kde4-amarok.desktop</Filename>
       <Filename>kde4-bangarang.desktop</Filename>
       <Filename>kde4-dragonplayer.desktop</Filename>
-      <Filename>kde4-gdebi-kde.desktop</Filename>
       <Filename>kde4-juk.desktop</Filename>
       <Filename>kde4-k3b.desktop</Filename>
       <Filename>kde4-k9copy_assistant.desktop</Filename>
@@ -274,9 +272,6 @@
       <Filename>kde4-kmplayer.desktop</Filename>
       <Filename>kde4-kscd.desktop</Filename>
       <Filename>kde4-kwave.desktop</Filename>
-      <Filename>kde4-nepomukbackup.desktop</Filename>
-      <Filename>kde4-nepomukcleaner.desktop</Filename>
-      <Filename>kde4-nepomukcontroller.desktop</Filename>
       <Filename>kde4-recorditnow.desktop</Filename>
       <Filename>kde4-sparklemedia.desktop</Filename>
     </Exclude>
@@ -284,12 +279,22 @@
 
   </Menu>
 
+  <Menu>
+    <Name>Graphics</Name>
+    <Exclude>
+      <Filename>display.im6.desktop</Filename>
+      <Filename>display-im6.desktop</Filename>
+    </Exclude>
+  </Menu>
+
   <Menu>
     <Name>System</Name>
     <Exclude>
       <Filename>debian-xterm.desktop</Filename>
       <Filename>debian-uxterm.desktop</Filename>
       <Filename>ubuntustudio-controls.desktop</Filename>
+
+      <Filename>kde4-gdebi-kde.desktop</Filename>
       <Filename>kde4-nepomukbackup.desktop</Filename>
       <Filename>kde4-nepomukcleaner.desktop</Filename>
       <Filename>kde4-nepomukcontroller.desktop</Filename>

menu/kxstudio-multimedia.menu

@@ -52,8 +52,6 @@
       <Filename>denemo.desktop</Filename>
       <Filename>devede.desktop</Filename>
       <Filename>din.desktop</Filename>
-      <Filename>display.im6.desktop</Filename>
-      <Filename>display-im6.desktop</Filename>
       <Filename>drumkv1.desktop</Filename>
       <Filename>drumstick-drumgrid.desktop</Filename>
       <Filename>drumstick-guiplayer.desktop</Filename>
@@ -260,11 +258,9 @@
       <Filename>kde-openoctave.desktop</Filename>
       <Filename>kde-pana.desktop</Filename>
 
-      <Filename>kde4-akonaditray.desktop</Filename>
       <Filename>kde4-amarok.desktop</Filename>
       <Filename>kde4-bangarang.desktop</Filename>
       <Filename>kde4-dragonplayer.desktop</Filename>
-      <Filename>kde4-gdebi-kde.desktop</Filename>
       <Filename>kde4-juk.desktop</Filename>
       <Filename>kde4-k3b.desktop</Filename>
       <Filename>kde4-k9copy_assistant.desktop</Filename>
@@ -279,9 +275,6 @@
       <Filename>kde4-kmplayer.desktop</Filename>
       <Filename>kde4-kscd.desktop</Filename>
       <Filename>kde4-kwave.desktop</Filename>
-      <Filename>kde4-nepomukbackup.desktop</Filename>
-      <Filename>kde4-nepomukcleaner.desktop</Filename>
-      <Filename>kde4-nepomukcontroller.desktop</Filename>
       <Filename>kde4-recorditnow.desktop</Filename>
       <Filename>kde4-sparklemedia.desktop</Filename>
     </Exclude>
@@ -634,13 +627,24 @@
     </Include>
   </Menu>
 
+  <Menu>
+    <Name>Graphics</Name>
+    <Exclude>
+      <Filename>display.im6.desktop</Filename>
+      <Filename>display-im6.desktop</Filename>
+    </Exclude>
+  </Menu>
+
   <Menu>
     <Name>System</Name>
     <Exclude>
       <Filename>debian-xterm.desktop</Filename>
       <Filename>debian-uxterm.desktop</Filename>
       <Filename>ubuntustudio-controls.desktop</Filename>
+
+      <Filename>kde4-gdebi-kde.desktop</Filename>
       <Filename>kde4-nepomukbackup.desktop</Filename>
+      <Filename>kde4-nepomukcleaner.desktop</Filename>
       <Filename>kde4-nepomukcontroller.desktop</Filename>
     </Exclude>
   </Menu>

scripts/kxstudio-create-iso

@@ -239,16 +239,18 @@ exit
 
     mksquash)
 sudo mkdir -p ~/livecd/cd/casper/
-cd ~/livecd/
-sudo su root -c "printf $(sudo du -sx --block-size=1 custom | cut -f1) > cd/casper/filesystem.size"
-sudo touch ~/livecd/cd/casper/filesystem.manifest
-sudo touch ~/livecd/cd/casper/filesystem.manifest-remove
-sudo chmod 777 ~/livecd/cd/casper/filesystem.manifest
-sudo chmod 777 ~/livecd/cd/casper/filesystem.manifest-remove
-sudo chroot ~/livecd/custom dpkg-query -W --showformat='${Package} ${Version}\n' > ~/livecd/cd/casper/filesystem.manifest
-comm -3 <(cat ~/livecd/cd/casper/filesystem.manifest | awk '{print $1}' | sort) <(cat ~/livecd/cd/casper/filesystem.manifest-desktop | awk '{print $1}' | sort) > ~/livecd/cd/casper/filesystem.manifest-remove
-sudo rm -f ~/livecd/cd/casper/filesystem.squashfs ~/livecd/cd/casper/filesystem.manifest-desktop
-sudo mksquashfs ~/livecd/custom ~/livecd/cd/casper/filesystem.squashfs -noappend -comp xz
+cd ~/livecd/cd/casper/
+sudo su root -c "printf $(sudo du -sx --block-size=1 ~/livecd/custom | cut -f1) > ./filesystem.size"
+sudo touch ./filesystem.manifest
+sudo touch ./filesystem.manifest-remove
+sudo chmod 777 ./filesystem.manifest
+sudo chmod 777 ./filesystem.manifest-remove
+sudo chroot ~/livecd/custom dpkg-query -W --showformat='${Package} ${Version}\n' > ./filesystem.manifest
+if [ -f ./filesystem.manifest-desktop ]; then
+  comm -3 <(cat ./filesystem.manifest | awk '{print $1}' | sort) <(cat ./filesystem.manifest-desktop | awk '{print $1}' | sort) > ./filesystem.manifest-remove
+fi
+sudo rm -f ./filesystem.squashfs ./filesystem.manifest-desktop
+sudo mksquashfs ~/livecd/custom ./filesystem.squashfs -noappend -comp xz
 echo "done"
 exit
     ;;