Revision: 42761
http://brlcad.svn.sourceforge.net/brlcad/?rev=42761&view=rev
Author: jordisayol
Date: 2011-01-29 22:08:21 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
more accurate tests in debian changelog and menu desktop files
Modified Paths:
--------------
brlcad/trunk/sh/make_deb.sh
Modified: brlcad/trunk/sh/make_deb.sh
===================================================================
--- brlcad/trunk/sh/make_deb.sh 2011-01-29 22:00:21 UTC (rev 42760)
+++ brlcad/trunk/sh/make_deb.sh 2011-01-29 22:08:21 UTC (rev 42761)
@@ -37,15 +37,21 @@
test -e
+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="misc/debian/changelog"
+
if test ! -e /etc/debian_version ; then
echo "Refusing to build on a non-debian system."
exit 1
fi
-# needed packages
+# check needed packages
E=0
fcheck(){
- if test `dpkg -s $1 2>/dev/null | grep "install ok installed" | wc -l` -eq
0 ; then
+ T="install ok installed"
+ if test `dpkg -s $1 2>/dev/null | grep "$T" | wc -l` -eq 0 ; then
LLIST=$LLIST"\n"$1
E=1
fi
@@ -78,26 +84,37 @@
echo "Pausing 15 seconds..."
sleep 15
fi
-# needed packages
-# modify the doc menu entries
-B_VERSION=`cat include/conf/MAJOR`"."`cat include/conf/MINOR`"."`cat
include/conf/PATCH`
+# modify doc menu desktop files
+fdoc(){
+ L=`sed -n '/Exec=/=' $2`
+ A=`sed -n $L'p' $2`
+ if test ! "Exec=$1" = "$A" ;then
+ sed -i "s:$A:Exec=$1:" $2
+ fi
+}
-F="misc/debian/brlcad-doc.desktop"
-sed -i '/Exec=/d' $F
-echo "Exec=xdg-open /usr/brlcad/share/brlcad/$B_VERSION/html/toc.html" >> $F
+fdoc "xdg-open /usr/brlcad/share/brlcad/$BVERSION/html/toc.html"
"misc/debian/brlcad-doc.desktop"
-F="misc/debian/brlcad-db.desktop"
-sed -i '/Exec=/d' $F
-echo "Exec=xdg-open /usr/brlcad/share/brlcad/$B_VERSION/db" >> $F
-# modify the doc menu entries
+fdoc "xdg-open /usr/brlcad/share/brlcad/$BVERSION/db"
"misc/debian/brlcad-db.desktop"
+# update debian/chagelog if needed
+if test -s $CFILE && test `sed -n '1p' $CFILE | grep "brlcad ($BVERSION-" | wc
-l` = 0 ; then
+ L1="1s/^/brlcad ($BVERSION-0) 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 "$L1$L2$L3" $CFILE
+fi
+
+# create link to misc/debian
if test ! -e ./debian && test ! -e ./debian/control ; then
ln -fs misc/debian debian
fi
+# create deb package
fakeroot debian/rules binary
+# remove link to misc/debian
if test -L ./debian ; then rm debian ; fi
# Local Variables:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
