tags 339276 +patch thanks Hello,
Attached is a patch for the 4 RC bugs against you package. I am uploading now to a delayed queue. If you want to override this NMU, please upload a fixed version yourself. Thanks, -- ----------------------------------------------------------------- | ,''`. Stephen Gran | | : :' : [EMAIL PROTECTED] | | `. `' Debian user, admin, and developer | | `- http://www.debian.org | -----------------------------------------------------------------
reverted:
--- vtk-4.4.2/debian/libvtk4c2.dirs
+++ vtk-4.4.2.orig/debian/libvtk4c2.dirs
@@ -1,2 +0,0 @@
-usr/lib/vtk/CMake
-usr/share/doc/libvtk4c2
reverted:
--- vtk-4.4.2/debian/libvtk4c2.docs
+++ vtk-4.4.2.orig/debian/libvtk4c2.docs
@@ -1,2 +0,0 @@
-README.html
-vtkLogo.jpg
reverted:
--- vtk-4.4.2/debian/libvtk4c2.prerm
+++ vtk-4.4.2.orig/debian/libvtk4c2.prerm
@@ -1,30 +0,0 @@
-#!/bin/sh -e
-
-PACKAGE=libvtk4
-
-case "$1" in
- remove|purge|upgrade)
- # FSSTND compatibility symlinks
- if [ -L /usr/doc/$PACKAGE ]; then
- rm -f /usr/doc/$PACKAGE
- fi
- if [ -x /usr/sbin/install-docs ]; then
- /usr/sbin/install-docs -r $PACKAGE
- fi
- exit 0
- ;;
- failed-upgrade|abort-install|abort-upgrade|disappear)
- exit 0
- ;;
- *)
- echo "postrm called with unknown argument \$1'" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
reverted:
--- vtk-4.4.2/debian/libvtk4c2.file
+++ vtk-4.4.2.orig/debian/libvtk4c2.file
@@ -1,9 +0,0 @@
-usr/lib/vtk/libvtkzlib.so
-usr/lib/vtk/libvtkpng.so
-usr/lib/vtk/libvtkjpeg.so
-usr/lib/vtk/libvtkCommon.so
-usr/lib/vtk/libvtkFiltering.so
-usr/lib/vtk/libvtkImaging.so
-usr/lib/vtk/libvtkGraphics.so
-usr/lib/vtk/libvtkIO.so
-usr/lib/vtk/libvtkRendering.so
diff -u vtk-4.4.2/debian/vtk-examples.dirs vtk-4.4.2/debian/vtk-examples.dirs
--- vtk-4.4.2/debian/vtk-examples.dirs
+++ vtk-4.4.2/debian/vtk-examples.dirs
@@ -2,0 +3 @@
+/usr/share/vtk/
reverted:
--- vtk-4.4.2/debian/libvtk4c2.postinst
+++ vtk-4.4.2.orig/debian/libvtk4c2.postinst
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
-#DEBHELPER#
diff -u vtk-4.4.2/debian/control vtk-4.4.2/debian/control
--- vtk-4.4.2/debian/control
+++ vtk-4.4.2/debian/control
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: A. Maitland Bottoms <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), xlibmesa-gl-dev | libgl-dev,
libglu1-mesa-dev | libglu-dev, xlibs-dev, tcl8.4-dev, tk8.4-dev, python-dev,
cmake (>> 2.0.4), libexpat1-dev, libjpeg62-dev, libpng12-0-dev, libtiff4-dev |
libtiff-dev, zlib1g-dev, libfreetype6-dev, ftgl-dev
+Build-Depends: debhelper (>> 3.0.0), xlibmesa-gl-dev | libgl-dev,
libglu1-mesa-dev | libglu-dev, libx11-dev, libxt-dev, x-dev, tcl8.4-dev,
tk8.4-dev, python-dev, cmake (>> 2.0.4), libexpat1-dev, libjpeg62-dev,
libpng12-0-dev, libtiff4-dev | libtiff-dev, zlib1g-dev, libfreetype6-dev,
ftgl-dev
Build-Depends-Indep: libdigest-md5-perl, doxygen
Standards-Version: 3.6.1.0
@@ -28,11 +28,11 @@
The Python and Tcl examples can be run with the corresponding packages
(vtk-python, vtk-tcl).
-Package: libvtk4c2
+Package: libvtk4c2a
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libvtk, libvtk32, libvtk4, python-vtk (<< 4.4)
-Replaces: libvtk, libvtk32, libvtk4
+Conflicts: libvtk, libvtk32, libvtk4, python-vtk (<< 4.4), libvtk4c2
+Replaces: libvtk, libvtk32, libvtk4, libvtk4c2
Suggests: libvtk4-dev, vtk-examples, vtk-doc
Section: libs
Description: Visualization Toolkit - A high level 3D visualization library
diff -u vtk-4.4.2/debian/rules vtk-4.4.2/debian/rules
--- vtk-4.4.2/debian/rules
+++ vtk-4.4.2/debian/rules
@@ -154,7 +154,7 @@
cp -p -r Build/Utilities/Doxygen/doc/*
$(CURDIR)/debian/vtk-doc/usr/share/doc/vtk-doc/
cp -p -r Utilities/Upgrading
$(CURDIR)/debian/vtk-doc/usr/share/doc/vtk-doc/
dh_installexamples
- cp -p -r Examples $(CURDIR)/debian/vtk-examples/usr/share/vtk/
+ cp -p -r Examples/* $(CURDIR)/debian/vtk-examples/usr/share/vtk/
chmod -x debian/vtk-examples/usr/share/vtk/Rendering/Tcl/keyBottle.tcl
chmod +x
debian/vtk-examples/usr/share/vtk/Build/vtkMy/Wrapping/Tcl/MakePackages.tcl
chmod +x debian/vtk-doc/usr/share/doc/vtk-doc/html/*.pl
@@ -201,8 +201,8 @@
# 4. Make symlinks from /usr/lib/python2.3/site-packages/vtk_python to
/usr/lib/libvtk*Python.so
(cd
$(CURDIR)/debian/python-vtk/usr/lib/python2.3/site-packages/vtk_python ; for i
in ../../../*.so.4.4.2 ; do ln -s $$i `basename $$i .4.4.2` ; done)
- mv debian/tmp/usr/lib/vtk/*.4* debian/libvtk4c2/usr/lib/
- mv debian/tmp/usr/lib/vtk/CMake/*.so debian/libvtk4c2/usr/lib/vtk/CMake/
+ mv debian/tmp/usr/lib/vtk/*.4* debian/libvtk4c2a/usr/lib/
+ mv debian/tmp/usr/lib/vtk/CMake/*.so
debian/libvtk4c2a/usr/lib/vtk/CMake/
# (cd debian/vtk-tcl/usr/lib/tcl8.4 ; for i in ../*TCL.so.4.4.2 ; do ln
-s $$i `basename $$i .4.4.2` ; done)
# TODO: make man pages and include these three...
diff -u vtk-4.4.2/debian/changelog vtk-4.4.2/debian/changelog
--- vtk-4.4.2/debian/changelog
+++ vtk-4.4.2/debian/changelog
@@ -1,3 +1,13 @@
+vtk (4.4.2-8.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * B-D on libx11-dev, x-dev, and libxt-de instead of xlibs-dev
+ (closes: #346505, #346506, #347161)
+ * Rename libvtk4c2 -> libvtk4c2a (c++ mt allocator change) (closes: #339276)
+ * Fix unreported FTBFS in chmod calls (debian/rules)
+
+ -- Stephen Gran <[EMAIL PROTECTED]> Sat, 14 Jan 2006 18:27:29 +0000
+
vtk (4.4.2-8) unstable; urgency=low
* Fix build-depends to prefer libgl1-mesa-dev (Closes: #328971)
only in patch2:
unchanged:
--- vtk-4.4.2.orig/debian/libvtk4c2a.dirs
+++ vtk-4.4.2/debian/libvtk4c2a.dirs
@@ -0,0 +1,2 @@
+usr/lib/vtk/CMake
+usr/share/doc/libvtk4c2a
only in patch2:
unchanged:
--- vtk-4.4.2.orig/debian/libvtk4c2a.docs
+++ vtk-4.4.2/debian/libvtk4c2a.docs
@@ -0,0 +1,2 @@
+README.html
+vtkLogo.jpg
only in patch2:
unchanged:
--- vtk-4.4.2.orig/debian/libvtk4c2a.file
+++ vtk-4.4.2/debian/libvtk4c2a.file
@@ -0,0 +1,9 @@
+usr/lib/vtk/libvtkzlib.so
+usr/lib/vtk/libvtkpng.so
+usr/lib/vtk/libvtkjpeg.so
+usr/lib/vtk/libvtkCommon.so
+usr/lib/vtk/libvtkFiltering.so
+usr/lib/vtk/libvtkImaging.so
+usr/lib/vtk/libvtkGraphics.so
+usr/lib/vtk/libvtkIO.so
+usr/lib/vtk/libvtkRendering.so
only in patch2:
unchanged:
--- vtk-4.4.2.orig/debian/libvtk4c2a.postinst
+++ vtk-4.4.2/debian/libvtk4c2a.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
only in patch2:
unchanged:
--- vtk-4.4.2.orig/debian/libvtk4c2a.prerm
+++ vtk-4.4.2/debian/libvtk4c2a.prerm
@@ -0,0 +1,30 @@
+#!/bin/sh -e
+
+PACKAGE=libvtk4
+
+case "$1" in
+ remove|purge|upgrade)
+ # FSSTND compatibility symlinks
+ if [ -L /usr/doc/$PACKAGE ]; then
+ rm -f /usr/doc/$PACKAGE
+ fi
+ if [ -x /usr/sbin/install-docs ]; then
+ /usr/sbin/install-docs -r $PACKAGE
+ fi
+ exit 0
+ ;;
+ failed-upgrade|abort-install|abort-upgrade|disappear)
+ exit 0
+ ;;
+ *)
+ echo "postrm called with unknown argument \$1'" >&2
+ exit 0
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
signature.asc
Description: Digital signature
