|
From: <and...@us...> - 2010-05-19 10:42:28
|
Revision: 11013
http://plplot.svn.sourceforge.net/plplot/?rev=11013&view=rev
Author: andrewross
Date: 2010-05-19 10:42:22 +0000 (Wed, 19 May 2010)
Log Message:
-----------
Comment out patch disable octave example p7 to see if it now works ok on alpha again.
Update other patches to apply cleanly to 5.9.6 source.
Modified Paths:
--------------
trunk/debian/changelog
trunk/debian/patches/02_unset-python-path.diff
trunk/debian/patches/04_use-mkoctfile.diff
trunk/debian/patches/series
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2010-05-19 10:21:36 UTC (rev 11012)
+++ trunk/debian/changelog 2010-05-19 10:42:22 UTC (rev 11013)
@@ -1,11 +1,15 @@
plplot (5.9.6-1) unstable; urgency=low
* New upstream release (closes: #564216).
- * debian/patches/series: Remove the following patches which are included upstream
- 11_minus-sign-manpage.diff
- 16_wxwidget-with-cmake-2.8.diff
- 17_fix_cmap_support.diff
- and delete the patches from the patches directory.
+ * debian/patches/series:
+ + Remove the following patches which are included upstream
+ 11_minus-sign-manpage.diff
+ 16_wxwidget-with-cmake-2.8.diff
+ 17_fix_cmap_support.diff
+ and delete the patches from the patches directory.
+ + Comment out 07_octave_prune_examples.diff from the list of applied patches,
+ but leave patch for now to see if octave example p7 is ok on alpha.
+ + Update remaining patches for 5.9.6.
-- Andrew Ross <and...@us...> Wed, 19 May 2010 11:14:30 +0100
Modified: trunk/debian/patches/02_unset-python-path.diff
===================================================================
--- trunk/debian/patches/02_unset-python-path.diff 2010-05-19 10:21:36 UTC (rev 11012)
+++ trunk/debian/patches/02_unset-python-path.diff 2010-05-19 10:42:22 UTC (rev 11013)
@@ -9,12 +9,12 @@
--- plplot/examples/python/CMakeLists.txt.old
+++ plplot/examples/python/CMakeLists.txt
-@@ -195,7 +195,7 @@
- @ONLY
- )
+@@ -214,7 +214,7 @@
+ @ONLY
+ )
--set(python_location1 ${PYTHON_INSTDIR})
-+set(python_location1)
- set(python_location2)
- set(python_location3)
- configure_file(
+- set(python_location1 ${PYTHON_INSTDIR})
++ set(python_location1)
+ set(python_location2)
+ set(python_location3)
+ set(python_location4)
Modified: trunk/debian/patches/04_use-mkoctfile.diff
===================================================================
--- trunk/debian/patches/04_use-mkoctfile.diff 2010-05-19 10:21:36 UTC (rev 11012)
+++ trunk/debian/patches/04_use-mkoctfile.diff 2010-05-19 10:42:22 UTC (rev 11013)
@@ -7,9 +7,9 @@
--- plplot-5.9.5.orig/bindings/octave/CMakeLists.txt
+++ plplot-5.9.5/bindings/octave/CMakeLists.txt
-@@ -134,49 +134,6 @@
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
- )
+@@ -136,49 +136,6 @@
+ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
+ PROPERTIES GENERATED ON)
- # Build octave interface.
- set(octave_interface_INCLUDE_PATHS
@@ -57,7 +57,7 @@
# Have to be specific about permissions for some reason (probably oct suffix).
set(PERM_MODULES
OWNER_READ
-@@ -188,9 +145,22 @@
+@@ -190,9 +147,22 @@
WORLD_EXECUTE
)
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2010-05-19 10:21:36 UTC (rev 11012)
+++ trunk/debian/patches/series 2010-05-19 10:42:22 UTC (rev 11013)
@@ -1,3 +1,3 @@
02_unset-python-path.diff
04_use-mkoctfile.diff
-07_octave_prune_examples.diff
+#07_octave_prune_examples.diff
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|