--- k3d-0.6.7.0.orig/debian/control +++ k3d-0.6.7.0/debian/control @@ -0,0 +1,50 @@ +Source: k3d +Section: graphics +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: David Martínez Moreno +Build-Depends: debhelper (>= 5.0.37.2), libsigc++-2.0-dev, libx11-dev, libgl1-mesa-dev, libglu1-mesa-dev | libglu-dev, libgtkmm-2.4-dev, xsltproc, libfreetype6-dev, libtiff4-dev, libmagick++9-dev, graphviz, netpbm, libsuperlu3-dev, gettext, python, python-dev, python-support (>= 0.5.3), plib1.8.4-dev, libopenexr-dev, libgts-dev, libgtkglext1-dev, libboost-dev, libboost-regex-dev, libboost-date-time-dev, librsvg2-bin (>> 2.9.5-5), g++ (>=4.1.1-9), quilt +# Comments for Build-Depends: +# librsvg2-bin (>> 2.9.5-5): +# In versions 2.9.5-5 and before, rsvg did not work with relative paths, +# as used by k3d's Makefiles. I sent a patch to solve this (#315822). +# g++-4.1 (>=4.1.1-9): +# Before 4.1.1-9, g++-4.1 treated uninstantiated data wrongly, thus leading +# to errors like: +# .libs/user_interface.o:(.data+0x0): multiple definition of `_ZN5boost9date_time18parse_match_resultIT_E11PARSE_ERRORE' +# .libs/black_box_recorder.o:(.data+0x0): first defined here +# collect2: ld returned 1 exit status +Standards-Version: 3.8.0 + +Package: k3d +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, gpp, librsvg2-2 +Suggests: aqsis +XB-Python-Version: ${python:Versions} +XS-Python-Version: current +Description: 3D modeling and animation system + K-3D is designed from-the-ground-up to generate motion-picture-quality + animation with RenderMan-compliant render engines (such as aqsis). + . + Some of its features are: + . + - Record and play back interactive tutorials and macros. + - Able to create and edit documents in multiple realtime OpenGL + solid, shaded, texture-mapped views. You can even model, animate, and + interact with animations while they play back. + - Unlimited Undos/Redos. + - Default output to Pixar Renderman Interface Bytestream (RIB) files. + - K-3D documents are stored using a simple, flexible, easy-to-understand + XML markup. + - Scripting interface supports Python, with open API for other scripting + languages. + - Plugin support through its architecture in ANSI C++ and GTK+. + +Package: k3d-dev +Architecture: any +Depends: k3d (= ${binary:Version}) +Description: 3D modeling and animation system - Development files + K-3D is designed from-the-ground-up to generate motion-picture-quality + animation with RenderMan-compliant render engines. + . + This package contains header files for development of K-3D. --- k3d-0.6.7.0.orig/debian/k3d-dev.install +++ k3d-0.6.7.0/debian/k3d-dev.install @@ -0,0 +1,3 @@ +usr/include +usr/lib/*.la +usr/lib/k3d/*.la --- k3d-0.6.7.0.orig/debian/compat +++ k3d-0.6.7.0/debian/compat @@ -0,0 +1 @@ +4 --- k3d-0.6.7.0.orig/debian/k3d.install +++ k3d-0.6.7.0/debian/k3d.install @@ -0,0 +1,8 @@ +usr/bin +usr/lib/*.so.* +usr/lib/*.so +usr/lib/k3d/*.so.* +usr/lib/k3d/*.so +usr/share/k3d/ +usr/share/man +usr/share/applications --- k3d-0.6.7.0.orig/debian/rules +++ k3d-0.6.7.0/debian/rules @@ -0,0 +1,110 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +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 + + +config.status: configure patch + dh_testdir + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --with-external-boost \ + --with-graphviz + +build: build-stamp + +build-stamp: config.status + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # I do not know WHY, but k3d tries to rebuild *all* the Makefiles before cleaning. + # I have noticed that I can avoid it by modifying the date of config.status and Makefile. + [ ! -f Makefile ] || touch config.status Makefile + + [ ! -f Makefile ] || $(MAKE) distclean + -rm -f config.status + -rm -f config.log + +#ifneq "$(wildcard /usr/share/misc/config.sub)" "" +# cp -f /usr/share/misc/config.sub config.sub +#endif +#ifneq "$(wildcard /usr/share/misc/config.guess)" "" +# cp -f /usr/share/misc/config.guess config.guess +#endif + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + # We will fix this tutorial for 0.6.6.0.ds1. I will change the upstream tarball on the next release. + zcat $(CURDIR)/debian/tmp/usr/share/k3d/tutorials/gts_boolean.py > $(CURDIR)/debian/tmp/usr/share/k3d/tutorials/gts_boolean.py.final && \ + mv $(CURDIR)/debian/tmp/usr/share/k3d/tutorials/gts_boolean.py.final $(CURDIR)/debian/tmp/usr/share/k3d/tutorials/gts_boolean.py + +# Build architecture-independent files here. +#binary-indep: build install +binary-indep: +# There is nothing to do. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -s + dh_testroot -s + dh_installchangelogs -s ChangeLog + dh_installdocs -s + dh_installexamples -s + dh_install -s --sourcedir=debian/tmp --list-missing + dh_installmenu -s + dh_installman -s + dh_link -s + dh_strip -s + dh_compress -s + dh_fixperms -s + dh_pysupport -s + dh_makeshlibs -s + dh_installdeb -s + dh_shlibdeps -s -ldebian/k3d/usr/lib + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install + --- k3d-0.6.7.0.orig/debian/k3d-dev.dirs +++ k3d-0.6.7.0/debian/k3d-dev.dirs @@ -0,0 +1,2 @@ +/usr/include +/usr/lib --- k3d-0.6.7.0.orig/debian/copyright +++ k3d-0.6.7.0/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by David Martínez Moreno on +Sat, 22 May 2004 15:20:45 +0200 + +It was downloaded from http://k3d.sf.net/ + +Upstream Authors: The K-3D Team + +Copyright: 1995-2005 Timothy M. Shead + 2002-2005 Romain Behar + +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; version 2 dated June, 1991. + + 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- k3d-0.6.7.0.orig/debian/k3d.menu +++ k3d-0.6.7.0/debian/k3d.menu @@ -0,0 +1,2 @@ +?package(k3d):needs="X11" section="Applications/Graphics"\ + title="K-3D" command="/usr/bin/k3d" --- k3d-0.6.7.0.orig/debian/changelog +++ k3d-0.6.7.0/debian/changelog @@ -0,0 +1,515 @@ +k3d (0.6.7.0-2.5ubuntu1) lucid; urgency=low + + * 08_sigc++_headers.patch: add missing headers to fix FTBFS. + + -- Ilya Barygin Mon, 22 Feb 2010 20:55:37 +0300 + +k3d (0.6.7.0-2.5) unstable; urgency=low + + * Non-maintainer upload. + * New patch 07_gcc4.4_build to fix FTBFS against gcc 4.4; patch from + Ubuntu. (Closes: #545235, #560502) + + -- Stefano Zacchiroli Sat, 02 Jan 2010 14:36:51 +0100 + +k3d (0.6.7.0-2.4) unstable; urgency=low + + * Non-maintainer upload. + * Extend debian/patches/05_gcc4.3_build.patch with more include fixes + from Petr Salinger. (closes: #492858) + + -- Aurelien Jarno Fri, 05 Sep 2008 13:09:16 +0200 + +k3d (0.6.7.0-2.3) unstable; urgency=low + + * Non-maintainer upload. + * Fixed another bashism, closes: #486037 + * Upgraded menu file to new structure. + * Bumped Standards-Version to 3.8.0. + + -- Michael Meskes Sun, 22 Jun 2008 13:18:01 +0200 + +k3d (0.6.7.0-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Applied patch to remove bashisms, closes: #464997 + * Changed compiler from g++-4.1 to g++, closes: #463299 + * Bumped standard to 3.7.3. + + -- Michael Meskes Mon, 14 Apr 2008 08:20:08 +0000 + +k3d (0.6.7.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Extend debian/patches/05_gcc4.3_build.patch with more include fixes from + Anibal Avelar. (Closes: #455678) + + -- Adeodato Simó Wed, 2 Apr 2008 13:57:28 +0200 + +k3d (0.6.7.0-2) unstable; urgency=low + + * debian/rules: Argh. In my narrow-mindedness for avoiding rebuilding of + Makefiles, I forgot to protect the touch config.status Makefile with a + [ ! -f Makefile ], so the make distclean ended with error. Closes: + #434118. + + -- David Martínez Moreno Sat, 21 Jul 2007 20:07:55 +0200 + +k3d (0.6.7.0-1) unstable; urgency=low + + * This package is dedicated to the countless Ubuntu developers that do not + report any bug back to Debian. Thanks, you make life less pleasant. + * New upstream release: + - First iteration of the new animation output dialog. + - Replaced boost::filesystem::path with k3d::filesystem::path. + - Created k3d::ustring for working with UTF-8 text. + - Replaced k3d::frames with k3d::file_range. + - Removed obsolete POV render engine plugin. + - Remove unused code. + - NGUI Log Window includes timestamps. + - Better scrolling for the NGUI console control. + * debian/control: + - Removed libboost-filesystem-dev from Build-Depends. + - Replaced old ${Source-Version} with ${binary:Version}. + - Finally moved local patches to quilt, so we Build-Depend on it. + * debian/rules: + - Fixed stupidly compressed tutorial (share/tutorials/gts_boolean.py) + without proper extension, thus dropping a warning in the installation. + - Fixed a lintian error about ignoring errors in distclean target. + * debian/patches/02_boost-mt_libs.patch: Patched configure to point to + -lboost_*-mt instead of lboost_*. Closes: #425893. + * debian/patches/05_gcc4.3_build.patch: Added a fix for GCC 4.3 builds. + Thanks, Martin Michlmayr (closes: #417284). + * Removed debian/pycompat. + + -- David Martínez Moreno Thu, 19 Jul 2007 00:57:51 +0200 + +k3d (0.6.6.0.ds1-1) unstable; urgency=low + + * New upstream release. + + -- David Martínez Moreno Tue, 9 Jan 2007 03:25:40 +0100 + +k3d (0.6.5.0.ds1-1) unstable; urgency=low + + * New upstream release. List of main changes follows: + - FrozenMesh, K3DMeshInput, and OBJMeshInput plugins have a "reset" button + in the Node Properties Panel that forces an update. + - Directed graph loop-detection code didn't work in all cases. + - Python tutorials weren't getting installed. + - Revert inadvertent change to the code::blocks build + - Synchronize code::blocks build. + - The switch to shared mesh instance archives broke automatic RenderMan + shader compilation. + - File > Revert command didn't update the UI layer correctly. + - Merged fix from Debian for compile error in + modules/quadrilateral_remeshing/quadrilateral_remeshing.cpp. + * Pulled patch from Ubuntu packages in order to use .desktop file provided + in the package and modified to make it standards-compliant. Thanks, + Adri2000. + * debian/rules: Added --list-missing to dh_install. Let's see if I am + missing any other thing. + + -- David Martínez Moreno Wed, 3 Jan 2007 04:03:04 +0100 + +k3d (0.6.4.0.ds1-1) unstable; urgency=low + + * New upstream release. Main changes are: + - Reduce output RIB file size. + - Enabled mnemonic labels for most menu items and the Safe Close Dialog. + - Safe Close Dialog did not correctly treat the escape key as a "cancel" operation. + - Fixed several compile-time problems. + - Removed debugging output. + - Enhanced installer. + - Cleanup and organize sample documents. + - Added control over Axes plugin colors + - Improved copyright texts. + - Added mesh selection support to the Python API. + - Several other fixes. + * Removed debian/docs that included spurious templates pointing to the + website (closes: #401502). + * Patched Makefile.in in order to remove config.status.lineno in the + distclean target. + + -- David Martínez Moreno Tue, 5 Dec 2006 20:50:50 +0100 + +k3d (0.6.0.0.ds1-1) unstable; urgency=low + + * New upstream release. Final stable release. Main changes since 0.5.12.0: + - Enhanced tutorials, and added new ones. + - Fixes for gcc 4.1.1 builds. + - Code cleanup and lots of bugfixes. + - Updated rasterization of SVG icons. + - Remove debug output + - Better startup messages. + - Fix QTUI build. + * I do not know why upstream let all the Makefiles and other cruft behind in + the tarball, but after running a manual make distclean, the orig.tar.gz is + 1 MB smaller! That also fixed the "X-File" problem of letting + config.{status,log} files behind. + * debian/control: + - General redo of Build-Depends. Droppped python2.3 in favour of + python2.4 (closes: #395993). + - Removed [!ia64] for g++-4.1 in Build-Depends. + - Bumped Standards-Version to 3.7.2.2. + * Removed all the patches from 0.5.12.0 except for the additional #include + in modules/quadrilateral_remeshing/quadrilateral_remeshing.cpp. This + version builds normally with g++-4.1.1. + * Updated config.guess and config.sub to latest versions. + * Fixed building in order to support the new Python policy (closes: #380849): + - debian/control: Added python-support (>= 0.3) to B-D. Bumped + dependency on debhelper (>= 5.0.37.2). + - Added an 'XB-Python-Version: ${python:Versions}' field to k3d. + - Added an 'XS-Python-Version: current' field to k3d. + - debian/rules: Replaced dh_python with dh_pysupport. + - debian/pycompat: Created with a content of '2'. + + -- David Martínez Moreno Sat, 2 Dec 2006 18:16:41 +0100 + +k3d (0.5.12.0-2) unstable; urgency=low + + * NMU. Drop explicit dependency on python2.3. + + -- Matthias Klose Fri, 27 Oct 2006 03:06:42 +0200 + +k3d (0.5.12.0-1) unstable; urgency=low + + * New upstream release (closes: #358218). + * debian/control: + - Updated Standards-Version to 3.7.2.1. + - Added a build-time dependency on g++-4.1 (>=4.1.1-9) due to some + internal g++ problem in earlier versions. + - Update dependencies to new X.Org packages. + * Acknowledge NMUs. Thanks, Pierre Habouzit (closes: #368246) and Martin + Michlmayr. + * This version shows correctly icons in the toolbar (closes: #356037). + * Changed configure in order to try only pkg-config --libs ImageMagick++ + instead of Magick++-config --libs, thus riding of spureous dependencies. + Closes: #347399. + * Added a patch to modules/annotation/reference_image_2d.cpp from upstream + CVS in order to compile with g++ 4.1.1. + * Made the same with modules/gts/module.cpp. + * Patched modules/quadrilateral_remeshing/quadrilateral_remeshing.cpp with + an additional #include . Thanks, Miriam Ruiz. + + -- David Martínez Moreno Wed, 19 Jul 2006 09:08:55 +0200 + +k3d (0.5.0.35-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Remove xlibmesa-glu-dev Build-Depends: libglu1-mesa-dev | libglu-dev + (closes: #368246). + + -- Pierre Habouzit Sun, 4 Jun 2006 01:16:02 +0200 + +k3d (0.5.0.35-1.1) unstable; urgency=low + + * NMU as part of the GCC 4.1 transition. + * Apply patch from Ben Hutchings to fix various GCC 4.1 issues and + to update the build-depends (closes: #358218). + + -- Martin Michlmayr Sun, 28 May 2006 12:10:04 +0200 + +k3d (0.5.0.35-1) unstable; urgency=low + + * New upstream release. A summary of changes follow: + - Integrated SGI's GLU tesselator. + - Changed Rotate tool's middle sphere for a torus handle, Rotate tool is + now complete except that it only works in GLOBAL mode. + - Filters are now called modifiers. + - Scripts run from the NGUI can be interrupted with the Escape key. + - Restored visible selection for mesh modifiers. + - Added Python support for point groups and scripting sample. + - Added plugin module proxies to improve startup time (currently + disabled). + - Created ShowMatrix plugin + - Cosmetic fixes. + - Several fixes. + * Uploaded to unstable, now that the C++ transition seems to be almost over. + + -- David Martínez Moreno Mon, 12 Dec 2005 01:14:51 +0100 + +k3d (0.5.0.34-0pre3) experimental; urgency=low + + * Rebuild with current sid. + + -- David Martínez Moreno Tue, 6 Dec 2005 13:39:00 +0100 + +k3d (0.5.0.34-0pre2) experimental; urgency=low + + * Added python to Build-Depends. Thanks, Martin Zobel-Helas (closes: + #341936). + + -- David Martínez Moreno Tue, 6 Dec 2005 00:49:50 +0100 + +k3d (0.5.0.34-0pre1) experimental; urgency=low + + * New upstream release. A summary of changes follow: + - Many code cleanups, reorganizations and updates, pulled out several + deprecated plugins (including JavaScript engine). + - New selection system using k3d::mesh_selection properties for + undoable-selection and full integration with the Directed Graph. + - document node collection is stored/serialized/loaded in node-creation order, + enabling efficient/persistent node lookups by index. + - Updated document schema to match new [nodes] terminology, with full + backwards-compatibility. + - Context menu is attached to the document and isn't recreated on each + call anymore. + - Toolbar is now a panel. + - Updated the NGUI so the +Z axis is "up", rewrote viewport navigation. + - TAB key jumps to the next entry in Node Properties panel. + - Duplicate now works with objects other than MeshInstances. + - Selected panel has a blue border. + - bug-buddy submits reports to the SF tracker and now have a privacy + statement. + - NGUI selection button control displays tooltips and disables buttons based + on selection state. + - Tutorials are possible now using almost all the tools. + - Added Aqsis plugins. + - Added real sphere implementation to PolySphere and Quads Only option, + renamed existing one to "Spherical Cylinder". + - Set default colors to most of RenderMan shaders. + - shader parser now supports point, vector, normal and angle types + properly. + * Removed /usr/share/k3d/shaders/layered from debian/k3d.dirs, as it is now + included upstream. + * I do not fully understand why k3d is not using PNG icons. In the + meanwhile, added a hardcoded runtime dependency on librsvg2-2 in order to + use the scalable icons. + * Patched modules/quadrilateral_remeshing/quadrilateral_remeshing.cpp in + order to support new k3dsdk. + + -- David Martínez Moreno Sat, 3 Dec 2005 01:37:09 +0100 + +k3d (0.5.0.33-0pre2) experimental; urgency=low + + * Rebuild package with last changes. + * debian/control: Added (>> 2.9.5-5) to librsvg2-bin dependency, as all the + previous versions did not include my patch to librsvg-bin, thus breaking + rsvg->png conversion. + * Added /usr/share/k3d/shaders/layered to debian/k3d.dirs to workaround a + startup error. + + -- David Martínez Moreno Mon, 28 Nov 2005 15:45:05 +0100 + +k3d (0.5.0.33-0pre1) experimental; urgency=low + + * 0.6 prerelease: + - Lots of bug fixes! + - Lots of enhancements! + - Lots of code! + - Lots of new funcionalities! + - Lots of new bugs! + * This package is now compiled against a current unstable (closes: #331104). + * I understand that this bug came in when gcc 4.0 was used to build this + package. This new release does not have this problem (closes: #320904). + * New release does not have javascript at all. It was dropped in favour of + Python (closes: #326876). + * Stripped down boost/ from the tarball, as we are going to use external + boost libraries. + * New package will be compiled with gcc 4.0 on amd64, and boost libraries + are not now included (see above), thus not having this problem (closes: + #278966). + * Activated again graphviz in the configure line, as it is out of non-free + now. + * debian/control: + - Build-Depends now reflect the current unstable environment. + - Added libgtkmm-2.4-dev to dependencies. + - Added gettext. + - Removed automake1.6 (closes: #335125). + - Build-Depend on librsvg2-bin > 2.9.5-5 as it was broken for relative + paths as used in share/ngui/rasterized/Makefile. + - k3d-doc package has gone, as the documentation is now the wiki. + * Added full Python support to debian/control, dh_python to debian/rules, + and ${python:Depends} to the Depends line. + * Fixed some whitespace in djpig's NMU entry, confusing lintian. + * debian/copyright: Changed FSF address. + + -- David Martínez Moreno Mon, 14 Nov 2005 04:37:54 +0100 + +k3d (0.5.0.22-1) experimental; urgency=low + + * Started to package 0.5.x branch. Lots (and when I say lots, is LOTS) of + new features, new GUI, new plugins, new functions...I love new branches. + :-) + * debian/control: Added a lot of new build dependencies. The new + versions had a lot of exciting things, like Python scripting, + + -- David Martínez Moreno Wed, 25 May 2005 20:50:16 +0200 + +k3d (0.4.5.0-5) unstable; urgency=low + + * AAAAAAAARGH, *patching* configure.ac broke again the build process! Fixed + (I hope). + * Removed more cruft of shaderpreprocessor/ from configure. + + -- David Martínez Moreno Thu, 28 Apr 2005 18:38:10 +0200 + +k3d (0.4.5.0-4) unstable; urgency=low + + * Damn. I did not remember why I had automake1.6 in Build-Depends...missing, + install-sh, and all that scripting stuff is symlinked to the original + files included in automake1.6. For less headaches, I will include it in + the Build-Depends for now. + + -- David Martínez Moreno Thu, 28 Apr 2005 12:05:58 +0200 + +k3d (0.4.5.0-3) unstable; urgency=low + + * modules/mesh/Makefile.{am,in}: SuperLU v3.0 slipped into the 0.4.5.0 + release, and installed libcblas.so files. Disabled superlu build and + Build-Depend on libsuperlu3-dev (closes: #295663, #298239). + * sdpgtk/Makefile.in: Added -I/usr/X11R6/include for trying to solve the + FTBFS error in almost all the architectures. + * docs/user_reference/root.xml: Fixed location for the DTD (removed + "file:"). + * debian/control: Removed automake1.6 dependency for build. + + -- David Martínez Moreno Wed, 27 Apr 2005 15:57:48 +0200 + +k3d (0.4.5.0-2) unstable; urgency=low + + * It seems that my build dependencies no longer depend on libx11-dev, so + Build-Depend on it. + + -- David Martínez Moreno Wed, 16 Feb 2005 10:37:18 +0100 + +k3d (0.4.5.0-1) unstable; urgency=low + + * New upstream release. + - Subdivision surfaces. + - Resurrected SubdivideFaces. + - Added LinkPoints, JoinPoints, MergeFaces, FaceNormals, + SelectedPointNumber and SelectPointByNumber tools. + - NSIS installer for the Win32 platform. + - g++ 3.4 fixes. + - Merged JavaScript large patch from Debian package, updating version to + 1.5-rc6a, making k3d portable to MacOS X and 64-bit platforms. + - ** Quadrilateral Remeshing version 1.0 ** + - Many other things. + * debian/control: + - Bumped to 3.6.1.1 Standards-Version. + - Added automake1.6 to Build-Depends because of the install-sh and the + like stuff. + * Added an specific part for copyright and license in debian/copyright. + + -- David Martínez Moreno Tue, 15 Feb 2005 18:27:16 +0100 + +k3d (0.4.3.0-3) unstable; urgency=low + + * _Really_ apply patch from #274172 (closes: #274172). Sorry. :-( + + -- David Martínez Moreno Wed, 6 Oct 2004 00:49:35 +0200 + +k3d (0.4.3.0-2) unstable; urgency=high + + * Rebuild with non-broken imagemagick. Many thanks, Frank Lichtenheld and + Steve Langasek (closes: #272628). + * Fixed FTBFS in amd64 by Andreas Jochens, and additionally, fixed FTBFS in + s390 and powerpc as well (closes: #274172). + + -- David Martínez Moreno Mon, 4 Oct 2004 13:10:38 +0200 + +k3d (0.4.3.0-1.1) unstable; urgency=high + + * NMU. + * Rebuild with non-broken imagemagick. + + -- Frank Lichtenheld Sat, 2 Oct 2004 01:20:35 +0200 + +k3d (0.4.2.0-2) unstable; urgency=medium + + * Medium urgency upload to facilitate the libtiff transition. + * debian/rules: + - Added dh_compress and dh_fixperms to build-indep target (fixes lintian + warnings). + * debian/control: + - Rebuild against libtiff4 (closes: #262810). + * Applied large patch to js plugin from the SpiderMonkey implementation in + order to solve the FTBFS in powerpc (or at least try to). + + -- David Martínez Moreno Mon, 9 Aug 2004 11:25:48 +0200 + +k3d (0.4.2.0-1) unstable; urgency=low + + * New upstream release. Highlights of it are: + - QSlim decimation. + - Basic POV engine. + - PolyCube now has adjustable rows, columns and slices. + - Several stability fixes. + - Merged bash patch for k3d-uuidgen. + * debian/control: + - Bumped Build-Depends on libsigc++ from 1.0 to 2.0. + - Really include xlibmesa-gl_u_-dev, not only gl-dev, in Build-Depends. + All is FTBFS in the buildd's :-(. + * Added Debian changelog to k3d-doc. + * Removed all the CVS stuff included in the original tarball (gah!). + + -- David Martínez Moreno Thu, 22 Jul 2004 11:50:11 +0200 + +k3d (0.4.1.0-1) unstable; urgency=low + + * New upstream release. The features of this release are: + - Support for polygon colors and vertex normals. + - LSystem parser and mutator plugin with lots of sample files. + - Sphere eversion plugin. + - Basic Yafray importer. + - FilterFacesByColor plugin. + - Added vertex normals to blobby polygonizations. + - Added RiPolygon support to RIB importer. + - Usability fix: DAG control doesn't scroll back to the top every time. + something in the document changes. + - Several bug fixes. + - All the Debian patches were pushed upstream and are integrated. Now k3d + is FHS-compliant. + * Included specific Build-Depends for GLU. This fixes the FTBFS observed by + Goswin on amd64 (closes: #258358). + * Do not build gpp, and depend on Debian gpp package. Thanks to Daniel + Skarda (closes: #259613). + + -- David Martínez Moreno Wed, 21 Jul 2004 18:29:52 +0200 + +k3d (0.4.0.0-2) unstable; urgency=low + + * debian/rules: Added --without-graphviz to configure line. This closes + FTBFS (closes: #257363). + + -- David Martínez Moreno Sun, 4 Jul 2004 15:08:04 +0200 + +k3d (0.4.0.0-1) unstable; urgency=low + + * New upstream release (closes: #250359). + * debian/control: Corrected dependency to libmagick++6-dev. + * Splitted the package in k3d, k3d-dev and k3d-doc. For now k3d-dev is for + headers and libtool files. + * Added menu item, thanks to Brett W. McCoy. + * Fixed inclusion of /usr/lib/k3d items, thanks to Romain and Brett. + * Added Suggest: aqsis (a great GPL renderer). Thanks, Brett. + * Added quotes over two fields of k3d.menu. + * Fixed non POSIX-compliant script k3d-uuidgen. + + -- David Martínez Moreno Mon, 7 Jun 2004 01:42:37 +0200 + +k3d (0.3.9.6-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Downgraded libsigc++ dependency to 1.0 because of SF bug #939134 (Yet + another document-close segfault). + - The build is unstable with GTK2, so changed Build-Depends to GTK1. + * debian/rules: + - Removed --with-gtk2 configure parameter. + + -- David Martínez Moreno Mon, 26 Apr 2004 12:36:32 +0200 + +k3d (0.3.9.0-1) unstable; urgency=low + + * New upstream release. + + -- David Martínez Moreno Wed, 31 Mar 2004 10:29:18 +0200 + +k3d (0.3.0.94-1) unstable; urgency=low + + * Initial release. + + -- David Martínez Moreno Wed, 10 Mar 2004 20:06:49 +0100 --- k3d-0.6.7.0.orig/debian/k3d.dirs +++ k3d-0.6.7.0/debian/k3d.dirs @@ -0,0 +1,3 @@ +/usr/bin +/usr/lib/k3d +/usr/share/k3d --- k3d-0.6.7.0.orig/debian/patches/03_desktop_file_compliant.patch +++ k3d-0.6.7.0/debian/patches/03_desktop_file_compliant.patch @@ -0,0 +1,13 @@ +Index: k3d-0.6.7.0/desktop/k3d.desktop.in +=================================================================== +--- k3d-0.6.7.0.orig/desktop/k3d.desktop.in ++++ k3d-0.6.7.0/desktop/k3d.desktop.in +@@ -7,6 +7,6 @@ Comment[sv_SE.ISO8859-15]=3D modellering + Exec=@prefix@/bin/k3d + Icon=@prefix@/share/k3d/icons/k3d2.png + Terminal=false +-MultipleArgs=false ++X-MultipleArgs=false + Type=Application +-Categories=Application;Graphics ++Categories=Graphics;3DGraphics; --- k3d-0.6.7.0.orig/debian/patches/series +++ k3d-0.6.7.0/debian/patches/series @@ -0,0 +1,8 @@ +01_imagemagick_paths.patch +02_boost-mt_libs.patch +03_desktop_file_compliant.patch +04_config.guess-sub_update.patch +05_gcc4.3_build.patch +06_bashisms.patch +07_gcc4.4_build.patch +08_sigc++_headers.patch --- k3d-0.6.7.0.orig/debian/patches/04_config.guess-sub_update.patch +++ k3d-0.6.7.0/debian/patches/04_config.guess-sub_update.patch @@ -0,0 +1,389 @@ +Index: k3d-0.6.7.0/config.guess +=================================================================== +--- k3d-0.6.7.0.orig/config.guess ++++ k3d-0.6.7.0/config.guess +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, + # Inc. + +-timestamp='2006-07-02' ++timestamp='2007-03-06' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -139,23 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then +- eval $set_cc_for_build +- cat << EOF > $dummy.c +- #include +- #ifdef __UCLIBC__ +- # ifdef __UCLIBC_CONFIG_VERSION__ +- LIBC=uclibc __UCLIBC_CONFIG_VERSION__ +- # else +- LIBC=uclibc +- # endif +- #else +- LIBC=gnu +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` +-fi +- + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -178,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +@@ -797,7 +781,7 @@ EOF + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; +- i*:MINGW*:*) ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) +@@ -807,12 +791,15 @@ EOF + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- x86:Interix*:[3456]*) +- echo i586-pc-interix${UNAME_RELEASE} +- exit ;; +- EM64T:Interix*:[3456]*) +- echo x86_64-unknown-interix${UNAME_RELEASE} +- exit ;; ++ *:Interix*:[3456]*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ EM64T | authenticamd) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; +@@ -846,28 +833,28 @@ EOF + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + avr32*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-${LIBC} ++ echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-${LIBC} ++ echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-${LIBC} ++ echo frv-unknown-linux-gnu + exit ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + mips:Linux:*:*) + eval $set_cc_for_build +@@ -890,7 +877,7 @@ EOF + s: ::g + p + }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build +@@ -913,16 +900,16 @@ EOF + s: ::g + p + }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-${LIBC} ++ echo or32-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) +- echo powerpc-unknown-linux-${LIBC} ++ echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-${LIBC} ++ echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +@@ -935,37 +922,40 @@ EOF + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; +- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; +- *) echo hppa-unknown-linux-${LIBC} ;; ++ PA7*) echo hppa1.1-unknown-linux-gnu ;; ++ PA8*) echo hppa2.0-unknown-linux-gnu ;; ++ *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-${LIBC} ++ echo hppa64-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) +- echo ${UNAME_MACHINE}-dec-linux-${LIBC} ++ echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-${LIBC} ++ echo x86_64-unknown-linux-gnu ++ exit ;; ++ xtensa:Linux:*:*) ++ echo xtensa-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so +@@ -980,22 +970,20 @@ EOF + p'` + case "$ld_supported_targets" in + elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" ++ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" ++ echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; + coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" ++ echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" ++ echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; + esac +- # This should get integrated into the C code below, but now we hack +- if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -1227,6 +1215,15 @@ EOF + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; +Index: k3d-0.6.7.0/config.sub +=================================================================== +--- k3d-0.6.7.0.orig/config.sub ++++ k3d-0.6.7.0/config.sub +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, + # Inc. + +-timestamp='2006-07-02' ++timestamp='2007-01-18' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -244,13 +244,13 @@ case $basic_machine in + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ +- | d10v | d30v | dlx | dsp16xx | dvp \ +- | fr30 | frv \ ++ | d10v | d30v | dlx | dsp16xx \ ++ | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore \ ++ | maxq | mb | microblaze | mcore | mep \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -276,7 +276,8 @@ case $basic_machine in + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ +- | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +@@ -284,7 +285,7 @@ case $basic_machine in + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ +- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; +@@ -323,7 +324,7 @@ case $basic_machine in + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ +- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ +@@ -357,7 +358,7 @@ case $basic_machine in + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +@@ -367,7 +368,7 @@ case $basic_machine in + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ + | ymp-* \ + | z8k-*) +@@ -689,24 +690,6 @@ case $basic_machine in + basic_machine=m68k-atari + os=-mint + ;; +- mipsEE* | ee | ps2) +- basic_machine=mips64r5900el-scei +- case $os in +- -linux*) +- ;; +- *) +- os=-elf +- ;; +- esac +- ;; +- iop) +- basic_machine=mipsel-scei +- os=-irx +- ;; +- dvp) +- basic_machine=dvp-scei +- os=-elf +- ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; +@@ -927,6 +910,10 @@ case $basic_machine in + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; + sei) + basic_machine=mips-sei + os=-seiux +@@ -938,6 +925,9 @@ case $basic_machine in + basic_machine=sh-hitachi + os=-hms + ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; + sh64) + basic_machine=sh64-unknown + ;; +@@ -1232,7 +1222,7 @@ case $os in + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -irx*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1384,6 +1374,9 @@ else + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; + spu-*) + os=-elf + ;; +@@ -1424,6 +1417,9 @@ case $basic_machine in + m68*-cisco) + os=-aout + ;; ++ mep-*) ++ os=-elf ++ ;; + mips*-cisco) + os=-elf + ;; --- k3d-0.6.7.0.orig/debian/patches/08_sigc++_headers.patch +++ k3d-0.6.7.0/debian/patches/08_sigc++_headers.patch @@ -0,0 +1,22 @@ +Description: add missing headers to prevent build errors. +Author: Ilya Barygin +--- a/k3dsdk/node.cpp ++++ b/k3dsdk/node.cpp +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + namespace k3d + { +--- a/k3dsdk/mesh_modifier.h ++++ b/k3dsdk/mesh_modifier.h +@@ -20,6 +20,7 @@ + // License along with this program; if not, write to the Free Software + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ++#include + #include "data.h" + #include "hints.h" + #include "i18n.h" --- k3d-0.6.7.0.orig/debian/patches/02_boost-mt_libs.patch +++ k3d-0.6.7.0/debian/patches/02_boost-mt_libs.patch @@ -0,0 +1,65 @@ +Index: k3d-0.6.7.0/configure +=================================================================== +--- k3d-0.6.7.0.orig/configure ++++ k3d-0.6.7.0/configure +@@ -20813,7 +20813,7 @@ if test $ac_cv_header_boost_version_hpp + + K3D_BOOST_SUBDIR="" + K3D_BOOST_CPPFLAGS="" +- K3D_BOOST_LIBS="-lboost_regex -lboost_date_time" ++ K3D_BOOST_LIBS="-lboost_regex-mt -lboost_date_time-mt" + { echo "$as_me:$LINENO: result: Using external boost library" >&5 + echo "${ECHO_T}Using external boost library" >&6; } + +@@ -20827,13 +20827,13 @@ fi + + + +-{ echo "$as_me:$LINENO: checking for main in -lboost_regex" >&5 +-echo $ECHO_N "checking for main in -lboost_regex... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for main in -lboost_regex-mt" >&5 ++echo $ECHO_N "checking for main in -lboost_regex-mt... $ECHO_C" >&6; } + if test "${ac_cv_lib_boost_regex_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lboost_regex $LIBS" ++LIBS="-lboost_regex-mt $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -20887,7 +20887,7 @@ if test $ac_cv_lib_boost_regex_main = ye + #define HAVE_LIBBOOST_REGEX 1 + _ACEOF + +- LIBS="-lboost_regex $LIBS" ++ LIBS="-lboost_regex-mt $LIBS" + + else + +@@ -20898,13 +20898,13 @@ echo "$as_me: error: couldn't find boost + fi + + +-{ echo "$as_me:$LINENO: checking for main in -lboost_date_time" >&5 +-echo $ECHO_N "checking for main in -lboost_date_time... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for main in -lboost_date_time-mt" >&5 ++echo $ECHO_N "checking for main in -lboost_date_time-mt... $ECHO_C" >&6; } + if test "${ac_cv_lib_boost_date_time_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lboost_date_time $LIBS" ++LIBS="-lboost_date_time-mt $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -20958,7 +20958,7 @@ if test $ac_cv_lib_boost_date_time_main + #define HAVE_LIBBOOST_DATE_TIME 1 + _ACEOF + +- LIBS="-lboost_date_time $LIBS" ++ LIBS="-lboost_date_time-mt $LIBS" + + else + --- k3d-0.6.7.0.orig/debian/patches/01_imagemagick_paths.patch +++ k3d-0.6.7.0/debian/patches/01_imagemagick_paths.patch @@ -0,0 +1,19 @@ +Index: k3d-0.6.7.0/configure +=================================================================== +--- k3d-0.6.7.0.orig/configure ++++ k3d-0.6.7.0/configure +@@ -21173,8 +21173,12 @@ echo $ECHO_N "checking for Magick++... $ + echo "${ECHO_T}found" >&6; } + K3D_IMAGEMAGICK_CPPFLAGS=`Magick++-config --cppflags` + K3D_IMAGEMAGICK_CXXFLAGS=`Magick++-config --cxxflags` +- K3D_IMAGEMAGICK_LIBS=`Magick++-config --libs` +- K3D_IMAGEMAGICK_LDFLAGS=`Magick++-config --ldflags` ++ #K3D_IMAGEMAGICK_LIBS=`Magick++-config --libs` ++ #K3D_IMAGEMAGICK_LDFLAGS=`Magick++-config --ldflags` ++ # Magick++-config --libs gives spurious dependencies ++ # (see Debian bug #347399 for an explanation). ++ K3D_IMAGEMAGICK_LIBS=`pkg-config --libs ImageMagick++` ++ K3D_IMAGEMAGICK_LDFLAGS="" + K3D_IMAGEMAGICK_SUBDIR="imagemagick" + else + { echo "$as_me:$LINENO: result: --- k3d-0.6.7.0.orig/debian/patches/05_gcc4.3_build.patch +++ k3d-0.6.7.0/debian/patches/05_gcc4.3_build.patch @@ -0,0 +1,336 @@ +--- k3d-0.6.7.0.orig/hapy/src/Assert.cc ++++ k3d-0.6.7.0/hapy/src/Assert.cc +@@ -4,6 +4,7 @@ + #include + #include + ++#include + #include + #include + +--- k3d-0.6.7.0.orig/k3dsdk/log.cpp ++++ k3d-0.6.7.0/k3dsdk/log.cpp +@@ -20,6 +20,7 @@ + #include "log_control.h" + #include "result.h" + ++#include + #include + #include + #include +--- k3d-0.6.7.0.orig/k3dsdk/string_modifiers.cpp ++++ k3d-0.6.7.0/k3dsdk/string_modifiers.cpp +@@ -26,6 +26,7 @@ + #include "result.h" + #include "string_modifiers.h" + ++#include + #include + + namespace k3d +--- k3d-0.6.7.0.orig/surface_polygonizer/jules_bloomenthal.cpp ++++ k3d-0.6.7.0/surface_polygonizer/jules_bloomenthal.cpp +@@ -24,6 +24,7 @@ + + #include "jules_bloomenthal.h" + ++#include + #include + + // Number of iterations (convergence) +--- k3d-0.6.7.0.orig/hapy/src/RuleId.cc ++++ k3d-0.6.7.0/hapy/src/RuleId.cc +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + Hapy::RuleId::Id Hapy::RuleId::ThePerm = 100; + Hapy::RuleId::Id Hapy::RuleId::TheTmp = -100; +--- k3d-0.6.7.0.orig/k3dsdk/algebra.h ++++ k3d-0.6.7.0/k3dsdk/algebra.h +@@ -30,10 +30,11 @@ + #include "vectors.h" + + #include ++#include + + /**************************************************************** + * +-* C++ Vector and Matrix Algebra routines ++* C++ Vector and Matrix Algebra routinesex + * Author: Jean-Francois DOUE + * Version 3.1 --- October 1993 + * +--- k3d-0.6.7.0.orig/k3dsdk/bitmap.h ++++ k3d-0.6.7.0/k3dsdk/bitmap.h +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + namespace k3d + { +--- k3d-0.6.7.0.orig/k3dsdk/explicit_snap_source.cpp ++++ k3d-0.6.7.0/k3dsdk/explicit_snap_source.cpp +@@ -24,6 +24,7 @@ + #include "explicit_snap_source.h" + #include "result.h" + #include "vectors.h" ++#include + + namespace k3d + { +--- k3d-0.6.7.0.orig/k3dsdk/explicit_snap_target.cpp ++++ k3d-0.6.7.0/k3dsdk/explicit_snap_target.cpp +@@ -24,6 +24,7 @@ + #include "explicit_snap_target.h" + #include "result.h" + #include "vectors.h" ++#include + + namespace k3d + { +--- k3d-0.6.7.0.orig/k3dsdk/gl_info.cpp ++++ k3d-0.6.7.0/k3dsdk/gl_info.cpp +@@ -22,6 +22,7 @@ + */ + + #include "gl_info.h" ++#include + + #if defined K3D_PLATFORM_WIN32 + +--- k3d-0.6.7.0.orig/k3dsdk/log_control.h ++++ k3d-0.6.7.0/k3dsdk/log_control.h +@@ -21,6 +21,7 @@ + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + #include "signal_system.h" ++#include + + namespace k3d + { +--- k3d-0.6.7.0.orig/k3dsdk/socket.cpp ++++ k3d-0.6.7.0/k3dsdk/socket.cpp +@@ -24,6 +24,7 @@ + #include "result.h" + #include "socket.h" + #include "string_cast.h" ++#include + + #ifdef K3D_PLATFORM_WIN32 + +--- k3d-0.6.7.0.orig/modules/bitmap/bitmap_element.h ++++ k3d-0.6.7.0/modules/bitmap/bitmap_element.h +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + namespace libk3dbitmap + { +--- k3d-0.6.7.0.orig/ngui/angle_axis_control.h ++++ k3d-0.6.7.0/ngui/angle_axis_control.h +@@ -30,6 +30,7 @@ + #include + + #include ++#include + + namespace Gtk { class Button; } + namespace k3d { class iproperty; } +--- k3d-0.6.7.0.orig/ngui/aqsis_layer_chooser.h ++++ k3d-0.6.7.0/ngui/aqsis_layer_chooser.h +@@ -26,6 +26,7 @@ + + #include "ui_component.h" + #include ++#include + + namespace k3d { namespace aqsis { class ilayer_connection_property; } } + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/bitmap_preview.h ++++ k3d-0.6.7.0/ngui/bitmap_preview.h +@@ -30,6 +30,7 @@ + #include + + #include ++#include + + namespace Gtk { class Image; } + namespace k3d { class idag; } +--- k3d-0.6.7.0.orig/ngui/bounding_box.h ++++ k3d-0.6.7.0/ngui/bounding_box.h +@@ -30,6 +30,7 @@ + #include + + #include ++#include + + // Forward declarations + namespace Gtk { class Button; } +--- k3d-0.6.7.0.orig/ngui/check_button.h ++++ k3d-0.6.7.0/ngui/check_button.h +@@ -31,6 +31,7 @@ + #include + + #include ++#include + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/check_menu_item.h ++++ k3d-0.6.7.0/ngui/check_menu_item.h +@@ -31,6 +31,7 @@ + #include + + #include ++#include + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/color_chooser.h ++++ k3d-0.6.7.0/ngui/color_chooser.h +@@ -31,6 +31,7 @@ + #include + + #include ++#include + + namespace Gtk { class DrawingArea; } + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/combo_box.h ++++ k3d-0.6.7.0/ngui/combo_box.h +@@ -32,6 +32,7 @@ + + #include + #include ++#include + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/entry.h ++++ k3d-0.6.7.0/ngui/entry.h +@@ -30,6 +30,7 @@ + + #include + #include ++#include + + namespace k3d { class istate_recorder; } + +--- k3d-0.6.7.0.orig/ngui/enumeration_chooser.h ++++ k3d-0.6.7.0/ngui/enumeration_chooser.h +@@ -34,6 +34,7 @@ + + #include + #include ++#include + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/node_chooser.h ++++ k3d-0.6.7.0/ngui/node_chooser.h +@@ -34,6 +34,7 @@ + #include + + #include ++#include + + namespace Gtk { class Button; } + namespace Gtk { class Label; } +--- k3d-0.6.7.0.orig/ngui/node_history.h ++++ k3d-0.6.7.0/ngui/node_history.h +@@ -24,6 +24,7 @@ + #include "ui_component.h" + + #include ++#include + + namespace libk3dngui + { +--- k3d-0.6.7.0.orig/ngui/path_chooser.h ++++ k3d-0.6.7.0/ngui/path_chooser.h +@@ -31,6 +31,7 @@ + #include + + #include ++#include + + namespace Gtk { class Button; } + namespace Gtk { class ComboBox; } +--- k3d-0.6.7.0.orig/ngui/point_control.h ++++ k3d-0.6.7.0/ngui/point_control.h +@@ -30,6 +30,7 @@ + #include + + #include ++#include + + namespace Gtk { class Button; } + namespace k3d { class iproperty; } +--- k3d-0.6.7.0.orig/ngui/scale.h ++++ k3d-0.6.7.0/ngui/scale.h +@@ -30,6 +30,7 @@ + #include + + #include ++#include + + // Forward declarations + namespace Gtk { class Button; } +--- k3d-0.6.7.0.orig/ngui/script_button.h ++++ k3d-0.6.7.0/ngui/script_button.h +@@ -32,6 +32,7 @@ + + #include + #include ++#include + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/ngui/spin_button.h ++++ k3d-0.6.7.0/ngui/spin_button.h +@@ -33,6 +33,7 @@ + + #include + #include ++#include + + namespace Gtk { class Button; } + namespace k3d { class iproperty; } +--- k3d-0.6.7.0.orig/ngui/toggle_button.h ++++ k3d-0.6.7.0/ngui/toggle_button.h +@@ -31,6 +31,7 @@ + #include + + #include ++#include + + // Forward declarations + namespace k3d { class istate_recorder; } +--- k3d-0.6.7.0.orig/renderjob/main.cpp ++++ k3d-0.6.7.0/renderjob/main.cpp +@@ -31,6 +31,7 @@ + + #include + #include ++#include + + namespace + { +--- k3d-0.6.7.0.orig/sl2xml/main.cpp ++++ k3d-0.6.7.0/sl2xml/main.cpp +@@ -29,6 +29,8 @@ + #include + #include + ++#include ++ + ///////////////////////////////////////////////////////////////////////////// + // main + --- k3d-0.6.7.0.orig/debian/patches/07_gcc4.4_build.patch +++ k3d-0.6.7.0/debian/patches/07_gcc4.4_build.patch @@ -0,0 +1,36 @@ +Index: k3d-0.6.7.0/k3dsdk/gzstream.cpp +=================================================================== +--- k3d-0.6.7.0.orig/k3dsdk/gzstream.cpp ++++ k3d-0.6.7.0/k3dsdk/gzstream.cpp +@@ -31,6 +31,7 @@ + + #include + #include ++#include + + namespace k3d + { +Index: k3d-0.6.7.0/k3dsdk/path.cpp +=================================================================== +--- k3d-0.6.7.0.orig/k3dsdk/path.cpp ++++ k3d-0.6.7.0/k3dsdk/path.cpp +@@ -30,6 +30,7 @@ + + #else // K3D_PLATFORM_WIN32 + ++ #include + #include + #include + #include +Index: k3d-0.6.7.0/modules/jpeg/jpegreader.cpp +=================================================================== +--- k3d-0.6.7.0.orig/modules/jpeg/jpegreader.cpp ++++ k3d-0.6.7.0/modules/jpeg/jpegreader.cpp +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + extern "C" + { --- k3d-0.6.7.0.orig/debian/patches/06_bashisms.patch +++ k3d-0.6.7.0/debian/patches/06_bashisms.patch @@ -0,0 +1,64 @@ +diff -ur k3d-0.6.7.0.orig/k3d-makempeg.in k3d-0.6.7.0/k3d-makempeg.in +--- k3d-0.6.7.0.orig/k3d-makempeg.in 2008-04-02 20:47:04.000000000 -0600 ++++ k3d-0.6.7.0/k3d-makempeg.in 2008-04-02 20:48:07.000000000 -0600 +@@ -3,7 +3,7 @@ + # Cleanup gracefully after interrupts ... + trap 'rm -f $parameter_file; echo "Terminating ..."; exit 1' INT TERM + +-function show_help ++show_help () + { + cat << eof + +@@ -32,7 +32,7 @@ + exit;; + + --version | -v) +- echo "\nk3d-makempeg version @VERSION@\n" ++ printf "\nk3d-makempeg version @VERSION@\n" + exit;; + + --force | -f) +@@ -82,28 +82,28 @@ + + + if [ -z "$source_dir" ]; then +- echo -e "\nYou must specify the path to the source directory, use -h for help.\n" 1>&2 ++ printf "\nYou must specify the path to the source directory, use -h for help.\n" 1>&2 + exit 1 + fi + + if ! [ -e $source_dir ]; then +- echo -e "\nSource directory [$source_dir] doesn't exist, use -h for help.\n" 1>&2 ++ printf "\nSource directory [$source_dir] doesn't exist, use -h for help.\n" 1>&2 + exit 1 + fi + + if ! [ -d $source_dir ]; then +- echo -e "\nSource directory [$source_dir] isn't a directory, use -h for help.\n" 1>&2 ++ printf"\nSource directory [$source_dir] isn't a directory, use -h for help.\n" 1>&2 + exit 1 + fi + + if [ -z "$output_file" ]; then +- echo -e "\nYou must specify the path to the output file, use -h for help.\n" 1>&2 ++ printf "\nYou must specify the path to the output file, use -h for help.\n" 1>&2 + exit 1 + fi + + if [ -e $output_file ]; then + if [ "x$force" != "xyes" ]; then +- echo -e "\nOutput file [$output_file] already exists, rerun with --force to overwrite, use -h for help.\n" 1>&2 ++ printf "\nOutput file [$output_file] already exists, rerun with --force to overwrite, use -h for help.\n" 1>&2 + exit 1 + fi + fi +@@ -165,7 +165,7 @@ + fi + + if [ -z "$playback" ]; then +- echo "\nCouldn't find a playback program, after trying plaympeg and xine.\n" ++ printf "\nCouldn't find a playback program, after trying plaympeg and xine.\n" + exit 1 + fi +