Merge pull request #927 from aitormf/packages/bug/1

Packages/bug/1

Deps/python/Modules/opencv_py/CMakeLists.txt

@@ -7,6 +7,6 @@ string(TOUPPER ${module} module_upper)
 
 if(PY_${module_upper})
 	SET (OpenCV_PY_MODULES  PY_${module_upper})
-	list(APPEND DEPS opencv-python)
-	list(APPEND DEPS_DEV opencv-python)
+	#list(APPEND DEPS opencv-python)
+	#list(APPEND DEPS_DEV opencv-python)
 endif(PY_${module_upper})

cmake/cpack_metainfo/libs.cmake

@@ -13,7 +13,7 @@ SET(CPACK_COMPONENT_CONFIG_DESCRIPTION
 "Library for read Yaml config files
  Home page https://jderobot.org")
 
-SET(CPACK_DEBIAN_CONFIG-PYTHON_PACKAGE_DEPENDS "jderobot-setup")
+SET(CPACK_DEBIAN_CONFIG-PYTHON_PACKAGE_DEPENDS "jderobot-setup, python-yaml")
 SET(CPACK_COMPONENT_CONFIG-PYTHON_DESCRIPTION  
 "Library for read Yaml config files 
  Home page https://jderobot.org")
@@ -23,13 +23,10 @@ SET(CPACK_COMPONENT_COMM_DESCRIPTION
 "Library for communications. You can use ROS or ICE 
  Home page https://jderobot.org")
 
-SET(CPACK_DEBIAN_COMM-PYTHON_PACKAGE_DEPENDS "jderobot-types-python,jderobot-config-python, jderobot-setup")
+SET(CPACK_DEBIAN_COMM-PYTHON_PACKAGE_DEPENDS "jderobot-types-python,jderobot-config-python, jderobot-setup, jderobot-zeroc-ice-python")
 SET(CPACK_COMPONENT_COMM-PYTHON_DESCRIPTION  
 "Library for communications. You can use ROS or ICE 
  Home page https://jderobot.org")
-SET(CPACK_DEBIAN_COMM-PYTHON_PACKAGE_CONTROL_EXTRA
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/ice/postinst"
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/ice/postrm")
 
 SET(CPACK_DEBIAN_CVBLOB_PACKAGE_DEPENDS "jderobot-setup")
 SET(CPACK_COMPONENT_CVBLOB_DESCRIPTION  
@@ -51,13 +48,11 @@ SET(CPACK_COMPONENT_EASYICE_DESCRIPTION
 "Library for  
  Home page https://jderobot.org")
 
-SET(CPACK_DEBIAN_EASYICE-PYTHON_PACKAGE_DEPENDS "jderobot-setup")
+SET(CPACK_DEBIAN_EASYICE-PYTHON_PACKAGE_DEPENDS "jderobot-setup, jderobot-zeroc-ice-python")
 SET(CPACK_COMPONENT_EASYICE-PYTHON_DESCRIPTION  
 "Library for  
  Home page https://jderobot.org")
-SET(CPACK_DEBIAN_EASYICE-PYTHON_PACKAGE_CONTROL_EXTRA
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/ice/postinst"
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/ice/postrm")
+
 
 SET(CPACK_DEBIAN_FUZZYLIB_PACKAGE_DEPENDS "jderobot-setup")
 SET(CPACK_COMPONENT_FUZZYLIB_DESCRIPTION  
@@ -99,13 +94,10 @@ SET(CPACK_COMPONENT_PARALLELICE_DESCRIPTION
 "Library for  
  Home page https://jderobot.org")
 
-SET(CPACK_DEBIAN_PARALLELICE-PYTHON_PACKAGE_DEPENDS "jderobot-setup")
+SET(CPACK_DEBIAN_PARALLELICE-PYTHON_PACKAGE_DEPENDS "jderobot-setup, jderobot-zeroc-ice-python")
 SET(CPACK_COMPONENT_PARALLELICE-PYTHON_DESCRIPTION  
 "Library for  
  Home page https://jderobot.org")
-SET(CPACK_DEBIAN_PARALLELICE-PYTHON_PACKAGE_CONTROL_EXTRA
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/ice/postinst"
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/ice/postrm")
 
 SET(CPACK_DEBIAN_PIONEER_PACKAGE_DEPENDS "jderobot-setup")
 SET(CPACK_COMPONENT_PIONEER_DESCRIPTION  

cmake/cpackit.cmake

@@ -93,6 +93,10 @@ set(CPACK_DEBIAN_SETUP_PACKAGE_CONTROL_EXTRA
     "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/postinst"
     "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/postrm")
 
+SET(CPACK_DEBIAN_ZEROC-ICE-PYTHON_PACKAGE_CONTROL_EXTRA
+    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/ice/postinst"
+    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/ice/postrm")
+
 
 ## Include Git HEAD into description (feature: traceback builds)
 execute_process(COMMAND git rev-parse HEAD
@@ -131,6 +135,7 @@ configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-deps-dev.info.in ${CMAKE_BINA
 configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-libs.info.in ${CMAKE_BINARY_DIR}/jderobot-libs_${PACKAGE_VERSION}_all.info)
 configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-tools.info.in ${CMAKE_BINARY_DIR}/jderobot-tools_${PACKAGE_VERSION}_all.info)
 configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-drivers.info.in ${CMAKE_BINARY_DIR}/jderobot-drivers_${PACKAGE_VERSION}_all.info)
+configure_file(${MAKE_PACKAGE_CONFIG_DIR}/jderobot-zeroc-ice-python.info.in ${CMAKE_BINARY_DIR}/jderobot-zeroc-ice-python_${PACKAGE_VERSION}_all.info)
 
 execute_process(
     COMMAND ${MAKE_PACKAGE_EXECUTABLE}

scripts/cmake/ice/postinst → scripts/cmake/zeroc-ice-python/postinst

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 pip2 install --upgrade pip
-pip2 install zeroc-ice
+pip2 install zeroc-ice==3.6.3

scripts/metapackages/jderobot-zeroc-ice-python.info.in

@@ -0,0 +1,16 @@
+Package: ${PROJECT_NAME}-zeroc-ice-python
+Version: ${PACKAGE_VERSION}
+Architecture: all
+Provides: ${PROJECT_NAME}-zeroc-ice-python
+Conflicts: ${PROJECT_NAME}-zeroc-ice-python
+Replaces: ${PROJECT_NAME}-zeroc-ice-python
+Section: net
+Priority: extra
+Size: 0
+Installed-Size: 0
+Depends: 
+Maintainer: Francisco Perez <f.perez475@gmail.com>
+Homepage: http://jderobot.org
+Description: Metapackage that intalls with pip zeroc-ice.
+ Get it from https://github.com/JdeRobot/JdeRobot.git
+

scripts/metapackages/make_packages.sh

@@ -27,16 +27,28 @@
 build=.dpkg_pkgs
 mkdir -p $build
 mkdir -p debs
-post=../scripts/cmake/postinst
 for pkginfo in *.info
 do
 	pkgname=${pkginfo%.info}
+	dr=${pkginfo%_*_*.info}
+	drname=$(echo $dr | sed 's/jderobot-//')
 #	echo $pkgname
+	echo $drname
 	target=$build/$pkgname/DEBIAN
 	mkdir -p $target
 	cp $pkginfo $target/control
-	cp $post  $target
-	chmod 555 $target/postinst
+	FILE=../scripts/cmake/$drname/postinst
+	if [ -f $FILE ]; then
+		cp $FILE  $target
+		chmod 555 $target/postinst
+	fi
+
+	FILE=../scripts/cmake/$drname/postrm
+	if [ -f $FILE ]; then
+		cp $FILE  $target
+		chmod 555 $target/postrm
+	fi
+
 	dpkg --build $build/$pkgname
 	cp $build/${pkgname}.deb ./debs
 done