Revision: 43021
http://brlcad.svn.sourceforge.net/brlcad/?rev=43021&view=rev
Author: jordisayol
Date: 2011-02-04 16:28:16 +0000 (Fri, 04 Feb 2011)
Log Message:
-----------
update desktop on install/remove scripts. changes deb/rpm description
Modified Paths:
--------------
brlcad/trunk/misc/debian/brlcad.postinst
brlcad/trunk/misc/debian/brlcad.postrm
brlcad/trunk/misc/debian/control
brlcad/trunk/sh/make_deb.sh
brlcad/trunk/sh/make_rpm.sh
Modified: brlcad/trunk/misc/debian/brlcad.postinst
===================================================================
(Binary files differ)
Modified: brlcad/trunk/misc/debian/brlcad.postrm
===================================================================
(Binary files differ)
Modified: brlcad/trunk/misc/debian/control
===================================================================
--- brlcad/trunk/misc/debian/control 2011-02-04 15:56:57 UTC (rev 43020)
+++ brlcad/trunk/misc/debian/control 2011-02-04 16:28:16 UTC (rev 43021)
@@ -11,15 +11,13 @@
Package: brlcad
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Constructive Solid Geometry (CSG) solid modeling system, binary
files
- BRL-CAD is a powerful cross-platform open source combinatorial
- Constructive Solid Geometry (CSG) solid modeling system that includes
- an interactive 3D solid geometry editor, a network-distributed
- symmetric multiprocessing high-performance ray-tracer,
+Description: BRL-CAD open source solid modeling
+ BRL-CAD is a powerful cross-platform Open Source combinatorial
+ Constructive Solid Geometry (CSG) solid modeling system that
+ includes interactive 3D solid geometry editing, high-performance
+ ray-tracing support for rendering and geometric analysis,
network-distributed framebuffer support, image and signal-processing
- tools, ray-tracing support for rendering and geometric analysis,
- path-tracing and photon mapping support for realistic image synthesis,
- animation capabilities, ray-tracing and numerical processing
- libraries, a system performance analysis benchmark suite, an embedded
- scripting interface, and a robust high-performance geometric
- representation and analysis library.
+ tools, path-tracing and photon mapping support for realistic image
+ synthesis, a system performance analysis benchmark suite, an embedded
+ scripting interface, and libraries for robust high-performance
+ geometric representation and analysis.
Modified: brlcad/trunk/sh/make_deb.sh
===================================================================
--- brlcad/trunk/sh/make_deb.sh 2011-02-04 15:56:57 UTC (rev 43020)
+++ brlcad/trunk/sh/make_deb.sh 2011-02-04 16:28:16 UTC (rev 43021)
@@ -80,9 +80,12 @@
ferror "Refusing to build on a non-debian system."
fi
-# #
+# set variables
BVERSION=`cat include/conf/MAJOR`"."`cat include/conf/MINOR`"."`cat
include/conf/PATCH`
BVERSION=`echo $BVERSION | sed 's/[^0-9.]//g'`
+CDATE=`date -R`
+CFILE="debian/changelog"
+RELEASE="0"
# check needed packages
E=0
@@ -146,10 +149,8 @@
"debian/brlcad-doc-animation.desktop"
# update debian/chagelog if needed
-CDATE=`date -R`
-CFILE="debian/changelog"
-if test -s $CFILE && test `sed -n '1p' $CFILE | grep "brlcad ($BVERSION-" | wc
-l` -eq 0 ; then
- L1="brlcad ($BVERSION-0) unstable; urgency=low\n\n"
+if test -s $CFILE && test `sed -n '1p' $CFILE | grep "brlcad
($BVERSION-$RELEASE" | wc -l` -eq 0 ; then
+ L1="brlcad ($BVERSION-$RELEASE) unstable; urgency=low\n\n"
L2=" **** VERSION ENTRY AUTOMATICALLY ADDED BY \"sh\/make_deb.sh\" SCRIPT
****\n\n"
L3=" -- Jordi Sayol <g.sa...@yahoo.es> $CDATE\n\n/"
sed -i "1s/^/$L1$L2$L3" $CFILE
Modified: brlcad/trunk/sh/make_rpm.sh
===================================================================
--- brlcad/trunk/sh/make_rpm.sh 2011-02-04 15:56:57 UTC (rev 43020)
+++ brlcad/trunk/sh/make_rpm.sh 2011-02-04 16:28:16 UTC (rev 43021)
@@ -69,6 +69,7 @@
BVERSION=`cat include/conf/MAJOR`"."`cat include/conf/MINOR`"."`cat
include/conf/PATCH`
BVERSION=`echo $BVERSION | sed 's/[^0-9.]//g'`
TMPDIR="misc/$DNAME-tmp"
+RELEASE="0"
if test `uname -m | grep -iwE "i[3-6]86" | wc -l` -eq 1 ;then
ARCH=`uname -m`
@@ -176,7 +177,7 @@
#Create brlcad.spec file
echo -e 'Name: brlcad
Version: '$BVERSION'
-Release: 0
+Release: '$RELEASE'
Summary: BRL-CAD open source solid modeling
Group: Productivity/Graphics/CAD
@@ -185,7 +186,7 @@
Packager: Jordi Sayol <g.sa...@yahoo.es>
ExclusiveArch: '$ARCH'
-Provides: brlcad = '$BVERSION'-0, brlcad('$FARCH') = '$BVERSION'-0
+Provides: brlcad = '$BVERSION'-'$RELEASE', brlcad('$FARCH') =
'$BVERSION'-'$RELEASE'
%description
BRL-CAD is a powerful cross-platform Open Source combinatorial
@@ -201,17 +202,35 @@
Homepage: http://brlcad.org
%post
+set -e
+
+F="/usr/share/applications/defaults.list"
+
+if [ ! -f $F ]; then
+ echo "[Default Applications]" > $F
+fi
+
+sed -i "/application\/x-brlcad-extension=/d" $F
+
+echo "application/x-brlcad-extension=brlcad-archer.desktop" >> $F
+
source /etc/profile.d/brlcad.sh
-update-desktop-database &> /dev/null
+if [ -x "`which update-desktop-database 2>/dev/null`" ]; then
+ update-desktop-database &> /dev/null
+fi
if [ -x "`which update-mime-database 2>/dev/null`" ]; then
update-mime-database /usr/share/mime
fi
%postun
-update-desktop-database &> /dev/null
+set -e
+if [ -x "`which update-desktop-database 2>/dev/null`" ]; then
+ update-desktop-database &> /dev/null
+fi
+
if [ -x "`which update-mime-database 2>/dev/null`" ]; then
update-mime-database /usr/share/mime
fi
@@ -225,9 +244,9 @@
# create rpm file
fakeroot rpmbuild -vv --buildroot=`pwd`/$TMPDIR/tmp -bb --target $ARCH
$TMPDIR/brlcad.spec > $TMPDIR/rpmbuild.log
-RPMFILE=`cat $TMPDIR"/rpmbuild.log" | grep "brlcad-"$BVERSION"-0."$ARCH".rpm"
| awk '{print $(NF)}'`
+RPMFILE=`cat $TMPDIR"/rpmbuild.log" | grep
"brlcad-"$BVERSION"-"$RELEASE"."$ARCH".rpm" | awk '{print $(NF)}'`
-mv $RPMFILE ../brlcad-$BVERSION-0_$DNAME.$ARCH.rpm
+mv $RPMFILE ../brlcad-$BVERSION-$RELEASE.$DNAME.$ARCH.rpm
# #
rm -Rf $TMPDIR
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
