[Plplot-cvs] SF.net SVN: plplot:[9385] trunk/debian

[<and...@us...>]

Revision: 9385
          http://plplot.svn.sourceforge.net/plplot/?rev=9385&view=rev
Author:   andrewross
Date:     2009-01-26 07:55:45 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
Update debian packaging for an initial 5.9.2 release. Remove / change 
patches now incorporated upstream. Add patch to fix bug on kfreeBSD.

Modified Paths:
--------------
    trunk/debian/changelog
    trunk/debian/control.in
    trunk/debian/patches/07_octave_prune_examples.diff
    trunk/debian/patches/series
    trunk/debian/rules

Added Paths:
-----------
    trunk/debian/patches/13_fix-kfreeBSD-build.diff

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-01-25 17:09:13 UTC (rev 9384)
+++ trunk/debian/changelog	2009-01-26 07:55:45 UTC (rev 9385)
@@ -1,3 +1,27 @@
+plplot (5.9.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * debian/patches/series: Remove patches
+      09_pdftex-EC-encoding.diff
+      10_print-usage-octave-3.0.diff
+      12_cmake-2.6-fixes.diff
+    which are now incorporated upstream.
+
+  * debian/patches/07_octave_prune_examples.diff: 
+    Update patch to reflect upstream changes.
+
+  * debian/patches/13_fix-kfreeBSD-build.diff: 
+    debian/control.in: 
+      New patch to fix build of plplot on Debian kfreeBSD. Also disable 
+      ada packages on kfreeBSD-amd64. Fixes bug #497895.
+
+  * debian/rules: Explicitly enable tk driver. This is current disabled
+    upstream as there are some issues with segfaults for the interactive
+    tests. Use at your own risk until patches are forthcoming.
+
+ -- Andrew Ross <and...@us...>  Sun, 25 Jan 2009 15:28:58 +0000
+
 plplot (5.9.0-9) UNRELEASED; urgency=low
 
   * Switch from dpatch to quilt

Modified: trunk/debian/control.in
===================================================================
--- trunk/debian/control.in	2009-01-25 17:09:13 UTC (rev 9384)
+++ trunk/debian/control.in	2009-01-26 07:55:45 UTC (rev 9385)
@@ -14,7 +14,7 @@
  python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev,
  python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
  python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386],
- fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel]
+ 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

Modified: trunk/debian/patches/07_octave_prune_examples.diff
===================================================================
--- trunk/debian/patches/07_octave_prune_examples.diff	2009-01-25 17:09:13 UTC (rev 9384)
+++ trunk/debian/patches/07_octave_prune_examples.diff	2009-01-26 07:55:45 UTC (rev 9385)
@@ -6,15 +6,14 @@
 
 @DPATCH@
 
---- plplot-5.8.0.orig/test/test_octave.sh.in   2007-10-16 07:57:38.000000000 +0100
-+++ plplot-5.8.0/test/test_octave.sh.in       2007-12-07 15:02:43.000000000 +0000
-@@ -45,7 +45,7 @@
+--- plplot-5.8.0.orig/plplot_test/test_octave.sh.in   2007-10-16 07:57:38.000000000 +0100
++++ plplot-5.8.0/plplot_test/test_octave.sh.in       2007-12-07 15:02:43.000000000 +0000
+@@ -62,7 +62,7 @@
  # These require octave-2.1.50 so comment out since not everybody has
  # this.
 
--for i=[1:7 8 9 13 15 16];
-+for i=[1:6 8 9 13 15 16];
-    figure(i,"$device",sprintf("${OUTPUT_DIR}/p%d.$dsuffix",i));
-    feval(sprintf("p%d",i))
-    closefig
-
+-	    for i=[1:7 8 9 13 15 16] ;
++	    for i=[1:6 8 9 13 15 16] ;
+	    if (verbose_test)
+		printf("p%d\n",i);
+		endif

Added: trunk/debian/patches/13_fix-kfreeBSD-build.diff
===================================================================
--- trunk/debian/patches/13_fix-kfreeBSD-build.diff	                        (rev 0)
+++ trunk/debian/patches/13_fix-kfreeBSD-build.diff	2009-01-26 07:55:45 UTC (rev 9385)
@@ -0,0 +1,15 @@
+
+# Patch to fix build of plplot on debian kfreeBSD sustems.
+
+diff -ur plplot-5.9.2-orig/cmake/modules/xwin.cmake plplot-5.9.2/cmake/modules/xwin.cmake
+--- plplot-5.9.2-orig/cmake/modules/xwin.cmake	2009-01-18 20:24:12.000000000 +0000
++++ plplot-5.9.2/cmake/modules/xwin.cmake	2009-01-26 07:38:20.000000000 +0000
+@@ -49,6 +49,8 @@
+ 	cmake_link_flags(xwin_LINK_FLAGS "${xwin_LINK_FLAGS}")
+ 	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ 	  set(PLPLOT_MUTEX_RECURSIVE "PTHREAD_MUTEX_RECURSIVE_NP")
++ 	elseif(CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD")
++ 	  set(PLPLOT_MUTEX_RECURSIVE "PTHREAD_MUTEX_RECURSIVE_NP")
+ 	else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ 	  set(PLPLOT_MUTEX_RECURSIVE "PTHREAD_MUTEX_RECURSIVE")
+ 	endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")


Property changes on: trunk/debian/patches/13_fix-kfreeBSD-build.diff
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2009-01-25 17:09:13 UTC (rev 9384)
+++ trunk/debian/patches/series	2009-01-26 07:55:45 UTC (rev 9385)
@@ -1,7 +1,5 @@
 02_unset-python-path.diff
 04_use-mkoctfile.diff
 07_octave_prune_examples.diff
-09_pdftex-EC-encoding.diff
-10_print-usage-octave-3.0.diff
 11_minus-sign-manpage.diff
-12_cmake-2.6-fixes.diff
+13_fix-kfreeBSD-build.diff

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-01-25 17:09:13 UTC (rev 9384)
+++ trunk/debian/rules	2009-01-26 07:55:45 UTC (rev 9385)
@@ -67,8 +67,8 @@
 CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
 	-DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \
 	-DOCTAVE_OCT_DIR=$(OCTDIR) \
-	-DUSE_RPATH=OFF -DPLD_psttf=OFF \
-	$(ADA_OPTIONS) $(JAVA_OPTIONS)
+	-DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON \
+	$(ADA_OPTIONS) $(JAVA_OPTIONS) 
 
 BUILD_DIR = $(debbase)/build_tmp
 SRC_DIR = $(shell pwd)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.