Commit 25fdf16f authored by Claes Sjofors's avatar Claes Sjofors

Merge branch 'master' of pwrcvs:/data1/git/pwr

parents 4a67e976 19df9907
......@@ -154,6 +154,7 @@ 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
......@@ -167,6 +168,19 @@ cp $pwre_sroot/tools/pkg/deb/user/.xtt_start $pkgroot/usr/pwr$ver/$pwre_target/e
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"
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}"";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
# Create package
echo "-- Building package"
if which fakeroot > /dev/null; then
......
Package: pwr46
Version: 4.6.0-6
Version: 4.6.1-1
Section: base
Priority: optional
Architecture: i386
......
......@@ -45,6 +45,11 @@ if ! grep -q "\bpwrp:" /etc/passwd; then
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.desktop /home/pwrp/Desktop
echo "Change owner of files to pwrp"
chown -R pwrp /usr/pwr$ver
......@@ -78,6 +83,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
......
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)
Replaces:
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
Package: pwrrt
Version: 4.6.0-6
Version: 4.6.1-1
Section: base
Priority: optional
Architecture: i386
......
Package: pwrsev
Version: 4.6.0-6
Version: 4.6.1-1
Section: base
Priority: optional
Architecture: i386
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment