From 59f99fcd0ac759ddfd0081935f07aaa7d4b6282d Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 24 Mar 2020 15:01:04 +0100
Subject: [PATCH] [wip/sot-application] Update to v1.2.3
Changes since v1.2.2:
- CMake exports
- fix for python 3
Packaging changes:
- removed patch-aa, fixed upstream
---
py-sot-application-v3/Makefile | 4 +---
py-sot-application-v3/PLIST | 3 +++
py-sot-application-v3/depend.mk | 7 +++++--
py-sot-application-v3/distinfo | 7 +++----
py-sot-application-v3/patches/patch-aa | 7 -------
5 files changed, 12 insertions(+), 16 deletions(-)
delete mode 100644 py-sot-application-v3/patches/patch-aa
diff --git a/py-sot-application-v3/Makefile b/py-sot-application-v3/Makefile
index 8ccff4f8..d6065870 100644
--- a/py-sot-application-v3/Makefile
+++ b/py-sot-application-v3/Makefile
@@ -4,14 +4,12 @@
ORG= stack-of-tasks
NAME= sot-application
-VERSION= 1.2.2
+VERSION= 1.2.3
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
CATEGORIES= wip
COMMENT= Application dependent control graph initialization scripts for the Stack of Tasks
-LICENSE= gnu-lgpl-v3
-MAINTAINER= gepetto@laas.fr
CONFLICTS+= py[0-9][0-9]-${NAME}
diff --git a/py-sot-application-v3/PLIST b/py-sot-application-v3/PLIST
index edab0e48..b7f80a2a 100644
--- a/py-sot-application-v3/PLIST
+++ b/py-sot-application-v3/PLIST
@@ -2,6 +2,9 @@
include/sot/application/config.hh
include/sot/application/deprecated.hh
include/sot/application/warning.hh
+lib/cmake/sot-application/sot-applicationConfig.cmake
+lib/cmake/sot-application/sot-applicationConfigVersion.cmake
+lib/cmake/sot-application/sot-applicationTargets.cmake
lib/pkgconfig/sot-application.pc
${PYTHON_SITELIB}/sot_application/__init__.py
${PYTHON_SITELIB}/sot_application/acceleration/__init__.py
diff --git a/py-sot-application-v3/depend.mk b/py-sot-application-v3/depend.mk
index d97f12af..a4a10bb3 100644
--- a/py-sot-application-v3/depend.mk
+++ b/py-sot-application-v3/depend.mk
@@ -13,8 +13,11 @@ ifeq (+,$(PY_SOT_APPLICATION_V3_DEPEND_MK)) # ----------------------------------
PREFER.py-sot-application-v3?= robotpkg
-SYSTEM_SEARCH.py-sot-application-v3=\
- '${PYTHON_SYSLIBSEARCH}/dynamic_graph/sot/dynamic_pinocchio/dynamic/wrap.so'
+SYSTEM_SEARCH.py-sot-application-v3= \
+ 'include/sot/application/config.hh:/SOT_APPLICATION_VERSION /s/[^0-9.]//gp' \
+ '${PYTHON_SYSLIBSEARCH}/sot_application/__init__.py' \
+ 'lib/cmake/sot-application/sot-applicationConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp' \
+ 'lib/pkgconfig/sot-application.pc:/Version/s/[^0-9.]//gp'
DEPEND_USE+= py-sot-application-v3
diff --git a/py-sot-application-v3/distinfo b/py-sot-application-v3/distinfo
index 17a65725..89eff3d7 100644
--- a/py-sot-application-v3/distinfo
+++ b/py-sot-application-v3/distinfo
@@ -1,4 +1,3 @@
-SHA1 (sot-application-1.2.2.tar.gz) = bae0cc1e098f8c398689f47e97fb31904832ded2
-RMD160 (sot-application-1.2.2.tar.gz) = cbc6059d9d94cad38e543fc2aa969d7afcbfac35
-Size (sot-application-1.2.2.tar.gz) = 800555 bytes
-SHA1 (patch-aa) = 23bf9deb51b58793297047ab669702f727f312e1
+SHA1 (sot-application-1.2.3.tar.gz) = 27a678fde0990a9ebc2236eab85d2ea948ab2a90
+RMD160 (sot-application-1.2.3.tar.gz) = 5e62a1e5819c5832d53e7039e56c1a16f1d02e1c
+Size (sot-application-1.2.3.tar.gz) = 833254 bytes
diff --git a/py-sot-application-v3/patches/patch-aa b/py-sot-application-v3/patches/patch-aa
deleted file mode 100644
index 9d5ae674..00000000
--- a/py-sot-application-v3/patches/patch-aa
+++ /dev/null
@@ -1,7 +0,0 @@
---- CMakeLists.txt.orig 2019-11-04 17:34:59.000000000 +0100
-+++ CMakeLists.txt 2019-11-04 17:38:46.641239112 +0100
-@@ -24,4 +24,3 @@
-
- # Add subdirectories.
- ADD_SUBDIRECTORY(${PY_NAME})
--ADD_SUBDIRECTORY(doc)
--
GitLab