--- geomview-1.9.4.orig/debian/control +++ geomview-1.9.4/debian/control @@ -0,0 +1,56 @@ +Source: geomview +Section: math +Priority: optional +Homepage: http://www.geomview.org/ +Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/geomview/trunk/ +Maintainer: Debian Science Team +Uploaders: Steve M. Robbins +Build-Depends: cdbs, patchutils, debhelper (>= 5), lesstif2-dev, libgl1-mesa-dev, freeglut3-dev, texlive-latex-base | tetex-bin, texi2html, xutils-dev, texinfo, texlive-generic-recommended +Build-Conflicts: libutahglx-dev +Standards-Version: 3.8.3.0 + +Package: geomview +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info +Recommends: xpdf +Description: interactive geometry viewing program + Geomview is interactive geometry software which is + particularly appropriate for mathematics research and education. + In particular, geomview can display things in hyperbolic and + spherical space as well as Euclidean space. + . + Geomview allows multiple independently controllable objects and + cameras. It provides interactive control for motion, appearances + (including lighting, shading, and materials), picking on an + object, edge or vertex level, snapshots in SGI image file or + Renderman RIB format, and adding or deleting objects is provided + through direct mouse manipulation, control panels, and keyboard + shortcuts. External programs can drive desired aspects of the + viewer (such as continually loading changing geometry or + controlling the motion of certain objects) while allowing + interactive control of everything else. + +Package: libgeomview-1.9.4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: geomview library runtime + Geomview is interactive geometry software which is + particularly appropriate for mathematics research and education. + . + OOGL is the Object Oriented Graphics Library, upon which Geomview is + built. This package provides the run-time OOGL library for geomview + and its modules. + +Package: libgeomview-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: geomview library development package + Geomview is interactive geometry software which is + particularly appropriate for mathematics research and education. + . + OOGL is the Object Oriented Graphics Library, upon which Geomview is + built. This package provides the development package for OOGL, + required to build Geomview modules. + --- geomview-1.9.4.orig/debian/Notes +++ geomview-1.9.4/debian/Notes @@ -0,0 +1,8 @@ +Removing debian/patches for version 1.9.3. +Mostly, code inspection shows that the patch is no longer needed. + +Exception: debian/patches/07_set-fpu.diff +- the code to be patched is still there +- but 5 years have passed since this made the build fail on hppa (#123037) + let's see if it will build now without the patch. + --- geomview-1.9.4.orig/debian/libgeomview-dev.install +++ geomview-1.9.4/debian/libgeomview-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/libgeomview.so +debian/tmp/usr/lib/libgeomview.a +debian/tmp/usr/lib/libgeomview.la +debian/tmp/usr/share/man/man3 --- geomview-1.9.4.orig/debian/docs +++ geomview-1.9.4/debian/docs @@ -0,0 +1,7 @@ +AUTHORS +NEWS +README +doc/geomview.texi +doc/geomview.ps +doc/motion.tex +doc/oogltour --- geomview-1.9.4.orig/debian/doc-base +++ geomview-1.9.4/debian/doc-base @@ -0,0 +1,16 @@ +Document: geomview +Title: Geomview +Author: Stuart Levy, Tamara Munzner, Mark Phillips +Abstract: Geomview is an interactive program for viewing and + manipulating geometric objects, written by staff members of the + University of Minnesota Geometry Center. It can be used as a + standalone viewer for static objects or as a display engine for + other programs which produce dynamically changing geometry. +Section: Science/Mathematics + +Format: postscript +Files: /usr/share/doc/geomview/geomview.ps.gz + +Format: HTML +Index: /usr/share/doc/geomview/html/index.html +Files: /usr/share/doc/geomview/html/*.html --- geomview-1.9.4.orig/debian/rules +++ geomview-1.9.4/debian/rules @@ -0,0 +1,21 @@ +#! /usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS = --with-htmlbrowser=sensible-browser +DEB_MAKE_BUILD_TARGET = all +DEB_MAKE_CHECK_TARGET = check + +DEB_MAKE_INVOKE += moduledir=/usr/lib/geomview + +build/geomview:: doc/geomview.ps + +install/geomview:: + rm -f debian/tmp/usr/share/info/dir + dh_install debian/geomview.desktop usr/share/applications + dh_installexamples doc/example1.c doc/example2.c doc/example3.c doc/example4.tcl + +doc/geomview.ps: + $(MAKE) -C doc geomview.ps --- geomview-1.9.4.orig/debian/changelog +++ geomview-1.9.4/debian/changelog @@ -0,0 +1,373 @@ +geomview (1.9.4-2) unstable; urgency=low + + * geomview.desktop: Add category Education. + * menu: Change to section "Applications/Science/Mathematics". Thanks + Petter Reinholdtsen. Closes: #567625. + + * rules: Remove usage of obsolete dh_desktop. + + * control: Replace build-dep xutils --> xutils-dev (for imake). Remove + homepage from description. Add dep on "dpkg (>= 1.15.4) | + install-info" to geomview. Set Standards-Version to 3.8.3.0. + + * doc-base: Change to section "Science/Mathematics". Remove nonstandard + texi files. + + * patches/03_hvectext-hashbang.diff: New. Update script beginning to + use standard "#!/usr/bin/perl". + + -- Steve M. Robbins Sat, 30 Jan 2010 10:56:50 -0600 + +geomview (1.9.4-1) unstable; urgency=low + + * New upstream. Closes: #441431. + + -- Steve M. Robbins Sun, 23 Sep 2007 21:36:30 -0500 + +geomview (1.9.3-1) unstable; urgency=low + + * New upstream. Closes: #395474, #432044. + - Remove all debian/patches. + - HTML document displays images properly. Closes: #402040. + + * debian/control: New packages libgeomview-1.9.3, libgeomview-dev, + required to build geomview modules. Update standards version to + 3.7.2.2. + + * debian/patches/01_glob-redirect.diff: New. Application segfaults on + startup with 2>&- redirect. Change to 2>&1. + + * debian/patches/02_info-nofigs.diff: New. Don't install PNG figures + into info dir. + + -- Steve M. Robbins Sat, 01 Sep 2007 00:17:08 -0500 + +geomview (1.8.1-16) unstable; urgency=low + + * debian/rules: Switch to cdbs. Add -fno-strict-aliasing because the + build emits many "dereferencing type-punned pointer will break + strict-aliasing rules" warnings. + + * Move all patches to source into debian/patches. + + -- Steve M. Robbins Mon, 27 Aug 2007 00:59:02 -0500 + +geomview (1.8.1-15) unstable; urgency=low + + * debian/control: Add build-depend on texlive-generic-recommended for + access to epsf.tex. Closes: #421821. Change build-dep from + libglut3-dev to freeglut3-dev. Closes: #394493. + + * debian/rules: Install desktop file (thanks, Vassilis Pandis). + Closes: #375516. + + -- Steve M. Robbins Sun, 6 May 2007 21:48:52 -0500 + +geomview (1.8.1-14) unstable; urgency=low + + * debian/control: Change from lesstif-dev to lesstif2-dev. + Closes: #374239. + + * src/lib/gprim/geom/knownclass.c: Fix function prototypes using + supplied patch (thanks, Karl Chen). Closes: #366381. + + * debian/doc-base: Remove extra leading space on abstract. Closes: + #364857. + + -- Steve M. Robbins Thu, 22 Jun 2006 23:23:16 -0400 + +geomview (1.8.1-13) unstable; urgency=low + + * src/lib/oogl/util/futil.c: Patch to build on kFreeBSD. Also update + config.guess and config.sub from /usr/share/misc. Closes: #340702. + + * debian/control: Remove libmesa-glu-dev from build-depends, apparently + no longer needed. Closes: #363304. + + * data/Makefile.am: Fix up installation of data files, part of #272094. + + * debian/rules: Set CPPFLAGS=-I/usr/X11R6/include/X11 at configure time + in order to find forms.h. I presume the recent xorg v7 move means that + autoconf no longer sets x_includes=/usr/X11R6/include. + + -- Steve M. Robbins Sat, 22 Apr 2006 07:32:51 -0400 + +geomview (1.8.1-12) unstable; urgency=low + + * debian/control: Build for all architectures. The ftp team is too slow + to make changes. Closes: #351235. + + -- Steve M. Robbins Thu, 2 Mar 2006 22:58:27 -0500 + +geomview (1.8.1-11) unstable; urgency=low + + * debian/control: restore alpha to architectures. Closes: #314988. + + -- Steve M. Robbins Fri, 3 Feb 2006 00:16:15 -0500 + +geomview (1.8.1-10) unstable; urgency=low + + * debian/control: Add "texinfo" to build-deps so that command "makeinfo" + is available. Closes: #338773. + + * debian/control: Restrict architectures. This package was not designed + for 64-bit machines. Closes: #314988. + + -- Steve M. Robbins Sat, 12 Nov 2005 13:04:55 -0500 + +geomview (1.8.1-9) unstable; urgency=low + + * geomview.sh: Exit with status 0 (not 1) when invoked with "-help" + option. Fix diagnostic emitted when invoked with "-graphics" and no + alternatives exist. + + * debian/control: Build-depend on version 4 of debhelper. + + * debian/rules: Update to debhelper version 4. + + * Avoid implicitly converted pointer by compiling with _GNU_SOURCE + defined so that fmemopen() is defined. This also pulls in a + definition of getline() that conflicts with that of + src/bin/example/oogl.c. However, the getline function of oogl.c is + not used, so it is deleted. Closes: #325033. + + -- Steve M. Robbins Sat, 17 Sep 2005 16:40:52 -0400 + +geomview (1.8.1-8) unstable; urgency=low + + * doc/geomview.texi: Apply patch to build without psfig.sty (thanks, + Frank Küster). + + * debian/rules: Revert changes in 1.8.1-7; PS documentation is now built + again. + + -- Steve M. Robbins Sun, 12 Sep 2004 13:40:05 -0400 + +geomview (1.8.1-7) unstable; urgency=low + + * debian/rules: Don't build geomview.ps since file psfig.sty has been + removed from debian. Closes: #264856. + + * debian/control: Build-depend on xutils to ensure "imake" is available; + this allows the xforms libraries to be correctly detected. Closes: #253669. + + * debian/control: Remove obsolete remark about non-inclusion of libforms + modules. Closes: #228891 + + * debian/menu: Quote "X11". + + * src/bin/geomutil/plutil/offconsol.1: Set manpage section to "1". + + -- Steve M. Robbins Wed, 11 Aug 2004 23:43:35 -0400 + +geomview (1.8.1-6) unstable; urgency=low + + * configure.in: Link with math library unconditionally. Needed + for m68k. + + * Stereo module: Check for setmon binary, issue diagnostic if not + found. Closes: #180635. + + * debian/control(Build-Depends): Switch from xlibmesa-dev to + xlibmesa-{gl,glu}-dev. + + -- Steve M. Robbins Sat, 25 Oct 2003 12:26:02 -0400 + +geomview (1.8.1-5) unstable; urgency=low + + * Apply sourceforge patch #803292, allowing to build with GCC 3.2. + Thanks, Claus-Justus Heine. Changes the license to GPL. + Closes: #187088, #133300. + + -- Steve M. Robbins Sat, 11 Oct 2003 14:27:54 -0400 + +geomview (1.8.1-4) unstable; urgency=low + + * GCC 3.2 transition. + Geomview does not build with GCC 3.x; build-depend on gcc-2.95. + + * XForms library is now in main. + Build xforms modules. Closes: #67189, #172625. + + * Update to policy 3.5.8. + + -- Steve M. Robbins Sun, 2 Feb 2003 17:11:51 -0500 + +geomview (1.8.1-3) unstable; urgency=low + + * debian/control: Specify xlibmesa-dev as preferred libgl-dev package. + Closes: #142129. Build-conflict with libutahglx-dev until that + package is fixed or stops providing libgl-dev. + + -- Steve M. Robbins Sun, 27 Oct 2002 01:15:56 -0400 + +geomview (1.8.1-2) unstable; urgency=low + + * Only set FPU control word if _FPU_IEEE is defined. + Closes: #123037. + * Update config.{guess,sub}. + * Do not use auto-* tools during build. + + -- Steve M. Robbins Sun, 13 Jan 2002 02:23:28 -0500 + +geomview (1.8.1-1) unstable; urgency=low + + * New upstream version. + - fixes non-appearing ToggleButton widgets. + * Don't install INSTALL.Geomview. + * Configure using --with-build-path=/usr/X11R6 to find motif. + + -- Steve M. Robbins Sat, 24 Mar 2001 17:08:13 -0500 + +geomview (1.8.0-5) unstable; urgency=low + + * Detect flavour of setgprp() and call appropriately; + detect existence of fpu-setting function (Closes: Bug#86736). + * Include manpages for bez2mesh, math2oogl, oogl2rib, oogl2vrml, and vrml2oogl. + + -- Steve M. Robbins Thu, 22 Feb 2001 23:49:18 -0500 + +geomview (1.8.0-4) unstable; urgency=low + + * Fix glibc glue code (Closes #67396). + * Configure using --without-xforms (Closes #82571). + * Don't install generic INSTALL. + * Add "texi2html" to Build-Depends. + * Update to policy 3.5.1.0: + * Build without debugging symbols. + + -- Steve M. Robbins Sun, 18 Feb 2001 18:14:53 -0500 + +geomview (1.8.0-3) unstable; urgency=low + + * Removed Build-Conflicts line. + * Upload to debian. Closes: #68315 + + -- Steve M. Robbins Tue, 28 Nov 2000 01:06:22 -0500 + +geomview (1.8.0-2) unstable; urgency=low + + * Make the diff file smaller by removing many generated files: + debian "clean" rule runs "make maintainer-clean", then removes "configure", + and all "Makefile.in" files. Added a "preconfigure" rule to regenerate + "configure" and friends. + * Add Build-Depends: automake, autoconf for above. + * Add Build-Conflicts: libforms to prevent inadvertantly linking with the + non-free XFORMS library. + + -- Steven Michael Robbins Sat, 25 Nov 2000 10:29:16 -0500 + +geomview (1.8.0-1) unstable; urgency=low + + * New upstream version. + + -- Steven Michael Robbins Sat, 25 Nov 2000 10:29:16 -0500 + +geomview (1.7.10-1) unstable; urgency=low + + * New maintainer. + * New upstream version. Since it now uses autoconf, I threw away the + old debian/* directory and started again with "dh_make". + + -- Steven Michael Robbins Sat, 4 Nov 2000 18:03:40 -0500 + +geomview (1.6.1.9-11.1) frozen unstable; urgency=low + + * NMU to fix RCB. Recompiled with the latest mesag-dev. Closes: #59585 + * Use -lGL & -lGLU instead of -lMesaGL & -lMesaGLU. + + -- Raphael Hertzog Tue, 21 Mar 2000 20:15:30 +0100 + +geomview (1.6.1.9-11) unstable; urgency=low + + * Fixed clean target. closes: #49016 + + -- Randolph Chung Sun, 7 Nov 1999 19:40:13 -0700 + +geomview (1.6.1.9-10) unstable; urgency=low + + * Fixed silly problem in debian/rules. Closes: #48557 + + -- Randolph Chung Thu, 28 Oct 1999 19:56:15 -0700 + +geomview (1.6.1.9-9) unstable; urgency=low + + * New maintainer + * /usr/doc -> /usr/share/doc transition + * Source build reorganization. Hope I didn't break anything :P Now uses + doogie's dbs_make. + * Includes original pristine sources, closes: #44236 + * Relinked with proper lesstif library, closes: #48165 + * Directory structure has been reorganized to be more FHS compliant + + -- Randolph Chung Sun, 24 Oct 1999 23:45:34 -0700 + +geomview (1.6.1.9-8) unstable; urgency=low + + * Don't build contrib package ever. + + -- John Lapeyre Thu, 1 Jul 1999 04:35:16 -0700 + +geomview (1.6.1.9-7) unstable; urgency=low + + * Don't try to build contrib package if libforms not present + + -- John Lapeyre Tue, 29 Jun 1999 15:57:58 -0700 + +geomview (1.6.1.9-6) unstable; urgency=low + + * A couple hacks so it compiles with glibc 2.1 + + -- John Lapeyre Sun, 27 Jun 1999 22:52:08 -0700 + +geomview (1.6.1.9-5) unstable frozen; urgency=low + + * Change a Recommends to Suggests. + * Upload to both unstable and frozen. + + -- John Lapeyre Sat, 14 Nov 1998 17:05:03 -0700 + +geomview (1.6.1.9-4) unstable; urgency=low + + * Link against new mesag + + -- John Lapeyre Fri, 30 Oct 1998 03:56:47 -0700 + +geomview (1.6.1.9-3) unstable; urgency=low + + * Link against new libstdc++ + * must leave explicit call to egcc . + + -- John Lapeyre Mon, 28 Sep 1998 04:31:53 -0700 + +geomview (1.6.1.9-2) unstable; urgency=low + + * scripts in debian cannot be executable, so + call them via 'perl scriptname'. + + -- John Lapeyre Fri, 4 Sep 1998 17:27:34 -0700 + +geomview (1.6.1.9-1) unstable; urgency=low + + * Newer upstream source fixes many bugs. + * all compile errors gone. + * works better with lesstif + * opengl rendering now unstable, use x11 for default. + * separate libforms-using items into separate package + so geomview can go in main. + + -- John Lapeyre Mon, 17 Aug 1998 02:37:56 -0700 + +geomview (1.6.1-2) unstable; urgency=low + + * Changed description and distribution + + -- John Lapeyre Wed, 12 Aug 1998 18:12:21 -0700 + +geomview (1.6.1-1) unstable; urgency=low + + * Initial Release. + + -- John Lapeyre Sun, 2 Aug 1998 15:07:15 -0700 + + --- geomview-1.9.4.orig/debian/menu +++ geomview-1.9.4/debian/menu @@ -0,0 +1,4 @@ +?package(geomview):needs="X11"\ + section="Applications/Science/Mathematics"\ + title="geomview"\ + command="/usr/bin/geomview" --- geomview-1.9.4.orig/debian/compat +++ geomview-1.9.4/debian/compat @@ -0,0 +1 @@ +5 --- geomview-1.9.4.orig/debian/libgeomview-1.9.4.install +++ geomview-1.9.4/debian/libgeomview-1.9.4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libgeomview-*.so --- geomview-1.9.4.orig/debian/geomview.install +++ geomview-1.9.4/debian/geomview.install @@ -0,0 +1,7 @@ +debian/tmp/usr/bin +debian/tmp/usr/lib/geomview +debian/tmp/usr/share/geomview +debian/tmp/usr/share/doc/geomview +debian/tmp/usr/share/info +debian/tmp/usr/share/man/man1 +debian/tmp/usr/share/man/man5 --- geomview-1.9.4.orig/debian/geomview.desktop +++ geomview-1.9.4/debian/geomview.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=Geomview +Comment=Interactive geometry viewing program +Exec=geomview +Icon=geomview +Type=Application +Terminal=false +Categories=Application;Math;Science;Education --- geomview-1.9.4.orig/debian/README.Debian +++ geomview-1.9.4/debian/README.Debian @@ -0,0 +1,32 @@ + File Locations + -------------- + +Data files are installed in /usr/share/geomview/data. + +Mathematica ".m" files are installed in /usr/share/geomview/mathematica. + +Modules are installed in /usr/lib/geomview; modules that require XForms +are not included. A couple of the modules have manpages, which can +be found in /usr/share/doc/geomview. Code for example modules is +located in /usr/share/doc/geomview/examples. + + + Dump Core Now? + -------------- + +If something goes terribly wrong, geomview asks whether to +stop with a message such as: + + > geomview tetra + Geomview: internal error: Illegal instruction; dump core now (y/n) [n] ? + +One common cause for this is if the OpenGL libs are missing, damaged, +or mismatched, e.g. + + http://bugs.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=105488 + +Please check that you can indeed run some other open GL application, +such as glxinfo or glxgears before reporting a problem. + + + -- Steve M. Robbins , Sat Jul 5 16:41:07 2003 --- geomview-1.9.4.orig/debian/copyright +++ geomview-1.9.4/debian/copyright @@ -0,0 +1,41 @@ +This package was debianized by John Lapeyre in August 1998. + +It has subsequently been maintained by Randolph Chung, and the current +maintainer is Steven Robbins . + +It was downloaded from http://geomview.org. + +Upstream Authors: + + Copyright (C) 1992-1998 The Geometry Center + Copyright (C) 1998-2000 Stuart Levy, Tamara Munzner, Mark Phillips + +Copyright: + +This copy of geomview contains code licensed under the GNU GPL and +code licensed under the GNU LGPL. For the latter code, clause #3 of +the LGPL is applied and the whole of this copy of geomview is +therefore offered under the GNU Public License version 2. On Debian +systems, the complete text of the GNU General Public License can be +found in /usr/share/common-licenses/GPL-2 file. + +Original Geomview license: + +Geomview is free software; you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as published +by the Free Software Foundation; either version 2, or (at your option) +any later version. + +On Debian systems, the complete text of the GNU Lesser General Public +License can be found in /usr/share/common-licenses/LGPL-2.1 file. + + +License of src/lib/oogl/util/seekpipe.c: + + Copyright (C) 2003 Claus-Justus Heine + + This program 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, or (at your option) + any later version. + --- geomview-1.9.4.orig/debian/patches/03_hvectext-hashbang.diff +++ geomview-1.9.4/debian/patches/03_hvectext-hashbang.diff @@ -0,0 +1,11 @@ +--- geomview-1.9.4.obsolete.0.817206016349704/src/bin/geomutil/hvectext/hvectext.in 2006-07-27 18:46:54.000000000 -0500 ++++ geomview-1.9.4/src/bin/geomutil/hvectext/hvectext.in 2010-01-30 10:10:18.000000000 -0600 +@@ -1,7 +1,4 @@ +-: +-eval 'exec perl -S $0 ${1+"$@"}' +- if $running_under_some_shell; +- ++#!/usr/bin/perl + # Copyright (c) 1995, Geometry Center, University of Minnesota + # Script by Stuart Levy, Geometry Center. + # Uses Hershey fonts as encoded for Ghostscript. --- geomview-1.9.4.orig/debian/patches/02_info-nofigs.diff +++ geomview-1.9.4/debian/patches/02_info-nofigs.diff @@ -0,0 +1,129 @@ +Index: doc/Makefile.am +=================================================================== +RCS file: /home/steve/lib/cvs/debian/geomview/doc/Makefile.am,v +retrieving revision 1.4 +diff -u -b -B -r1.4 Makefile.am +--- doc/Makefile.am 24 Sep 2007 02:35:53 -0000 1.4 ++++ doc/Makefile.am 24 Sep 2007 02:53:50 -0000 +@@ -19,8 +19,6 @@ + + AM_MAKEINFOFLAGS = --no-validate + info_TEXINFOS = geomview.texi geomview-pt_BR.texi +-infoimgdir = $(infodir) +-nobase_infoimg_DATA = $(PNGIMAGES) + + geomview_pt_BR_texi_MAKEINFOFLAGS = --enable-encoding --lang=pt + +Index: doc/Makefile.in +=================================================================== +RCS file: /home/steve/lib/cvs/debian/geomview/doc/Makefile.in,v +retrieving revision 1.10 +diff -u -b -B -r1.10 Makefile.in +--- doc/Makefile.in 24 Sep 2007 02:35:53 -0000 1.10 ++++ doc/Makefile.in 24 Sep 2007 02:54:45 -0000 +@@ -64,8 +64,7 @@ + AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) + DVIPS = dvips + am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man3dir)" \ +- "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(docdir)" \ +- "$(DESTDIR)$(infoimgdir)" ++ "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(docdir)" + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +@@ -77,8 +76,7 @@ + NROFF = nroff + MANS = $(man_MANS) + docDATA_INSTALL = $(INSTALL_DATA) +-nobase_infoimgDATA_INSTALL = $(install_sh_DATA) +-DATA = $(doc_DATA) $(nobase_infoimg_DATA) ++DATA = $(doc_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ +@@ -265,8 +263,6 @@ + + AM_MAKEINFOFLAGS = --no-validate + info_TEXINFOS = geomview.texi geomview-pt_BR.texi +-infoimgdir = $(infodir) +-nobase_infoimg_DATA = $(PNGIMAGES) + geomview_pt_BR_texi_MAKEINFOFLAGS = --enable-encoding --lang=pt + dochtmldir = $(docdir)/html + doc_DATA = geomview.pdf geomview-pt_BR.pdf +@@ -609,25 +605,6 @@ + echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ + rm -f "$(DESTDIR)$(docdir)/$$f"; \ + done +-install-nobase_infoimgDATA: $(nobase_infoimg_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(infoimgdir)" || $(MKDIR_P) "$(DESTDIR)$(infoimgdir)" +- @$(am__vpath_adj_setup) \ +- list='$(nobase_infoimg_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- $(am__vpath_adj) \ +- echo " $(nobase_infoimgDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(infoimgdir)/$$f'"; \ +- $(nobase_infoimgDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(infoimgdir)/$$f"; \ +- done +- +-uninstall-nobase_infoimgDATA: +- @$(NORMAL_UNINSTALL) +- @$(am__vpath_adj_setup) \ +- list='$(nobase_infoimg_DATA)'; for p in $$list; do \ +- $(am__vpath_adj) \ +- echo " rm -f '$(DESTDIR)$(infoimgdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(infoimgdir)/$$f"; \ +- done + tags: TAGS + TAGS: + +@@ -668,7 +645,7 @@ + check: check-am + all-am: Makefile $(INFO_DEPS) $(MANS) $(DATA) all-local + installdirs: +- for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(infoimgdir)"; do \ ++ for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(docdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am +@@ -717,7 +694,7 @@ + info-am: $(INFO_DEPS) + + install-data-am: install-data-local install-docDATA install-info-am \ +- install-man install-nobase_infoimgDATA ++ install-man + + install-dvi: install-dvi-am + +@@ -829,7 +806,7 @@ + + uninstall-am: uninstall-docDATA uninstall-dvi-am uninstall-html-am \ + uninstall-info-am uninstall-local uninstall-man \ +- uninstall-nobase_infoimgDATA uninstall-pdf-am uninstall-ps-am ++ uninstall-pdf-am uninstall-ps-am + + uninstall-man: uninstall-man3 uninstall-man5 + +@@ -842,17 +819,17 @@ + install-data-am install-data-local install-docDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ +- install-man3 install-man5 install-nobase_infoimgDATA \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-1 maintainer-clean-aminfo \ ++ install-man3 install-man5 install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-1 maintainer-clean-aminfo \ + maintainer-clean-generic maintainer-clean-vti mostlyclean \ + mostlyclean-1 mostlyclean-aminfo mostlyclean-generic \ + mostlyclean-libtool mostlyclean-vti pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-docDATA uninstall-dvi-am \ + uninstall-html-am uninstall-info-am uninstall-local \ +- uninstall-man uninstall-man3 uninstall-man5 \ +- uninstall-nobase_infoimgDATA uninstall-pdf-am uninstall-ps-am ++ uninstall-man uninstall-man3 uninstall-man5 uninstall-pdf-am \ ++ uninstall-ps-am + + + geomview.pdf: $(PDFIMAGES) --- geomview-1.9.4.orig/debian/patches/01_glob-redirect.diff +++ geomview-1.9.4/debian/patches/01_glob-redirect.diff @@ -0,0 +1,16 @@ +Index: src/lib/oogl/util/glob.c +=================================================================== +RCS file: /home/steve/lib/cvs/debian/geomview/src/lib/oogl/util/glob.c,v +retrieving revision 1.3 +diff -u -b -B -r1.3 glob.c +--- src/lib/oogl/util/glob.c 27 Aug 2007 07:08:46 -0000 1.3 ++++ src/lib/oogl/util/glob.c 31 Aug 2007 05:30:59 -0000 +@@ -74,7 +74,7 @@ + void (*oldsigchld)() = signal(SIGCHLD, SIG_DFL); + #endif + +- sprintf(cmd, GLOB_SHELL"\"echo %s\" 2>&-", s); ++ sprintf(cmd, GLOB_SHELL"\"echo %s\" 2>&1", s); + fp = popen(cmd, POPEN_RB); + + if (fp == NULL) {