diff -u plplot-5.9.2/debian/control plplot-5.9.2/debian/control --- plplot-5.9.2/debian/control +++ plplot-5.9.2/debian/control @@ -5,8 +5,8 @@ Uploaders: Rafael Laboissiere Standards-Version: 3.8.1 Build-Depends: cmake (>= 2.4.5), debhelper (>= 7), g++-4.1 [arm], - tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, - libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), + tcl8.5-dev, tk8.5-dev, itcl3-dev (>= 3.3), libx11-dev, libxext-dev, + libxi-dev, gfortran, itk3-dev (>= 3.3), octave3.0-headers (>= 3.0.0-2), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, @@ -17,7 +17,7 @@ fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex -Build-Conflicts: libplplot5, octave2.1-headers, tcl8.5, tcl8.5-dev +Build-Conflicts: libplplot5, octave2.1-headers, tcl8.3, tcl8.4 XS-Python-Version: all Homepage: http://www.plplot.org Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian diff -u plplot-5.9.2/debian/rules plplot-5.9.2/debian/rules --- plplot-5.9.2/debian/rules +++ plplot-5.9.2/debian/rules @@ -108,7 +108,7 @@ #( cd bindings/octave ; \ # $(MAKE) CC="gcc -D__builtin_va_list=void" plplot_octave.oct ) ( cd $(BUILD_DIR) ; $(MAKE) ) - -( cd $(BUILD_DIR) ; ITCL_LIBRARY=/usr/lib/itcl3.2 ctest -VV) + -( cd $(BUILD_DIR) ; ctest -VV) touch build-arch-stamp build-indep: build-indep-stamp diff -u plplot-5.9.2/debian/changelog plplot-5.9.2/debian/changelog --- plplot-5.9.2/debian/changelog +++ plplot-5.9.2/debian/changelog @@ -1,3 +1,12 @@ +plplot (5.9.2-3.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/control, debian/control.in, debian/rules: Switched to Tcl/Tk 8.5 and + Itcl/Itk newer than 3.2. + * debian/patches/16_enable-itcl.diff: Enabled Itcl/Itk support. + + -- Sergei Golovan Fri, 04 Sep 2009 14:11:58 +0400 + plplot (5.9.2-3) unstable; urgency=low * debian/control.in: Ensure libplplot-dev only depends on diff -u plplot-5.9.2/debian/control.in plplot-5.9.2/debian/control.in --- plplot-5.9.2/debian/control.in +++ plplot-5.9.2/debian/control.in @@ -5,8 +5,8 @@ Uploaders: Rafael Laboissiere Standards-Version: 3.8.1 Build-Depends: cmake (>= 2.4.5), debhelper (>= 7), g++-4.1 [arm], - tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, - libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), + tcl8.5-dev, tk8.5-dev, itcl3-dev (>= 3.3), libx11-dev, libxext-dev, + libxi-dev, gfortran, itk3-dev (>= 3.3), octave3.0-headers (>= 3.0.0-2), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, @@ -17,7 +17,7 @@ fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex -Build-Conflicts: libplplot5, octave2.1-headers, tcl8.5, tcl8.5-dev +Build-Conflicts: libplplot5, octave2.1-headers, tcl8.3, tcl8.4 XS-Python-Version: all Homepage: http://www.plplot.org Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian diff -u plplot-5.9.2/debian/patches/series plplot-5.9.2/debian/patches/series --- plplot-5.9.2/debian/patches/series +++ plplot-5.9.2/debian/patches/series @@ -7,0 +8 @@ +16_enable-itcl.diff only in patch2: unchanged: --- plplot-5.9.2.orig/debian/patches/16_enable-itcl.diff +++ plplot-5.9.2/debian/patches/16_enable-itcl.diff @@ -0,0 +1,15 @@ +--- plplot-5.9.2.orig/cmake/modules/tcl-related.cmake ++++ plplot-5.9.2/cmake/modules/tcl-related.cmake +@@ -27,9 +27,9 @@ + option(ENABLE_itk "Enable incr TK interface code" OFF) + else(DEFAULT_NO_BINDINGS) + option(ENABLE_tcl "Enable Tcl bindings" ON) +- option(ENABLE_itcl "Enable incr Tcl interface code" OFF) +- option(ENABLE_tk "Enable Tk interface code" OFF) +- option(ENABLE_itk "Enable incr TK interface code" OFF) ++ option(ENABLE_itcl "Enable incr Tcl interface code" ON) ++ option(ENABLE_tk "Enable Tk interface code" ON) ++ option(ENABLE_itk "Enable incr TK interface code" ON) + endif(DEFAULT_NO_BINDINGS) + + # Depending on these above options and system resources may also determine