Version in desktop icon filename

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

@@ -173,13 +173,13 @@ cp $pwre_sroot/tools/pkg/deb/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_t
   echo "[Desktop Entry]"
   echo "Version=1.0"
   echo "Encoding=UTF-8"
-  echo "Name=Proview"
+  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.desktop
+} > $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop
 
 # Create package
 echo "-- Building package"

src/tools/pkg/ubu/pwr/postinst

@@ -48,9 +48,9 @@ fi
 if [ ! -e /home/pwrp/Desktop ]; then
   mkdir /home/pwrp/Desktop
 fi
-cp /usr/pwr$ver/$pwre_target/exp/cnf/user/proview.desktop /home/pwrp/Desktop
-chown pwrp:pwrp /home/pwrp/Desktop/proview.desktop
-chmod a+x /home/pwrp/Desktop/proview.desktop
+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"

src/tools/pkg/ubu/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
@@ -63,8 +64,22 @@ tar -cf $tarfile pwrdemo$ver
 cd $pkgroot/usr/pwrp
 tar -xf $tarfile
 rm $tarfile
+rm -r pwrdemo$ver/.git
 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/ubu/pwrdemo/postinst

@@ -71,9 +71,11 @@ 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