[plplot] 31/68: Import Debian changes 5.8.0-2

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository plplot.

commit ae5bdb99ef1f11de80dff5ff9b2e5238c725b3ee
Author: Andrew Ross <andrewross at users.sourceforge.net>
Date:   Mon Dec 3 10:57:54 2007 +0000

    Import Debian changes 5.8.0-2
    
    plplot (5.8.0-2) unstable; urgency=low
    
      * debian/rules: add -VV option to ctest. Will make it easier to debug
        any failed tests for auto-built packages.
      * debian/patches/06_build_dir_use_physical_path.dpatch: Ensure that plplot
        correctly identifies when run in the build tree, even if the path
        involves symlinks.
---
 debian/changelog                                   | 10 +++++
 debian/patches/00list                              |  1 +
 .../patches/06_build_dir_use_physical_path.dpatch  | 44 ++++++++++++++++++++++
 debian/rules                                       |  2 +-
 4 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 94e2cb8..0591648 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+plplot (5.8.0-2) unstable; urgency=low
+
+  * debian/rules: add -VV option to ctest. Will make it easier to debug
+    any failed tests for auto-built packages.
+  * debian/patches/06_build_dir_use_physical_path.dpatch: Ensure that plplot
+    correctly identifies when run in the build tree, even if the path 
+    involves symlinks.
+
+ -- Andrew Ross <andrewross at users.sourceforge.net>  Mon, 03 Dec 2007 10:57:54 +0000
+
 plplot (5.8.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/00list b/debian/patches/00list
index 5d82df4..f51340b 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,3 +2,4 @@
 02_unset-python-path
 04_use-mkoctfile
 05_octave_documentation
+06_build_dir_use_physical_path
diff --git a/debian/patches/06_build_dir_use_physical_path.dpatch b/debian/patches/06_build_dir_use_physical_path.dpatch
new file mode 100644
index 0000000..6ab13af
--- /dev/null
+++ b/debian/patches/06_build_dir_use_physical_path.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_build_dir_use_physical_path.dpatch by Andrew Ross <andrewross at users.sourceforge.n
+et>
+##
+## DP: Use physical path (resolve symlinks) when checking whether in build
+## DP: directory. (This patch was taken from the upstream SVN repository.)
+
+ at DPATCH@
+
+--- plplot-5.8.0.orig/src/plcore.c
++++ plplot-5.8.0/src/plcore.c
+@@ -2110,6 +2110,7 @@
+ 
+   if (inited == 0) {
+     char currdir[256];
++    char builddir[256];
+ 
+ /* AM: getcwd has a somewhat strange status on Windows, its proper
+    name is _getcwd, this is a problem in the case of DLLs, like with
+@@ -2121,8 +2122,22 @@
+ 
+     if (getcwd(currdir, 256) == NULL) {
+       pldebug("plInBuildTree():", "Not enough buffer space");
+-    } else if (strncmp(BUILD_DIR, currdir, strlen(BUILD_DIR)) == 0)
+-      inBuildTree = 1;
++    } else {
++      /* The chdir / getcwd call is to ensure we get the physical
++       * path without any symlinks */
++      /* Ignore error in chdir - build tree may not exist */
++      if (chdir(BUILD_DIR) == 0) {
++         if (getcwd(builddir, 256) == NULL) {
++           pldebug("plInBuildTree():", "Not enough buffer space");
++         }
++         else {
++           if (strncmp(builddir, currdir, strlen(builddir)) == 0) {
++             inBuildTree = 1;
++           }
++         }
++         chdir(currdir);
++      }
++    }
+     inited = 1;
+   }
+   return inBuildTree;
diff --git a/debian/rules b/debian/rules
index 840f3d3..80cd00e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,7 @@ build-stamp: patch config-stamp
 	#( 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 )
+	-( cd $(BUILD_DIR) ; ITCL_LIBRARY=/usr/lib/itcl3.2 ctest -VV)
 	touch build-stamp
 
 clean: unpatch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git