merge trunk to STABLE from r44240 to HEAD r44324 ... not really, but …

…previous branch commit had bad log message. should be up-to-date wrt r44324

svn:revision:44325
svn:branch:STABLE
svn:account:brlcad

.gitignore

@@ -32,23 +32,3 @@
 /Makefile.in
 /mged
 
-/.deps
-/.libs
-/Makefile
-/Makefile.in
-/bntester
-/libbn.plg
-/.deps
-/.libs
-/Makefile
-/Makefile.in
-/htester
-/libbu.plg
-/timetester
-/.deps
-/.libs
-/Makefile
-/Makefile.in
-/pc_test
-/vm_test
-/solver_test

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:

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

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: