--- ifrit-3.3.4.orig/debian/rules +++ ifrit-3.3.4/debian/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. +# Modified for ifrit build by Mark Hymers 2004-2006 + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp + +build-stamp: $(QUILT_STAMPFN) + dh_testdir + cd build && cmake -D DESIRED_QT_VERSION:STRING=4 \ + -D QT_LIBRARY_DIR:STRING=/usr/lib/qt4 \ + -D QT_QMAKE_EXECUTABLE:STRING=/usr/bin/qmake-qt4 \ + -D CMAKE_EXE_LINKER_FLAGS:STRING=-Wl,--as-needed \ + -D CMAKE_COLOR_MAKEFILE:BOOL=FALSE \ + . + cd build && $(MAKE) VERBOSE=1 + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + -cd build && $(MAKE) clean + # Clean up stuff which make clean leaves behind + rm -f build/CMakeCache.txt build/cmake_install.cmake build/Makefile + rm -f configure/iconfiguresettings.ext.h + rm -fr build/CMakeFiles build/progress.make + rm -f configure-stamp build-stamp ifrit + # Clean CVS junk + find -name "\.#*" -delete + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + chrpath --delete ifrit || true + + install -d $(CURDIR)/debian/tmp/usr/bin + install -m0755 ifrit $(CURDIR)/debian/tmp/usr/bin + install -d $(CURDIR)/debian/tmp/usr/share/applications + install -m0644 debian/ifrit.desktop $(CURDIR)/debian/tmp/usr/share/applications + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_install --sourcedir=debian/tmp + dh_installmenu + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- ifrit-3.3.4.orig/debian/ifrit.manpages +++ ifrit-3.3.4/debian/ifrit.manpages @@ -0,0 +1 @@ +debian/ifrit.1 --- ifrit-3.3.4.orig/debian/control +++ ifrit-3.3.4/debian/control @@ -0,0 +1,21 @@ +Source: ifrit +Section: science +Priority: optional +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 7), libvtk5-dev, libqt4-dev, libqt4-opengl-dev, cmake, libncurses5-dev, libtiff4-dev, quilt, chrpath +Standards-Version: 3.8.3 +Homepage: http://sites.google.com/site/ifrithome/ +Vcs-Browser: http://git.debian.org/git/users/mhy/ifrit.git +Vcs-Git: git://git.debian.org/git/users/mhy/ifrit.git + +Package: ifrit +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, tcl-vtk +Description: powerful tool for visualizing 3-dimensional data sets + IFRIT (the Ionization FRont Interactive Tool) has its origins (and + hence name) in a specialized utility designed to visualize ionization + fronts in cosmological numerical simulations. IFRIT, however, has + outgrown its origins and now can visualize general data sets as well. + . + IFRIT is written in C++ and is based on two state-of-the-art toolkits: + the Visualization ToolKit (VTK) and a GUI toolkit QT. --- ifrit-3.3.4.orig/debian/ifrit.desktop +++ ifrit-3.3.4/debian/ifrit.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Name=IFRIT 3D Data Visualization +Name[en_GB]=IFRIT 3D Data Visualisation +GenericName=Data Visualization +GenericName[en_GB]=Data Visualisation +Comment=Visualize numerical simulations in 3D +Comment[en_GB]=Visualise numerical simulations in 3D +Type=Application +Exec=/usr/bin/ifrit +Icon=ifrit +Categories=Application;Science;Education;Physics; --- ifrit-3.3.4.orig/debian/changelog +++ ifrit-3.3.4/debian/changelog @@ -0,0 +1,189 @@ +ifrit (3.3.4-3) unstable; urgency=low + + * QA upload. + * Fix "ftbfs with GCC-4.7": add patch 02-gcc-4.7.diff: + declare SortWorker before using it. + (Closes: #667207) + * debian/rules: add build-{arch,indep} targets. + + -- gregor herrmann Wed, 02 May 2012 18:10:13 +0200 + +ifrit (3.3.4-2) unstable; urgency=low + + * QA upload. + * Remove debian/watch. Upstream now links to Google Docs + for download. I see now way to put that in a watch file. + * vtk-tcl seems to have been renamed to tcl-vtk. Change + Depends. (Closes: #619916) + * Update homepage link. + * Remove patch to allow build against VTK 5.4. 5.6 is used now. + + -- Frank Lichtenheld Sat, 09 Apr 2011 14:36:03 +0200 + +ifrit (3.3.4-1) unstable; urgency=low + + * New upstream release. Closes: #614433. + * Rebuild against libqt4. Closes: #604588. + * Don't hardcode VTK version, no longer necessary. + * Update debian/copyright. Closes: #566582. + * Orphan package. + + -- Mark Hymers Fri, 18 Mar 2011 23:04:13 +0000 + +ifrit (3.3.2-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.8.3. No changes needed. + + -- Mark Hymers Sun, 13 Sep 2009 14:53:24 +0100 + +ifrit (3.2.8-1) unstable; urgency=low + + * New upstream release. + + -- Mark Hymers Sun, 13 Sep 2009 13:41:27 +0100 + +ifrit (3.2.7-1) unstable; urgency=low + + * Add myself to Uploaders. + * New upstream release for compatibility with VTK 5.2. + * Update VTKDIR in debian/rules to /usr/lib/vtk-5.2. (Closes: #536904) + * Drop RPATH from /usr/bin/ifrit. + * Bump debhelper compatibility level to 7. + - Add ${misc:Depends} to ifrit binary package. + - Replace usages of deprecated `dh_clean -k` with `dh_prep`. + - Remove calls to dh_desktop - it is a no-op now. + * Add 01-gcc-4.3.diff to fix compilation with GCC 4.3. + * Bump Standards-Version to 3.8.2. + * Drop "Encoding=UTF-8" in debian/ifrit.desktop - it is now the default. + * Clean CVS conflict files left in upstream tarball. + * Add debian/watch file. + + -- Chris Lamb Sat, 15 Aug 2009 12:29:10 +0100 + +ifrit (3.2.5-1) unstable; urgency=low + + * New upstream release. + * Add Vcs-Browser and Vcs-Git fields. + + -- Mark Hymers Sat, 28 Jun 2008 16:42:51 +0100 + +ifrit (3.2.4-1) unstable; urgency=low + + * New upstream release. + * Remove dpatch support. + * Bump Standards-Version to 3.8.0. + + -- Mark Hymers Sun, 15 Jun 2008 21:33:02 +0100 + +ifrit (3.2.2-2) unstable; urgency=low + + * The "Running lintian on the right file considered helpful" release. + * Move Homepage to source stanza + * Use Applications/Science/Data Analysis as the menu section + + -- Mark Hymers Sat, 22 Dec 2007 17:51:09 +0000 + +ifrit (3.2.2-1) unstable; urgency=low + + * New upstream release. + * Add patch to fix building with gcc-4.3. Closes: #455164. + * Bump Standards-Version to 3.7.3. + * Move menu entry into Applications/Science instead of Apps/Science + + -- Mark Hymers Wed, 19 Dec 2007 12:05:27 +0000 + +ifrit (3.2.0-1) unstable; urgency=low + + * New upstream release. + + -- Mark Hymers Fri, 31 Aug 2007 13:40:20 +0100 + +ifrit (3.1.5-1) unstable; urgency=low + + * New upstream release. Closes: #420042. + + -- Mark Hymers Sun, 22 Jul 2007 18:51:30 +0100 + +ifrit (3.1.0-1) unstable; urgency=low + + * New upstream version. + * The "I'm bound to screw up my first non-sponsored upload" release. + * Use VERBOSE=1 in make call so that buildd logs are useful. + * Change VTKDIR to use /usr/lib/vtk-5.0 directly as /usr/lib/vtk + appears not to be supplied now. Yes, this'll make VTK changes + more painful. + * Add 01_no_patented.dpatch so we don't try and use any of the VTK + patented interfaces which aren't in the Debian package. + + -- Mark Hymers Sat, 7 Apr 2007 19:56:43 +0100 + +ifrit (3.0.5-1) unstable; urgency=low + + * New upstream version. + + -- Mark Hymers Sat, 28 Oct 2006 15:06:32 +0100 + +ifrit (3.0.0-1) unstable; urgency=low + + * New upstream version. Closes: #385517. + + -- Mark Hymers Wed, 30 Aug 2006 16:08:14 +0100 + +ifrit (2.9.6-2) unstable; urgency=low + + * Add a .desktop file from Phil Bull via Barry deFreese and Ubuntu. Thanks + to all concerned. Closes: #376927. Also add a dh_desktop call. + * Bump standards version to 3.7.2. No changes. + + -- Mark Hymers Sat, 15 Jul 2006 16:10:54 +0100 + +ifrit (2.9.6-1) unstable; urgency=low + + * New upstream release. + * Upstream has included Martin Michlmayr's patch to fix building on + g++-4.1. Closes: #357340. + * Add -Wl,--as-needed as a flag to the link stage to reduce the + number of libraries ifrit directly depends on (see + http://lists.debian.org/debian-devel-announce/2005/11/msg00016.html + for details) + + -- Mark Hymers Fri, 17 Mar 2006 14:03:56 +0000 + +ifrit (2.9.4-1) unstable; urgency=low + + * New upstream release. + + -- Mark Hymers Sat, 26 Nov 2005 14:02:48 +0000 + +ifrit (2.9.3-2) unstable; urgency=low + + * Rebuild for the C++ transition; needs vtk >= 4.4.2-8. Closes: #327937 + * Newer version of debhelper will install menu file in /usr/share/menu + instead of /usr/lib/menu to fix that lintian warning. + * Update to latest standards version. No package changes needed. + * Fix ifrit.1 macro error + + -- Mark Hymers Sat, 24 Sep 2005 10:53:49 +0100 + +ifrit (2.9.3-1) unstable; urgency=low + + * New upstream version. + + -- Mark Hymers Sat, 12 Mar 2005 09:58:48 +0000 + +ifrit (2.9-2) unstable; urgency=low + + * Update description in response to comments recived from user. + * Use versioned Build-Depend on libvtk4-dev (>= 4.2.6-5) which is the + first version which includes a correct shlibs file. Closes: #271759 + * Fix the FTBFS when using -rsudo (e.g. on mips and mipsel). Closes: #273375 + * Add depends on vtk-tcl. Closes: #273178. + + -- Mark Hymers Mon, 27 Sep 2004 15:21:33 +0100 + +ifrit (2.9-1) unstable; urgency=low + + * Initial Release. Closes: #234868. + + -- Mark Hymers Mon, 6 Sep 2004 22:10:00 +0100 --- ifrit-3.3.4.orig/debian/ifrit.1 +++ ifrit-3.3.4/debian/ifrit.1 @@ -0,0 +1,110 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH IFRIT 1 "September 09, 2004" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +ifrit \- a powerful tool that can be used to visualize 3-dimensional data sets +.SH SYNOPSIS +.B ifrit +[qt-options] [options] [dir_name] +.SH DESCRIPTION +This manual page documents briefly the +.B ifrit +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.SH OPTIONS +.TP +.B -8 +accepts an 8-bit display +.TP +.B -d +starts IFRIT with all windows docked together into a single window. +.TP +.B -nf +does not show the splash screen at start-up +.TP +.B -sw +uses small font to reduce the QT window size +.TP +.B -rw +IFRIT is being used remotely. This option can be used to minimize re-drawing +of the widget windows. +.TP +.B -ni +IFRIT is not idiosyncratic. This prompts IFRIT not to ask for a confirmation +when exiting or running scripts. +.TP +.B -np number +sets the number of processors to use. Note that only some parts of IFRIT +support parallel execution so far. +.TP +.B -i file_name +loads the state from the previously saved state file filename. +.TP +.B -b file_name +runs IFRIT in batch mode, taking animation script from the file filename. +If filename starts with sign "+", standard directories (see +.B ENVIRONMENT VARIABLES +) will be prepended to the file name. +.TP +.B -h -help +show the list of available command-line options. + +.SH ENVIRONMENT VARIABLES +IFRIT understands the following environment variables (all in capitals): +.TP +.B IFRIT_DIR +The main IFRIT directory where you keep the variable file ifrit.nam and +options file(s) ifrit.ini. If this variable is not set, IFRIT assumes that +current directory is the main directory. +.TP +.B IFRIT_DATA_DIR: +The default directory for the data files. If not set, IFRIT will start +searching for the data files in the current directory. +.TP +.B IFRIT_MESH_DATA_DIR +The default directory for the mesh data files. If not set, IFRIT will start +searching for the mesh data in the default data directory. +.TP +.B IFRIT_PART_DATA_DIR +The default directory for the particle data files. If not set, IFRIT will +start searching for the particle data in the default data directory. +.TP +.B IFRIT_VECT_DATA_DIR +The default directory for the vector field data files. If not set, IFRIT will +start searching for the vector field data in the default data directory. +.TP +.B IFRIT_TENS_DATA_DIR +The default directory for the tensor field data files. If not set, IFRIT will +start searching for the tensor field data in the default data directory. +.TP +.B IFRIT_IMAGE_DIR +The directory where IFRIT will place image and animation files. If not set, +IFRIT will put image files into the current directory. +.TP +.B IFRIT_SCRIPT_DIR +The directory where IFRIT will place animation scripts. If not set, IFRIT will +put scripts into its main directory. +.TP +.B IFRIT_PALETTE_DIR +The directory where IFRIT will place custom palettes. If not set, IFRIT will +put palettes into its main directory. +.SH SEE ALSO +The IFRIT help system. +.SH AUTHOR +This manual page was adapted by Mark Hymers +from the ifrit help system, for the Debian project (but may be used by others). --- ifrit-3.3.4.orig/debian/ifrit.dirs +++ ifrit-3.3.4/debian/ifrit.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/applications --- ifrit-3.3.4.orig/debian/compat +++ ifrit-3.3.4/debian/compat @@ -0,0 +1 @@ +7 --- ifrit-3.3.4.orig/debian/ifrit.install +++ ifrit-3.3.4/debian/ifrit.install @@ -0,0 +1,2 @@ +usr/bin/ifrit +usr/share/applications/ifrit.desktop --- ifrit-3.3.4.orig/debian/ifrit.menu +++ ifrit-3.3.4/debian/ifrit.menu @@ -0,0 +1,5 @@ +?package(ifrit):\ + needs="X11"\ + section="Applications/Science/Data Analysis"\ + title="ifrit"\ + command="/usr/bin/ifrit" --- ifrit-3.3.4.orig/debian/copyright +++ ifrit-3.3.4/debian/copyright @@ -0,0 +1,39 @@ +This work was packaged for Debian by: + + Mark Hymers on Sun, 05 Sep 2004 13:04:00 +0100. + +It was downloaded from: + + http://sites.google.com/site/ifrithome/ + +Upstream Author: + + Nick Gnedin + +Copyright: + + 2002-2011 Nick Gnedin + 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen + 2000 Trolltech AS. + +License: + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + +On Debian systems, the complete text of the GNU General +Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +The Debian packaging is: + + Copyright (C) 2004-2011 Mark Hymers and is licensed under +the GPL version 2 or later, see "/usr/share/common-licenses/GPL-2". + --- ifrit-3.3.4.orig/debian/patches/01-gcc-4.3.diff +++ ifrit-3.3.4/debian/patches/01-gcc-4.3.diff @@ -0,0 +1,15 @@ + +GCC 4.3 re-organised includes. + + -- Chris Lamb Sat, 15 Aug 2009 12:45:39 +0100 + +--- a/core/isystem.cpp ++++ b/core/isystem.cpp +@@ -32,6 +32,7 @@ + #include + //#include + #else ++#include + #include + #include + #include --- ifrit-3.3.4.orig/debian/patches/02-gcc-4.7.diff +++ ifrit-3.3.4/debian/patches/02-gcc-4.7.diff @@ -0,0 +1,56 @@ +Description: move SortWorker declaration before usage in Sort + otherwise we see a build failure with gcc 4.7 +Origin: vendor +Bug-Debian: http://bugs.debian.org/667207 +Forwarded: no +Author: gregor herrmann +Last-Update: 2012-05-02 + +--- a/core/iparticlesplitter.cpp ++++ b/core/iparticlesplitter.cpp +@@ -106,22 +106,6 @@ + #define SWAP(i1,i2) { SAVE(1,i1); MOVE(i1,i2); RESTORE(i2,1); } + + // +-// Do our own quick sort for efficiency reason (based on a Java code by Denis Ahrens) +-// +- +-template +-void Sort(iParticleSplitter *me, vtkIdType n, int ncom, int attSort, T *Points, float *Atts, float* Nrms) +-{ +- T poi1[3]; +- float nrm1[3]; +- float *att1; att1 = new float[ncom]; IERROR_ASSERT(att1); +- +- SortWorker(me,0,n-1,ncom,attSort,Points,Atts,Nrms,poi1,att1,nrm1); +- +- delete [] att1; +-} +- +-// + // Recursive worker + // + template +@@ -179,6 +163,22 @@ + } + } + ++// ++// Do our own quick sort for efficiency reason (based on a Java code by Denis Ahrens) ++// ++ ++template ++void Sort(iParticleSplitter *me, vtkIdType n, int ncom, int attSort, T *Points, float *Atts, float* Nrms) ++{ ++ T poi1[3]; ++ float nrm1[3]; ++ float *att1; att1 = new float[ncom]; IERROR_ASSERT(att1); ++ ++ SortWorker(me,0,n-1,ncom,attSort,Points,Atts,Nrms,poi1,att1,nrm1); ++ ++ delete [] att1; ++} ++ + }; + + --- ifrit-3.3.4.orig/debian/patches/series +++ ifrit-3.3.4/debian/patches/series @@ -0,0 +1,2 @@ +01-gcc-4.3.diff +02-gcc-4.7.diff