Skip to content

Commit

Permalink
merge c61063 from RELEASE to get the remaining version bump and doc u…
Browse files Browse the repository at this point in the history
…pdates, should have been in prior merge

svn:revision:61064
svn:branch:STABLE
svn:account:brlcad
  • Loading branch information
brlcad committed Jun 2, 2014
2 parents fea05b3 + 5211a52 commit afdef6b
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 18 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/bin
/lib
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ descriptive text that emphasizes or further describes significant
changes made. See document footer for additional details.

----------------------------------------------------------------------
--- 2013-06-01 Release 7.24.2 ---
--- 2013-06-02 Release 7.24.2 ---
----------------------------------------------------------------------

This patch release includes a plethora of significant bug fixes and
Expand Down
5 changes: 1 addition & 4 deletions TODO
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ tasks as they are completed.
THESE TASKS SHOULD HAPPEN BEFORE THE NEXT RELEASE
-------------------------------------------------

* investigate failure of repository regression on Mac OS X when doing
the odd pathnames distcheck. Looks like the tools on OS X (grep,
sh, etc.) aren't handling the funky names properly, and as a result
the test hangs.
* Good to go.


THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
Expand Down
2 changes: 1 addition & 1 deletion include/conf/PATCH
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1
2
4 changes: 4 additions & 0 deletions misc/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
brlcad (7.24.2-0) unstable; urgency=low

* update brlcad version

brlcad (7.24.0-0) unstable; urgency=low

* update brlcad version
Expand Down
18 changes: 9 additions & 9 deletions misc/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ Package: brlcad
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, xterm
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, 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.
BRL-CAD is a powerful cross-platform open source combinatorial
Constructive Solid Geometry (CSG) solid modeling system that
includes interactive solid geometry editing, ray-tracing support for
rendering and geometric analysis, network-distributed framebuffer
support, image and signal-processing tools, path-tracing support for
realistic image synthesis, a system performance analysis benchmark
suite, an embedded scripting interface, and a robust
high-performance geometric representation and analysis library.

2 changes: 1 addition & 1 deletion misc/macosx/Resources/ReadMe.rtfd/TXT.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
\f0\i\b\fs72 \cf0 README
\fs36 \
\f1\i0\b0\fs28 This is BRL-CAD 7.24.0 for Mac OS X. Please send any bugs, comments, questions, or suggestions to the project website.\
\f1\i0\b0\fs28 This is BRL-CAD 7.24.2 for Mac OS X. Please send any bugs, comments, questions, or suggestions to the project website.\
\fs22 \
Expand Down
4 changes: 2 additions & 2 deletions misc/macosx/Resources/Welcome.rtfd/TXT.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
\margl1440\margr1440\vieww8020\viewh6280\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f0\fs22 \cf0 This installer will guide you through the installation of BRL-CAD 7.24.0 for Mac OS X and Darwin.\
\f0\fs22 \cf0 This installer will guide you through the installation of BRL-CAD 7.24.2 for Mac OS X and Darwin.\
\
This distribution of BRL-CAD requires approximately 250 MB of available disk space and does not include source code.\
This distribution of BRL-CAD requires approximately 500 MB of available disk space and does not include source code.\
\
If you have an existing BRL-CAD installation, you are advised to backup any files you have in /usr/brlcad. Any existing BRL-CAD installation will be overwritten.\

Expand Down

0 comments on commit afdef6b

Please sign in to comment.