Desktop icons added and mvm removed for user pwrp

src/tools/pkg/deb/pwr/build.sh

@@ -164,19 +164,33 @@ cp $pwre_sroot/tools/pkg/deb/adm/pwra_env.sh $pkgroot/usr/pwr$ver/$pwre_target/e
 chmod a+x $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/pwra_env.sh
 cp $pwre_sroot/tools/pkg/deb/adm/pwr_volumelist.dat $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf
 cp $pwre_sroot/tools/pkg/deb/adm/pwr_user2.dat $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf
+cp $pwre_sroot/tools/pkg/deb/adm/proview_icon.png $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf
 
 # Copy user to cnf
 mkdir $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
 cp $pwre_sroot/tools/pkg/deb/user/.bashrc $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
 echo "source $aroot/db/pwr_setup.sh" >> $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/.bashrc
 cp $pwre_sroot/tools/pkg/deb/user/.bash_profile $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
-cp $pwre_sroot/tools/pkg/deb/user/.mwmrc $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
+#cp $pwre_sroot/tools/pkg/deb/user/.mwmrc $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
 cp $pwre_sroot/tools/pkg/deb/user/.rtt_start $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
 cp $pwre_sroot/tools/pkg/deb/user/.xtt_start $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
-cp $pwre_sroot/tools/pkg/deb/user/.xsession $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
+#cp $pwre_sroot/tools/pkg/deb/user/.xsession $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
 cp $pwre_sroot/tools/pkg/deb/user/wtt_init.pwr_com $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
 cp $pwre_sroot/tools/pkg/deb/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user
 
+# Generate desktop file
+{
+  echo "[Desktop Entry]"
+  echo "Version=1.0"
+  echo "Encoding=UTF-8"
+  echo "Name=Proview V${version:0:3}"
+  echo "Type=Application"
+  echo "Comment=Start Proview"
+  echo "Exec=xterm -title \"Proview Development Console\" -e 'export pwra_db=$aroot/db;source \$pwra_db/pwra_env.sh set base V""${version:0:3}"";source \$pwra_db/pwra_env.sh set bus;wb -p pwrp pwrp'"
+  echo "Icon=$aroot/db/proview_icon.png"
+  echo "Categories=GNOME;GTK;Application;"
+} > $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop
+
 # Create package
 echo "-- Building package"
 if which fakeroot > /dev/null; then

src/tools/pkg/deb/pwr/control

 Package: pwr46
-Version: 4.6.0-6
+Version: 4.6.1-1
 Section: base
 Priority: optional
 Architecture: i386

src/tools/pkg/deb/pwr/postinst

@@ -36,18 +36,24 @@ else
   fi
   cp /usr/pwr$ver/$pwre_target/exp/cnf/user/.bashrc /home/pwrp
   cp /usr/pwr$ver/$pwre_target/exp/cnf/user/.bash_profile /home/pwrp
-  cp /usr/pwr$ver/$pwre_target/exp/cnf/user/.mwmrc /home/pwrp
+#  cp /usr/pwr$ver/$pwre_target/exp/cnf/user/.mwmrc /home/pwrp
   cp /usr/pwr$ver/$pwre_target/exp/cnf/user/.rtt_start /home/pwrp
   chmod a+x /home/pwrp/.rtt_start
   cp /usr/pwr$ver/$pwre_target/exp/cnf/user/.xtt_start /home/pwrp
   chmod a+x /home/pwrp/.xtt_start
-  cp /usr/pwr$ver/$pwre_target/exp/cnf/user/.xsession /home/pwrp
+#  cp /usr/pwr$ver/$pwre_target/exp/cnf/user/.xsession /home/pwrp
   cp /usr/pwr$ver/$pwre_target/exp/cnf/user/wtt_init.pwr_com /home/pwrp
   cp /usr/pwr$ver/$pwre_target/exp/cnf/user/wtt_init1.pwr_com /home/pwrp
 
   chown -R pwrp /home/pwrp
   chgrp -R pwrp /home/pwrp
 fi
+if [ ! -e /home/pwrp/Desktop ]; then
+  mkdir /home/pwrp/Desktop
+fi
+cp /usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop /home/pwrp/Desktop
+chown pwrp:pwrp /home/pwrp/Desktop/proview$ver.desktop
+chmod a+x /home/pwrp/Desktop/proview$ver.desktop
 
 echo "Change owner of files to pwrp"
 chown -R pwrp /usr/pwr$ver
@@ -81,6 +87,7 @@ fi
 
 cp /usr/pwr$ver/$pwre_target/exp/cnf/pwra_env.sh $aroot/db
 cp /usr/pwr$ver/$pwre_target/exp/cnf/pwr_setup.sh $aroot/db
+cp /usr/pwr$ver/$pwre_target/exp/cnf/proview_icon.png $aroot/db
 if [ ! -e $aroot/db/pwr_volumelist.dat ]; then
   cp /usr/pwr$ver/$pwre_target/exp/cnf/pwr_volumelist.dat $aroot/db
 fi

src/tools/pkg/deb/pwrdemo/build.sh

@@ -54,6 +54,7 @@ gzip -fq --best $pkgroot/usr/share/doc/pwrdemo$ver/changelog.Debian
 
 # Copy pwrdemo
 mkdir $pkgroot/usr/pwrp/pwrdemo$ver
+mkdir $pkgroot/usr/pwrp/pwrdemo$ver/cnf
 currentdir="`eval pwd`"
 tarfile=$pwre_broot/$pwre_target/bld/pkg/pwrtmp.tar
 cd $proot
@@ -65,6 +66,19 @@ tar -xf $tarfile
 rm $tarfile
 cd $currentdir
 
+# Generate desktop file
+{
+  echo "[Desktop Entry]"
+  echo "Version=1.0"
+  echo "Encoding=UTF-8"
+  echo "Name=Proview Demo"
+  echo "Type=Application"
+  echo "Comment=Start Proview Demo"
+  echo "Exec=xterm -title \"Proview Demo Console\" -e 'export pwra_db=$aroot/db;source \$pwra_db/pwr_setup.sh;source \$pwra_db/pwra_env.sh set project pwrdemo""$ver"";export PWR_BUS_ID=999;pwr_rtmon'"
+  echo "Icon=$aroot/db/proview_icon.png"
+  echo "Categories=GNOME;GTK;Application;"
+} > $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop
+
 # Create package
 echo "-- Building package"
 if which fakeroot > /dev/null; then

src/tools/pkg/deb/pwrdemo/control

 Package: pwrdemo46
-Version: 4.6.0-6
+Version: 4.6.1-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: pwr46 (>= 4.6.0-6)
+Depends: pwr46 (>= 4.6.1-1)
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package
  Proview Demo Project
- 4.6.0-1 Base release 
+ 4.6.1-1 Base release 

src/tools/pkg/deb/pwrdemo/postinst

@@ -69,6 +69,12 @@ sudo -u pwrp $initsh
 rm $initsh
 rm $initpwrc
 
+if [ -e /home/pwrp/Desktop ]; then
+  cp /usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop /home/pwrp/Desktop/
+  chown pwrp:pwrp /home/pwrp/Desktop/proviewdemo$ver.desktop
+  chmod a+x /home/pwrp/Desktop/proviewdemo$ver.desktop
+fi
+
 
 
 

src/tools/pkg/deb/pwrrt/control

 Package: pwrrt
-Version: 4.6.0-6
+Version: 4.6.1-1
 Section: base
 Priority: optional
 Architecture: i386

src/tools/pkg/deb/pwrsev/control

 Package: pwrsev
-Version: 4.6.0-6
+Version: 4.6.1-1
 Section: base
 Priority: optional
 Architecture: i386