[3depict] branch master updated (d78dfa7 -> 68e2beb)
D Haley
mycae-guest at moszumanska.debian.org
Sun Dec 8 13:04:02 UTC 2013
This is an automated email from the git hooks/post-receive script.
mycae-guest pushed a change to branch master
in repository 3depict.
from d78dfa7 Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/3depict
new 702b766 Imported Upstream version 0.0.15
new 11036ad * Update changelog * Refresh install & patches * Update debian/rules * Fix installation of PDF so it can be found by Help menu item * Uncomment mgl2 enable flag
new 68e2beb * Add patch to fix text display under mgl2 - Text() function works differently
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog | 47 +
Makefile.am | 0
Makefile.in | 319 +--
README | 23 +
TODO | 16 +-
acinclude.m4 | 0
aclocal.m4 | 682 +++---
compile | 347 +++
config.guess | 575 +++--
config.h.in | 0
config.rpath | 0
config.sub | 299 ++-
configure | 387 +++-
configure.ac | 11 +-
data/atomic-mass-table.dtd | 56 +
data/naturalAbundance.xml | 1608 ++++++++++++++
data/startup-tips.txt | 23 +
debian/3depict.install | 4 +-
debian/changelog | 8 +
debian/patches/FTGL-lowercase.patch | 8 +-
debian/patches/lowercase-textdomain.patch | 10 +-
debian/patches/series | 1 +
debian/rules | 3 +-
depcomp | 601 ++++--
docs/manual-latex/3depictusermanual.kilepr | 12 +-
docs/manual-latex/figures/rangeEditOverlay.png | Bin 0 -> 123741 bytes
docs/manual-latex/figures/rangeedit-clash.png | Bin 0 -> 129283 bytes
docs/manual-latex/figures/tree-layout.png | Bin 0 -> 53210 bytes
docs/manual-latex/figures/tree-layout.svg | 266 +++
docs/manual-latex/manual.aux | 191 --
docs/manual-latex/manual.bbl | 21 -
docs/manual-latex/manual.bib | 143 +-
docs/manual-latex/manual.blg | 46 -
docs/manual-latex/manual.log | 569 -----
docs/manual-latex/manual.out | 83 -
docs/manual-latex/manual.pdf | Bin 4248400 -> 4517305 bytes
docs/manual-latex/manual.tex | 96 +-
docs/manual-latex/manual.tex.backup | 1840 ----------------
docs/manual-latex/manual.toc | 91 -
docs/samples/externalProg/bash-example.sh | 0
docs/samples/externalProg/python-example.py | 0
install-sh | 528 ++++-
m4/freetype2.m4 | 0
m4/ftgl.m4 | 0
m4/gl.m4 | 0
m4/gsl.m4 | 0
m4/libxml2.m4 | 0
m4/opengl.m4 | 0
m4/wxwin.m4 | 0
missing | 460 ++--
packaging/3Depict.desktop | 0
...t-path.patch => 3Depict-0.0.15-font-path.patch} | 4 +-
...c.patch => 3Depict-0.0.15-manual-pdf-loc.patch} | 0
packaging/RPM/3Depict.spec | 10 +-
packaging/debian/3depict.1 | 0
packaging/debian/3depict.install | 3 +
packaging/debian/changelog | 10 +-
packaging/debian/compat | 0
packaging/debian/control | 2 +-
packaging/debian/copyright | 0
packaging/debian/docs | 0
packaging/debian/manpages | 0
packaging/debian/menu | 0
packaging/debian/patches/FTGL-lowercase.patch | 8 +-
.../debian/patches/debian-desktop-naming.patch | 6 +-
.../debian/patches/lowercase-textdomain.patch | 4 +-
packaging/debian/patches/series | 0
packaging/debian/rules | 1 +
packaging/debian/source/format | 0
packaging/debian/source/include-binaries | 1 -
packaging/debian/source/local-options | 0
packaging/debian/tests/control | 0
packaging/debian/watch | 0
packaging/deps/getDeps | 24 +-
.../deps/patches/macosx/mathgl2/diff-obj.c.patch | 13 +
.../macosx/mathgl2/diff-prc-writePRC.h.patch | 24 +
packaging/deps/sources/mgl_data_png.patch | 0
packaging/deps/sources/mgl_eps.patch | 0
packaging/deps/sources/mgl_export.patch | 0
packaging/mac/3Depict.app/Contents/Info.plist | 30 +-
packaging/mac/3Depict.app/Contents/PkgInfo | 0
.../mac/3Depict.app/Contents/Resources/wxmac.icns | Bin
packaging/mac/3Depict.xcodeproj/project.pbxproj | 852 --------
packaging/mac/3package.sh | 22 +-
.../MacPackageMaker.pmdoc/013depict-contents.xml | 1 -
packaging/mac/MacPackageMaker.pmdoc/013depict.xml | 1 -
packaging/mac/MacPackageMaker.pmdoc/index.xml | 1 -
packaging/mac/makeMacOSXApp | 10 +-
packaging/makeTarball.sh | 4 +-
packaging/manpage/3Depict.1 | 0
packaging/mingw-debian-cross/bootstrap.sh | 174 +-
packaging/mingw-debian-cross/build-wx-3.0.sh | 172 ++
.../patches/configure-wxbool-patch | 12 +
.../mingw-debian-cross/patches/ftgl-disable-doc | 31 +
.../patches/ftgl-mingw32-prototype | 0
.../patches/ftgl-override-configure | 25 -
.../patches/ftgl-override-configure-2 | 14 +
.../patches/gettext-disable-tools | 165 +-
.../patches/gettext-win32-prefix | 0
packaging/mingw-debian-cross/patches/glew-makefile | 4 +-
.../patches/{glew-makefile => glew-makefile.base} | 0
.../mingw-debian-cross/patches/gsl-config.patch | 0
.../patches/mathgl-disable-widgets | 10 +
...onfig-sysroot.patch => wx-config-sysroot.patch} | 0
packaging/mingw-debian-cross/patches/wx-jpeg-patch | 12 +
...64-1.patch => wxWidgets-2.8.12-mingw64-1.patch} | 0
.../mingw-debian-cross/patches/zlib-no-lc.patch | 0
packaging/mingw-debian-cross/windows-installer.nsi | 70 +-
src/3Depict.cpp | 16 +-
src/Makefile.am | 50 +-
src/Makefile.in | 2253 ++++++++++++--------
src/backend/APT/APTRanges.cpp | 523 +++--
src/backend/APT/APTRanges.h | 53 +-
src/backend/APT/abundanceParser.cpp | 355 +++
src/backend/APT/abundanceParser.h | 99 +
src/backend/APT/ionhit.cpp | 26 +-
src/backend/APT/ionhit.h | 17 +
src/backend/animator.cpp | 6 +-
src/backend/configFile.cpp | 48 +-
src/backend/configFile.h | 13 +
src/backend/filter.cpp | 78 +-
src/backend/filter.h | 56 +-
.../filters/{ => algorithms}/K3DTree-mk2.cpp | 0
src/backend/filters/{ => algorithms}/K3DTree-mk2.h | 0
src/backend/filters/{ => algorithms}/K3DTree.cpp | 0
src/backend/filters/{ => algorithms}/K3DTree.h | 0
src/backend/filters/algorithms/binomial.cpp | 789 +++++++
src/backend/filters/algorithms/binomial.h | 117 +
src/backend/filters/{ => algorithms}/rdf.cpp | 5 +-
src/backend/filters/{ => algorithms}/rdf.h | 0
src/backend/filters/annotation.cpp | 6 +-
src/backend/filters/boundingBox.cpp | 4 +-
src/backend/filters/clusterAnalysis.cpp | 5 +-
src/backend/filters/compositionProfile.cpp | 18 +-
src/backend/filters/dataLoad.cpp | 64 +-
src/backend/filters/externalProgram.cpp | 305 +--
src/backend/filters/externalProgram.h | 15 +
src/backend/filters/filterCommon.cpp | 4 +-
src/backend/filters/filterCommon.h | 2 +-
src/backend/filters/geometryHelpers.cpp | 10 +-
src/backend/filters/geometryHelpers.h | 1 +
src/backend/filters/ionClip.cpp | 4 +-
src/backend/filters/ionColour.cpp | 99 +-
src/backend/filters/ionColour.h | 2 +
src/backend/filters/ionDownsample.cpp | 50 +-
src/backend/filters/ionInfo.cpp | 2 -
src/backend/filters/rangeFile.cpp | 56 +-
src/backend/filters/rangeFile.h | 4 +-
src/backend/filters/spatialAnalysis.cpp | 970 +++++++--
src/backend/filters/spatialAnalysis.h | 30 +
src/backend/filters/spectrumPlot.cpp | 4 +-
src/backend/filters/transform.cpp | 69 +-
src/backend/filters/voxelise.cpp | 30 +-
src/backend/filtertree.cpp | 359 ++--
src/backend/filtertree.h | 27 +-
src/backend/plot.cpp | 708 ++++--
src/backend/plot.h | 225 +-
src/backend/state.cpp | 75 +-
src/backend/state.h | 11 +-
src/backend/tree.hh | 0
src/backend/viscontrol.cpp | 41 +-
src/backend/viscontrol.h | 35 +-
src/common/assertion.h | 1 -
src/common/basics.cpp | 71 +-
src/common/basics.h | 117 +-
src/common/colourmap.cpp | 10 +-
src/common/colourmap.h | 3 +-
src/common/constants.h | 11 +-
src/common/mathfuncs.h | 1 -
src/common/pngread.c | 19 +-
src/common/pngread.h | 1 +
src/common/stringFuncs.cpp | 17 +-
src/common/stringFuncs.h | 4 +
src/common/voxels.h | 172 +-
src/common/xmlHelper.h | 29 +
src/gl/cameras.cpp | 167 +-
src/gl/cameras.h | 31 +-
src/gl/drawables.cpp | 84 +-
src/gl/drawables.h | 36 +-
src/gl/glDebug.h | 74 +
src/gl/scene.cpp | 136 +-
src/gl/scene.h | 60 +-
src/gl/select.cpp | 9 +
src/gl/select.h | 7 +-
src/gl/textures.cpp | 12 +-
src/gl/tr.cpp | 493 +++++
src/gl/tr.h | 149 ++
src/gui/dialogs/ExportPos.cpp | 4 +-
src/gui/dialogs/ExportRngDialog.cpp | 2 +-
src/gui/dialogs/StashDialog.cpp | 6 +-
src/gui/dialogs/StashDialog.h | 2 +-
src/gui/dialogs/animateFilterDialog.cpp | 17 +-
src/gui/dialogs/animateFilterDialog.h | 2 +-
.../animateSubDialogs/choiceKeyFrameDialog.cpp | 2 +-
.../animateSubDialogs/colourKeyFrameDialog.cpp | 6 +-
.../dialogs/animateSubDialogs/realKeyFrameDialog.h | 2 +-
.../animateSubDialogs/stringKeyFrameDialog.cpp | 6 +-
src/gui/dialogs/autosaveDialog.cpp | 2 +-
src/gui/dialogs/filterErrorDialog.cpp | 2 +-
src/gui/dialogs/prefDialog.cpp | 70 +-
src/gui/dialogs/prefDialog.h | 22 +-
src/gui/dialogs/rangeEditDialog.cpp | 1623 ++++++++++++++
src/gui/dialogs/rangeEditDialog.h | 230 ++
src/gui/dialogs/resolutionDialog.cpp | 165 +-
src/gui/dialogs/resolutionDialog.h | 7 +-
src/gui/glPane.cpp | 371 ++--
src/gui/glPane.h | 12 +-
src/gui/glade-skeleton/animateFilterDialog.wxg | 0
.../animateSubDialogs/choiceKeyFrameDialog.wxg | 0
.../animateSubDialogs/colourChooserDialog.wxg | 0
.../animateSubDialogs/realKeyFrameDialog.wxg | 0
.../animateSubDialogs/stringKeyFrameDialog.wxg | 0
src/gui/glade-skeleton/autosaveDialog.wxg | 0
src/gui/glade-skeleton/errorDialog.wxg | 0
src/gui/glade-skeleton/mainWindow.wxg | 0
src/gui/glade-skeleton/prefDialog.cpp | 272 +++
src/gui/glade-skeleton/prefDialog.h | 96 +
src/gui/glade-skeleton/preferencesDialog.wxg | 240 ++-
src/gui/glade-skeleton/rangeDialog.wxg | 273 +++
src/gui/glade-skeleton/resDialog.wxg | 0
src/gui/mainFrame.cpp | 713 ++++---
src/gui/mainFrame.h | 35 +-
src/gui/mathglPane.cpp | 86 +-
src/gui/mathglPane.h | 38 +-
src/{testing.cpp => testing/filtertesting.cpp} | 419 +---
src/{ => testing}/testing.cpp | 411 +---
src/{ => testing}/testing.h | 0
src/{ => wx}/wxcommon.cpp | 8 +-
src/{ => wx}/wxcommon.h | 0
src/{ => wx}/wxcomponents.cpp | 84 +-
src/{ => wx}/wxcomponents.h | 8 +-
test/rangefiles/test6.rrng | 12 +
translations/makeTranslations | 2 +-
233 files changed, 16388 insertions(+), 9409 deletions(-)
mode change 100644 => 100755 Makefile.am
mode change 100644 => 100755 acinclude.m4
create mode 100755 compile
mode change 100644 => 100755 config.h.in
mode change 100644 => 100755 config.rpath
create mode 100644 data/atomic-mass-table.dtd
create mode 100644 data/naturalAbundance.xml
create mode 100644 data/startup-tips.txt
mode change 100644 => 100755 depcomp
create mode 100644 docs/manual-latex/figures/rangeEditOverlay.png
create mode 100644 docs/manual-latex/figures/rangeedit-clash.png
create mode 100644 docs/manual-latex/figures/tree-layout.png
create mode 100644 docs/manual-latex/figures/tree-layout.svg
delete mode 100644 docs/manual-latex/manual.aux
delete mode 100644 docs/manual-latex/manual.bbl
delete mode 100644 docs/manual-latex/manual.blg
delete mode 100644 docs/manual-latex/manual.log
delete mode 100644 docs/manual-latex/manual.out
delete mode 100644 docs/manual-latex/manual.tex.backup
delete mode 100644 docs/manual-latex/manual.toc
mode change 100755 => 100644 docs/samples/externalProg/bash-example.sh
mode change 100755 => 100644 docs/samples/externalProg/python-example.py
mode change 100644 => 100755 install-sh
mode change 100644 => 100755 m4/freetype2.m4
mode change 100644 => 100755 m4/ftgl.m4
mode change 100644 => 100755 m4/gl.m4
mode change 100644 => 100755 m4/gsl.m4
mode change 100644 => 100755 m4/libxml2.m4
mode change 100644 => 100755 m4/opengl.m4
mode change 100644 => 100755 m4/wxwin.m4
mode change 100644 => 100755 packaging/3Depict.desktop
rename packaging/RPM/{3Depict-0.0.14-font-path.patch => 3Depict-0.0.15-font-path.patch} (89%)
rename packaging/RPM/{3Depict-0.0.14-manual-pdf-loc.patch => 3Depict-0.0.15-manual-pdf-loc.patch} (100%)
mode change 100644 => 100755 packaging/RPM/3Depict.spec
mode change 100644 => 100755 packaging/debian/3depict.1
mode change 100644 => 100755 packaging/debian/3depict.install
mode change 100644 => 100755 packaging/debian/compat
mode change 100644 => 100755 packaging/debian/control
mode change 100644 => 100755 packaging/debian/copyright
mode change 100644 => 100755 packaging/debian/docs
mode change 100644 => 100755 packaging/debian/manpages
mode change 100644 => 100755 packaging/debian/menu
mode change 100644 => 100755 packaging/debian/patches/FTGL-lowercase.patch
mode change 100644 => 100755 packaging/debian/patches/debian-desktop-naming.patch
mode change 100644 => 100755 packaging/debian/patches/lowercase-textdomain.patch
mode change 100644 => 100755 packaging/debian/patches/series
mode change 100644 => 100755 packaging/debian/source/format
delete mode 100644 packaging/debian/source/include-binaries
mode change 100644 => 100755 packaging/debian/source/local-options
mode change 100644 => 100755 packaging/debian/tests/control
mode change 100644 => 100755 packaging/debian/watch
create mode 100644 packaging/deps/patches/macosx/mathgl2/diff-obj.c.patch
create mode 100644 packaging/deps/patches/macosx/mathgl2/diff-prc-writePRC.h.patch
mode change 100644 => 100755 packaging/deps/sources/mgl_data_png.patch
mode change 100644 => 100755 packaging/deps/sources/mgl_eps.patch
mode change 100644 => 100755 packaging/deps/sources/mgl_export.patch
mode change 100644 => 100755 packaging/mac/3Depict.app/Contents/Info.plist
mode change 100644 => 100755 packaging/mac/3Depict.app/Contents/PkgInfo
mode change 100644 => 100755 packaging/mac/3Depict.app/Contents/Resources/wxmac.icns
delete mode 100644 packaging/mac/3Depict.xcodeproj/project.pbxproj
delete mode 100644 packaging/mac/MacPackageMaker.pmdoc/013depict-contents.xml
delete mode 100644 packaging/mac/MacPackageMaker.pmdoc/013depict.xml
delete mode 100644 packaging/mac/MacPackageMaker.pmdoc/index.xml
mode change 100644 => 100755 packaging/manpage/3Depict.1
create mode 100755 packaging/mingw-debian-cross/build-wx-3.0.sh
create mode 100644 packaging/mingw-debian-cross/patches/configure-wxbool-patch
create mode 100644 packaging/mingw-debian-cross/patches/ftgl-disable-doc
mode change 100644 => 100755 packaging/mingw-debian-cross/patches/ftgl-mingw32-prototype
mode change 100644 => 100755 packaging/mingw-debian-cross/patches/ftgl-override-configure
create mode 100644 packaging/mingw-debian-cross/patches/ftgl-override-configure-2
mode change 100644 => 100755 packaging/mingw-debian-cross/patches/gettext-disable-tools
mode change 100644 => 100755 packaging/mingw-debian-cross/patches/gettext-win32-prefix
mode change 100644 => 100755 packaging/mingw-debian-cross/patches/glew-makefile
copy packaging/mingw-debian-cross/patches/{glew-makefile => glew-makefile.base} (100%)
mode change 100644 => 100755 packaging/mingw-debian-cross/patches/gsl-config.patch
create mode 100644 packaging/mingw-debian-cross/patches/mathgl-disable-widgets
rename packaging/mingw-debian-cross/patches/{wxwidgets2.8-wx-config-sysroot.patch => wx-config-sysroot.patch} (100%)
create mode 100644 packaging/mingw-debian-cross/patches/wx-jpeg-patch
rename packaging/mingw-debian-cross/patches/{wxwidgets2.8-2.8.12-mingw64-1.patch => wxWidgets-2.8.12-mingw64-1.patch} (100%)
mode change 100644 => 100755 packaging/mingw-debian-cross/patches/zlib-no-lc.patch
mode change 100644 => 100755 packaging/mingw-debian-cross/windows-installer.nsi
create mode 100644 src/backend/APT/abundanceParser.cpp
create mode 100644 src/backend/APT/abundanceParser.h
rename src/backend/filters/{ => algorithms}/K3DTree-mk2.cpp (100%)
rename src/backend/filters/{ => algorithms}/K3DTree-mk2.h (100%)
rename src/backend/filters/{ => algorithms}/K3DTree.cpp (100%)
rename src/backend/filters/{ => algorithms}/K3DTree.h (100%)
create mode 100644 src/backend/filters/algorithms/binomial.cpp
create mode 100644 src/backend/filters/algorithms/binomial.h
rename src/backend/filters/{ => algorithms}/rdf.cpp (99%)
rename src/backend/filters/{ => algorithms}/rdf.h (100%)
mode change 100644 => 100755 src/backend/tree.hh
create mode 100644 src/gl/glDebug.h
create mode 100644 src/gl/tr.cpp
create mode 100644 src/gl/tr.h
create mode 100644 src/gui/dialogs/rangeEditDialog.cpp
create mode 100644 src/gui/dialogs/rangeEditDialog.h
mode change 100644 => 100755 src/gui/glade-skeleton/animateFilterDialog.wxg
mode change 100644 => 100755 src/gui/glade-skeleton/animateSubDialogs/choiceKeyFrameDialog.wxg
mode change 100644 => 100755 src/gui/glade-skeleton/animateSubDialogs/colourChooserDialog.wxg
mode change 100644 => 100755 src/gui/glade-skeleton/animateSubDialogs/realKeyFrameDialog.wxg
mode change 100644 => 100755 src/gui/glade-skeleton/animateSubDialogs/stringKeyFrameDialog.wxg
mode change 100644 => 100755 src/gui/glade-skeleton/autosaveDialog.wxg
mode change 100644 => 100755 src/gui/glade-skeleton/errorDialog.wxg
mode change 100644 => 100755 src/gui/glade-skeleton/mainWindow.wxg
create mode 100644 src/gui/glade-skeleton/prefDialog.cpp
create mode 100644 src/gui/glade-skeleton/prefDialog.h
mode change 100644 => 100755 src/gui/glade-skeleton/preferencesDialog.wxg
create mode 100644 src/gui/glade-skeleton/rangeDialog.wxg
mode change 100644 => 100755 src/gui/glade-skeleton/resDialog.wxg
copy src/{testing.cpp => testing/filtertesting.cpp} (53%)
rename src/{ => testing}/testing.cpp (50%)
rename src/{ => testing}/testing.h (100%)
rename src/{ => wx}/wxcommon.cpp (98%)
rename src/{ => wx}/wxcommon.h (100%)
rename src/{ => wx}/wxcomponents.cpp (92%)
rename src/{ => wx}/wxcomponents.h (97%)
create mode 100644 test/rangefiles/test6.rrng
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/3depict.git
More information about the debian-science-commits
mailing list