[ompl] 05/09: Updated patches
Leopold Palomo-Avellaneda
leo at alaxarxa.net
Thu Apr 28 08:19:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch master
in repository ompl.
commit ce5494f8cd338c4996fa2f6757d32afac6bad5d2
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date: Wed Apr 27 08:45:47 2016 +0200
Updated patches
---
.../patches/0001-Disabling-installPyPlusPlus.sh-stuff.patch | 5 +++--
debian/patches/0002-Fixup-pkgconfig-for-multiarch.patch | 13 -------------
debian/patches/series | 2 +-
debian/patches/unmacx_header.patch | 8 --------
4 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/debian/patches/0001-Disabling-installPyPlusPlus.sh-stuff.patch b/debian/patches/0001-Disabling-installPyPlusPlus.sh-stuff.patch
index a61fd12..47db28c 100644
--- a/debian/patches/0001-Disabling-installPyPlusPlus.sh-stuff.patch
+++ b/debian/patches/0001-Disabling-installPyPlusPlus.sh-stuff.patch
@@ -1,6 +1,7 @@
-Description: Disabling installPyPlusPlus.sh stuff
-Subject: Disabling installPyPlusPlus.sh stuff
From: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
+Date: Wed, 27 Apr 2016 08:44:13 +0200
+Subject: Disabling installPyPlusPlus.sh stuff
+
---
src/CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/patches/0002-Fixup-pkgconfig-for-multiarch.patch b/debian/patches/0002-Fixup-pkgconfig-for-multiarch.patch
deleted file mode 100644
index a224022..0000000
--- a/debian/patches/0002-Fixup-pkgconfig-for-multiarch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/CMakeModules/ompl.pc.in
-===================================================================
---- git.orig/CMakeModules/ompl.pc.in
-+++ git/CMakeModules/ompl.pc.in
-@@ -1,7 +1,7 @@
- # This file was generated by CMake for @PROJECT_NAME@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/lib
-+libdir=${prefix}/lib/@CMAKE_LIBRARY_ARCHITECTURE@
- includedir=${prefix}/include
-
- Name: @PKG_NAME@
diff --git a/debian/patches/series b/debian/patches/series
index e898a7f..cdaff4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
0001-Disabling-installPyPlusPlus.sh-stuff.patch
-0002-Fixup-pkgconfig-for-multiarch.patch
+0002-0002-Fixup-pkgconfig-for-multiarch.patch
diff --git a/debian/patches/unmacx_header.patch b/debian/patches/unmacx_header.patch
deleted file mode 100644
index 6b367e0..0000000
--- a/debian/patches/unmacx_header.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-Modify the interpreter to avoid lintian warning.--- a/demos/PlannerData.py
-+++ b/demos/PlannerData.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env DYLD_FALLBACK_LIBRARY_PATH=/opt/local/lib python
-+#!/usr/bin/env python
-
- ######################################################################
- # Software License Agreement (BSD License)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ompl.git
More information about the debian-science-commits
mailing list