From cd2748147d1e1daeaae713435cbf7c443f8e5d82 Mon Sep 17 00:00:00 2001 From: Christopher Sean Morrison Date: Tue, 12 Apr 2011 17:05:11 +0000 Subject: [PATCH 1/3] typo svn:revision:44320 svn:branch:trunk svn:account:brlcad --- NEWS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 75dd3f27136..1e9ccd03631 100644 --- a/NEWS +++ b/NEWS @@ -21,11 +21,11 @@ acceleration techniques for faster raytracing of triangle mesh models. TIE was experimentally developed over several years as part of BRL-CAD's Advanced Distributed Ray Tracer (ADRT) tool suite. As this is the initial integration, TIE is available but presently disabled by -default. The engine optimiation is configurably integrated with LIBRT -mesh (BoT) raytracing and optionally enabled via settings available in -RT and MGED. Inital testing of "real-world" models shows average -improvements around 20-60% while individual meshes with high (1M+) -face counts are rendering more than 2000% faster than before. +default. The engine optimization is configurably integrated with +LIBRT mesh (BoT) raytracing and optionally enabled via settings +available in RT and MGED. Inital testing of "real-world" models shows +average improvements around 20-60% while individual meshes with high +(1M+) face counts are rendering more than 2000% faster than before. Also included in this release is the development of a new "shp-g" geometry importer for Shapefile data. Shapefiles are a common file From aa421a6cbe57f21528bc89a4f0b6c3936a4988ab Mon Sep 17 00:00:00 2001 From: Erik Greenwald Date: Tue, 12 Apr 2011 17:55:01 +0000 Subject: [PATCH 2/3] add an empty depends rule svn:revision:44322 svn:branch:trunk svn:account:erikgreenwald --- src/other/libpng/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/other/libpng/Makefile.am b/src/other/libpng/Makefile.am index 9876c7909b2..9d355d470ae 100644 --- a/src/other/libpng/Makefile.am +++ b/src/other/libpng/Makefile.am @@ -134,3 +134,5 @@ uninstall-hook: cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc rm -f $(DESTDIR)$(bindir)/libpng-config + +depends: From f6e5af8e5a799bb09a324e74d3e5b35eeef49264 Mon Sep 17 00:00:00 2001 From: Christopher Sean Morrison Date: Tue, 12 Apr 2011 18:04:46 +0000 Subject: [PATCH 3/3] requesting a specific log revision, -rHEAD, results in empty output so don't use it svn:revision:44324 svn:branch:trunk svn:account:brlcad --- HACKING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HACKING b/HACKING index c9e260d011b..da9aeeca387 100644 --- a/HACKING +++ b/HACKING @@ -1145,7 +1145,7 @@ previous sync are included and that STABLE matches trunk. svn co https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/branches/STABLE brlcad.STABLE && cd brlcad.STABLE svn merge https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/trunk@$PREV https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/trunk@HEAD . sh autogen.sh && ./configure --enable-all && make distcheck - export CURR=`svn log --xml -rHEAD https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/trunk | grep 'revision=' | sed 's/.*="\([0-9][0-9]*\)".*/\1/g'` + export CURR=`svn log --xml https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/trunk | grep 'revision=' | head -n 1 | sed 's/.*="\([0-9][0-9]*\)".*/\1/g'` svn commit -m "merge trunk to STABLE from r$PREV to HEAD r$CURR" 7) Tag the release using "rel-MAJOR-MINOR-PATCH" format: