Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12182] trunk/debian
|
From: <and...@us...> - 2012-02-27 21:39:13
|
Revision: 12182
http://plplot.svn.sourceforge.net/plplot/?rev=12182&view=rev
Author: andrewross
Date: 2012-02-27 21:39:06 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
Number of changes to debian packages, principally to clean up debian/rules and to fix some dpkg-shlibdeps, lintian and buildd check warnings. Ensures -fvisibilty=hidden flag is now applied.
Modified Paths:
--------------
trunk/debian/changelog
trunk/debian/control
trunk/debian/control.in
trunk/debian/patches/series
trunk/debian/rules
Added Paths:
-----------
trunk/debian/patches/08_nn_link_libm.diff
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2012-02-26 22:31:05 UTC (rev 12181)
+++ trunk/debian/changelog 2012-02-27 21:39:06 UTC (rev 12182)
@@ -5,8 +5,21 @@
+ Fix broken suggests package plplot11-tcl for libplplot11.
+ Remove reference to ada-compiler in libplplot-ada0-dev package as per new
Debian Ada policy. Fixes lintian warning.
+ + Add note for fortran bindings package description that Fortran 77 support
+ is deprecated in the current upstream SVN and will be dropped in a future
+ release. New code should use the Fortran 95 bindings.
+ * debian/rules:
+ + Tidy up obsolete / unneeded code.
+ + Ensure CFLAGS, CXXFLAGS and LDFLAGS are properly exported to cmake. Add in
+ FFLAGS. -fvisibility=hidden and --as-needed should now work properly. The
+ latter fixes a lot of dpkg-shlibdeps warnings.
+ * debian/patches/series, debian/patches/08_nn_link_libm.diff: Add patch to
+ explicitly link nn library against maths library. Fixes dpkg-shlibdeps
+ warning.
+ * Rebuild python-plplot package against new version of numpy as part of the
+ numpy transition.
- -- Andrew Ross <and...@us...> Sun, 26 Feb 2012 22:29:21 +0000
+ -- Andrew Ross <and...@us...> Mon, 27 Feb 2012 21:34:46 +0000
plplot (5.9.9-2) unstable; urgency=low
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2012-02-26 22:31:05 UTC (rev 12181)
+++ trunk/debian/control 2012-02-27 21:39:06 UTC (rev 12182)
@@ -2,7 +2,7 @@
Section: math
Priority: optional
Maintainer: Andrew Ross <and...@us...>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
libxi-dev, gfortran, itk3-dev, octave3.2-headers,
@@ -29,7 +29,7 @@
Conflicts: libplplot9
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: plplot11-driver-xwin, plplot11-driver-gd,
- plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot11-tcl
+ plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot-tcl
Replaces: plplot-bin (<< 5.9.6-1)
Breaks: plplot-bin (<<5.9.6-1)
Description: Scientific plotting library
@@ -101,7 +101,9 @@
virtually all aspects of plotting are configurable.
.
This package contains the Fortran 77 and Fortran 95 bindings for
- PLplot.
+ PLplot. Note: the Fortran 77 bindings have been deprecated in the latest
+ version of PLplot, and will be dropped from a future release. New code
+ should use the Fortran 95 bindings.
Package: libplplot-java
Architecture: any
@@ -351,7 +353,7 @@
Section: libdevel
Suggests: plplot-doc
Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
- libltdl3-dev, libqsastime-dev, ada-compiler, gnat, gnat-4.6, ${misc:Depends},
+ libltdl3-dev, libqsastime-dev, gnat, gnat-4.6, ${misc:Depends},
libplplot-ada0 (= ${binary:Version})
Recommends: libplplot-dev
Breaks: libplplot-ada (<< 5.9.8-2), libplplot-dev (<< 5.9.8-2)
Modified: trunk/debian/control.in
===================================================================
--- trunk/debian/control.in 2012-02-26 22:31:05 UTC (rev 12181)
+++ trunk/debian/control.in 2012-02-27 21:39:06 UTC (rev 12182)
@@ -101,7 +101,9 @@
virtually all aspects of plotting are configurable.
.
This package contains the Fortran 77 and Fortran 95 bindings for
- PLplot.
+ PLplot. Note: the Fortran 77 bindings have been deprecated in the latest
+ version of PLplot, and will be dropped from a future release. New code
+ should use the Fortran 95 bindings.
Package: libplplot-java
Architecture: any
Added: trunk/debian/patches/08_nn_link_libm.diff
===================================================================
--- trunk/debian/patches/08_nn_link_libm.diff (rev 0)
+++ trunk/debian/patches/08_nn_link_libm.diff 2012-02-27 21:39:06 UTC (rev 12182)
@@ -0,0 +1,23 @@
+#
+# Patch from upstream to ensure nn library is linked against the maths library.
+#
+Index: plplot-5.9.9/lib/nn/CMakeLists.txt
+===================================================================
+--- plplot-5.9.9.orig/lib/nn/CMakeLists.txt 2012-02-27 21:27:23.839569576 +0000
++++ plplot-5.9.9/lib/nn/CMakeLists.txt 2012-02-27 21:28:06.623570811 +0000
+@@ -38,6 +38,15 @@
+ endif(BUILD_SHARED_LIBS)
+
+ add_library(csironn ${csironn_LIB_SRCS})
++
++ if(MATH_LIB)
++ set(
++ csironn_LINK_LIBRARIES
++ ${csironn_LINK_LIBRARIES}
++ ${MATH_LIB}
++ )
++ endif(MATH_LIB)
++
+ set_target_properties(
+ csironn
+ PROPERTIES
Property changes on: trunk/debian/patches/08_nn_link_libm.diff
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2012-02-26 22:31:05 UTC (rev 12181)
+++ trunk/debian/patches/series 2012-02-27 21:39:06 UTC (rev 12182)
@@ -1,3 +1,4 @@
02_unset-python-path.diff
#04_use-mkoctfile.diff
#07_octave_prune_examples.diff
+08_nn_link_libm.diff
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2012-02-26 22:31:05 UTC (rev 12181)
+++ trunk/debian/rules 2012-02-27 21:39:06 UTC (rev 12182)
@@ -12,7 +12,7 @@
#export DH_VERBOSE=1
include /usr/share/octave/debian/defs.make
-include /usr/share/quilt/quilt.make
+#include /usr/share/quilt/quilt.make
version := $(shell perl debian/get-upstream-version.pl < cmake/modules/plplot_version.cmake)
libpkg := libplplot11
@@ -32,6 +32,8 @@
#Don't add -fvisibility=hidden to CXXFLAGS for now as this breaks the octave bindings.
CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
#CXXFLAGS += -fvisibility=hidden
+FFLAGS = $(shell dpkg-buildflags --get FFLAGS)
+FFLAGS += -fvisibility=hidden
LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
LDFLAGS += -Wl,--as-needed
DC = gdc-v1
@@ -92,30 +94,31 @@
mkdir $(BUILD_DIR)
(cd $(BUILD_DIR) ; \
PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \
- JAVA_HOME=$(JAVA_HOME) \
- DC=$(DC) \
+ JAVA_HOME=$(JAVA_HOME) DC=$(DC) \
+ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" \
cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) )
touch config-stamp
build-arch: build-arch-stamp
-build-arch-stamp: patch config-stamp
+build-arch-stamp: config-stamp
dh_testdir
( cd $(BUILD_DIR) ; $(MAKE) )
-( cd $(BUILD_DIR) ; unset DISPLAY ; $(MAKE) test_noninteractive )
touch build-arch-stamp
build-indep: build-indep-stamp
-build-indep-stamp: patch
+build-indep-stamp:
dh_testdir
( cd $(BUILD_DIR) ; cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DBUILD_DOC=ON ; \
cd doc ; $(MAKE) )
touch build-indep-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp install-arch-stamp install-indep-stamp \
- config-stamp patch-stamp debian/files install-python*
+ config-stamp debian/files install-python*
rm -rf $(BUILD_DIR)
rm -rf $(debbase)/$(libpkg)
dh_clean
@@ -245,12 +248,9 @@
dh_md5sums -a
dh_builddeb -a
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary config \
- patch unpatch control
+ control
.NOTPARALLEL:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
