Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12389] trunk/debian
|
From: <and...@us...> - 2013-06-26 21:34:51
|
Revision: 12389
http://sourceforge.net/p/plplot/code/12389
Author: andrewross
Date: 2013-06-26 21:34:49 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
Update debian 5.9.9 packages so they compile on Debian unstable.
Modified Paths:
--------------
trunk/debian/changelog
trunk/debian/patches/fix-cmake-ada-support.diff
trunk/debian/patches/series
trunk/debian/rules
Added Paths:
-----------
trunk/debian/patches/fix-cmake-d-support.diff
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2013-06-26 06:03:55 UTC (rev 12388)
+++ trunk/debian/changelog 2013-06-26 21:34:49 UTC (rev 12389)
@@ -1,3 +1,13 @@
+plplot (5.9.9-7ubuntu2) UNRELEASED; urgency=low
+
+ * debian/patches/fix-cmake-ada-support.diff: Update ada support from
+ upstream to ensure plplot builds with latest Ada compiler in unstable.
+ * debian/rules: Update python library path.
+ * debian/patches/fix-cmake-d-support.diff: Add patch from upstream to
+ fix D language support.
+
+ -- Andrew Ross <and...@us...> Wed, 26 Jun 2013 22:29:59 +0100
+
plplot (5.9.9-6) unstable; urgency=low
* debian/control.in: Remove build dependency on quilt since this is
Modified: trunk/debian/patches/fix-cmake-ada-support.diff
===================================================================
--- trunk/debian/patches/fix-cmake-ada-support.diff 2013-06-26 06:03:55 UTC (rev 12388)
+++ trunk/debian/patches/fix-cmake-ada-support.diff 2013-06-26 21:34:49 UTC (rev 12389)
@@ -2,6 +2,8 @@
Author: Andrew Ross <and...@us...>
Last-Update: 2012-07-19
+Index: plplot-5.9.9/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake
+===================================================================
--- plplot-5.9.9.orig/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake 2011-10-13 01:43:01.000000000 +0100
+++ plplot-5.9.9/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake 2012-07-19 23:03:27.835197249 +0100
@@ -29,6 +29,18 @@
@@ -23,3 +25,20 @@
IF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS)
SET(CMAKE_SHARED_LIBRARY_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
ENDIF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS)
+Index: plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake
+===================================================================
+--- plplot-5.9.9.orig/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake 2011-10-13 01:43:01.000000000 +0100
++++ plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake 2013-06-25 16:55:17.698208176 +0100
+@@ -55,8 +55,11 @@
+
+ # configure variables set in this file for fast reload later on
+ #CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeAdaCompiler.cmake.in
++#message(STATUS "DEBUG: CMAKE_BINARY_DIR = ${CMAKE_BINARY_DIR}")
++#message(STATUS "DEBUG: CMAKE_FILES_DIRECTORY = ${CMAKE_FILES_DIRECTORY}")
++#message(STATUS "DEBUG: CMAKE_PLATFORM_INFO_DIR = ${CMAKE_PLATFORM_INFO_DIR}")
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in
+- "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeAdaCompiler.cmake" IMMEDIATE)
++ "${CMAKE_PLATFORM_INFO_DIR}/CMakeAdaCompiler.cmake" IMMEDIATE)
+ MARK_AS_ADVANCED(CMAKE_AR)
+
+ SET(CMAKE_Ada_COMPILER_ENV_VAR "ADA")
Added: trunk/debian/patches/fix-cmake-d-support.diff
===================================================================
--- trunk/debian/patches/fix-cmake-d-support.diff (rev 0)
+++ trunk/debian/patches/fix-cmake-d-support.diff 2013-06-26 21:34:49 UTC (rev 12389)
@@ -0,0 +1,20 @@
+Description: Fix cmake D language support
+Author: Andrew Ross <and...@us...>
+Origin: upstream
+Index: plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake
+===================================================================
+--- plplot-5.9.9.orig/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake 2011-10-13 01:43:01.000000000 +0100
++++ plplot-5.9.9/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake 2013-06-26 21:52:27.309698965 +0100
+@@ -99,10 +99,10 @@
+ # a different location.
+ IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in
+- "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE)
++ "${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake" IMMEDIATE)
+ ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
+ CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in
+- "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE)
++ "${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake" IMMEDIATE)
+ ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
+
+ MARK_AS_ADVANCED(CMAKE_AR)
Property changes on: trunk/debian/patches/fix-cmake-d-support.diff
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2013-06-26 06:03:55 UTC (rev 12388)
+++ trunk/debian/patches/series 2013-06-26 21:34:49 UTC (rev 12389)
@@ -7,3 +7,4 @@
fix-boolean-operators.diff
fix-cmake-ada-support.diff
fix-lua-includes.diff
+fix-cmake-d-support.diff
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2013-06-26 06:03:55 UTC (rev 12388)
+++ trunk/debian/rules 2013-06-26 21:34:49 UTC (rev 12389)
@@ -91,9 +91,9 @@
endif
config: config-stamp
-config-stamp: control
+config-stamp: control
mkdir -p $(BUILD_DIR)
- (cd $(BUILD_DIR) ; \
+ ( cd $(BUILD_DIR) ; \
PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \
JAVA_HOME=$(JAVA_HOME) DC=$(DC) \
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
@@ -201,7 +201,7 @@
install-python%: build-arch-stamp
( cd $(BUILD_DIR) ; \
- cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy;/usr/lib/pyshared/python$*/numpy/core/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \
+ cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=`python-config --config-dir`/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy;/usr/lib/pyshared/python$*/numpy/core/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \
for d in python qt_gui/pyqt4 ; do \
( cd bindings/$$d; \
$(MAKE) clean ; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
