diff -wu vtk-5.4.2/debian/control vtk-5.4.2/debian/control --- vtk-5.4.2/debian/control +++ vtk-5.4.2/debian/control @@ -1,7 +1,8 @@ Source: vtk Section: graphics Priority: optional -Maintainer: A. Maitland Bottoms +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: A. Maitland Bottoms Build-Depends: debhelper (>= 7), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libosmesa6-dev, libx11-dev, libxt-dev, xvfb, x11proto-core-dev, tcl8.5-dev, tk8.5-dev, python-dev, cmake (>= 2.8.1-3), libexpat-dev, libjpeg-dev, libpng-dev, libtiff-dev, zlib1g-dev, default-jdk, diff -wu vtk-5.4.2/debian/changelog vtk-5.4.2/debian/changelog --- vtk-5.4.2/debian/changelog +++ vtk-5.4.2/debian/changelog @@ -1,9 +1,37 @@ +vtk (5.4.2-8ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #673466). Remaining changes: + - debian/rules: added -D__STDC_CONSTANT_MACROS to CXXFLAGS to fix a ftbfs + with latest ffmpeg + + -- Angel Abad Wed, 10 Nov 2010 12:45:00 +0100 + vtk (5.4.2-8) unstable; urgency=low * debian/control: Added Break and Replace control fields (Closes: #601992, #601994) -- Dominique Belhachemi Sat, 06 Nov 2010 11:33:04 -0400 +vtk (5.4.2-7ubuntu3) maverick; urgency=low + + * No changes upload for libavutil49 -> libavutil50 transition + + -- Fabrice Coutadeur Sat, 04 Sep 2010 09:28:51 +0200 + +vtk (5.4.2-7ubuntu2) maverick; urgency=low + + * Rebuild for FFmpeg 0.6 + + -- Reinhard Tartler Mon, 12 Jul 2010 05:51:35 +0200 + +vtk (5.4.2-7ubuntu1) maverick; urgency=low + + * Merge from Debian unstable. No changes left (LP: #576370) + * debian/rules: added -D__STDC_CONSTANT_MACROS to CXXFLAGS to fix a ftbfs + with latest ffmpeg + + -- Fabrice Coutadeur Wed, 02 Jun 2010 21:31:41 +0200 + vtk (5.4.2-7) unstable; urgency=low [ Denis Barbier ] @@ -97,6 +125,39 @@ -- Dominique Belhachemi Mon, 11 Jan 2010 11:55:14 -0500 +vtk (5.2.1-14ubuntu4) lucid; urgency=low + + * rebuild for ffmpeg versioned symbols + + -- Reinhard Tartler Tue, 19 Jan 2010 21:41:07 +0100 + +vtk (5.2.1-14ubuntu3) lucid; urgency=low + + * debian/control: Add the rest of the build dependencies as libvtk5-dev + dependencies + * debian/libvtk-java.install: + http://git.debian.org/?p=collab-maint/vtk.git;a=commitdiff;h=5166fa70a5dfe0a994758f319510d3795237a505 + * debian/rules: + http://git.debian.org/?p=collab-maint/vtk.git;a=commitdiff;h=b3e7451cea07b717e1470b5bb56121d667501a97 + * Wrapping/Java/CMakeLists.txt: + http://git.debian.org/?p=collab-maint/vtk.git;a=commitdiff;h=480940e2288ec67eac100db55e9c6b286d5f4136 + + -- Daniel T Chen Sun, 03 Jan 2010 15:39:07 -0500 + +vtk (5.2.1-14ubuntu2) lucid; urgency=low + + * Add missing dependencies to libvtk5-dev so that rdepends won't FTBFS + + -- Daniel T Chen Sat, 02 Jan 2010 17:23:01 -0500 + +vtk (5.2.1-14ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/python-vtk.{dirs,install}: changed to python2.6 directories + - changed libpng12-0-dev build-depends to libpng12-dev + + -- Daniel T Chen Fri, 01 Jan 2010 18:29:32 -0500 + vtk (5.2.1-14) unstable; urgency=low * Turn VTK_X3D_USE_JAVA back OFF. Closes: bug#558675. @@ -142,6 +203,14 @@ -- Dominique Belhachemi Thu, 17 Sep 2009 13:53:21 -0400 +vtk (5.2.1-10ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/python-vtk.{dirs,install}: changed to python2.6 directories + - changed libpng12-0-dev build-depends to libpng12-dev + + -- Stefan Ebner Fri, 11 Sep 2009 21:18:41 +0200 + vtk (5.2.1-10) unstable; urgency=low [ Dominique Belhachemi ] @@ -188,6 +257,14 @@ -- A. Maitland Bottoms Thu, 20 Aug 2009 09:54:34 -0400 +vtk (5.2.1-7ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/python-vtk.{dirs,install}: changed to python2.6 directories + - changed libpng12-0-dev build-depends to libpng12-dev + + -- Andrea Gasparini Sat, 11 Jul 2009 06:56:48 +0100 + vtk (5.2.1-7) unstable; urgency=low [ A. Maitland Bottoms ] @@ -204,12 +281,43 @@ -- A. Maitland Bottoms Fri, 10 Jul 2009 13:58:07 -0400 +vtk (5.2.1-6ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/python-vtk.{dirs,install}: changed to python2.6 directories + - changed libpng12-0-dev build-depends to libpng12-dev + + -- Andrea Gasparini Thu, 25 Jun 2009 19:03:32 +0100 + vtk (5.2.1-6) unstable; urgency=low * correct python-support usage (Closes: #529961) -- A. Maitland Bottoms Wed, 24 Jun 2009 21:52:32 -0400 +vtk (5.2.1-5ubuntu2) karmic; urgency=low + + * debian/python-vtk.install: make python-vtk import works. + Previous .install tried to install directly to old pysupport directories, + which is obviously wrong. + * changed libpng12-0-dev build-depends to libpng12-dev + + -- Andrea Gasparini Mon, 22 Jun 2009 16:56:12 +0200 + +vtk (5.2.1-5ubuntu1) karmic; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: (LP: #373305) + - Wrapping/Python/vtkPythonAppInit.cxx: also search in dist-packages + for the library. + - debian/python-vtk.postinst: the postinst should now compile what is in + dist-packages, not site-packages. + * debian/python-vtk.{dirs,install}: changed to python2.6 directories + * debian/rules: + - tell cmake the right path to find libjawt.so + - tell cmake to use --install-layout=deb while calling setup.py + + -- Andrea Gasparini Mon, 01 Jun 2009 22:17:51 +0200 + vtk (5.2.1-5) unstable; urgency=low * correct python-support shared library path (Closes: #529961) @@ -264,6 +372,20 @@ -- Mathieu Malaterre Wed, 24 Dec 2008 14:55:29 +0100 +vtk (5.0.4-1.1ubuntu1) jaunty; urgency=low + + [ James Westby ] + * Rebuild for the Python 2.6 transition. + - Make Wrapping/Python/vtkPythonAppInit.cxx also search in dist-packages + for the library. + - The postinst should now compile what is in dist-packages, not site-packages. + - debian/rules should also remove .pyc files from dist-packages. + + [ Luca Falavigna ] + * Unset QT_QT_LIBRARY for Qt4 build (LP: #336295). + + -- Luca Falavigna Sun, 22 Mar 2009 12:15:40 +0100 + vtk (5.0.4-1.1) unstable; urgency=low * Non-maintainer upload. @@ -880 +1001,0 @@ - diff -wu vtk-5.4.2/debian/rules vtk-5.4.2/debian/rules --- vtk-5.4.2/debian/rules +++ vtk-5.4.2/debian/rules @@ -23,7 +23,7 @@ ifeq ($(DEB_HOST_ARCH),parisc64) export CXXFLAGS=-g -ffunction-sections -Wall else -export CXXFLAGS=-g -Wall +export CXXFLAGS=-g -Wall -D__STDC_CONSTANT_MACROS endif export LD_LIBRARY_PATH+=:$(CURDIR)/Build/bin export TCLLIBPATH=$(CURDIR)/Build/Wrapping/Tcl/