[med-svn] [Git][med-team/camp][master] 2 commits: Fix patch to support multi-arch variables in CMake

Tue Oct 19 15:15:27 BST 2021


Flavien Bridault pushed to branch master at Debian Med / camp


Commits:
572d4e57 by Flavien Bridault at 2021-10-19T16:08:03+02:00
Fix patch to support multi-arch variables in CMake


- - - - -
fd57de23 by Flavien Bridault at 2021-10-19T16:11:10+02:00
Update GitHub urls


- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/patches/fix_cmake_target.patch
- debian/rules
- debian/upstream/metadata
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+camp (0.8.4-3) UNRELEASED; urgency=medium
+
+  * d/patches: fix CMake patch to support multi-arch paths properly
+  * d/*: update urls
+
+ -- Flavien Bridault <fbridault at ircad.fr>  Tue, 19 Oct 2021 12:57:58 +0000
+
 camp (0.8.4-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -12,7 +12,7 @@ Build-Depends: cmake,
 Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/camp
 Vcs-Git: https://salsa.debian.org/med-team/camp.git
-Homepage: https://github.com/IRCAD-IHU/camp
+Homepage: https://github.com/IRCAD/camp
 Rules-Requires-Root: no
 
 Package: libcamp0.8


=====================================
debian/copyright
=====================================
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: camp
-Source: https://github.com/IRCAD-IHU/camp
+Source: https://github.com/IRCAD/camp
 
 Files: *
 Copyright: 2009-2014 TEGESO/TEGESOFT and/or its subsidiary(-ies) and mother company.


=====================================
debian/patches/fix_cmake_target.patch
=====================================
@@ -1,17 +1,28 @@
 Author: Flavien Bridault <fbridault at ircad.fr>
 Description: Use proper arch dependent library dir
+Bug: https://github.com/IRCAD/camp/issues/2
 
 --- camp.orig/CMakeLists.txt
 +++ camp/CMakeLists.txt
-@@ -198,6 +198,7 @@
+@@ -39,6 +39,8 @@
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
  
- # cmake
- include(CMakePackageConfigHelpers)
 +include(GNUInstallDirs)
++
+ # include project configuration
+ include(${CMAKE_SOURCE_DIR}/cmake/Config.cmake)
+ include(${CMAKE_SOURCE_DIR}/cmake/PackageFilename.cmake)
+@@ -201,7 +203,7 @@
  
  configure_package_config_file(cmake/CAMPConfig.cmake.in
      ${CMAKE_CURRENT_BINARY_DIR}/CAMPConfig.cmake
-@@ -226,9 +227,9 @@
+-    INSTALL_DESTINATION lib/camp/cmake
++    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/camp
+ )
+ 
+ write_basic_package_version_file(
+@@ -226,24 +228,24 @@
  
  install(TARGETS camp
      EXPORT CAMPTargets
@@ -24,3 +35,21 @@ Description: Use proper arch dependent library dir
  )
  
  install(FILES ${CMAKE_BINARY_DIR}/camp.pc
+-    DESTINATION lib/pkgconfig
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+     COMPONENT devel
+ )
+ 
+ install(EXPORT CAMPTargets
+     NAMESPACE camp::
+-    DESTINATION lib/camp/cmake
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/camp
+     COMPONENT devel
+ )
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CAMPConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/CAMPConfigVersion.cmake
+-    DESTINATION lib/camp/cmake
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/camp
+     COMPONENT devel
+ )
+ 


=====================================
debian/rules
=====================================
@@ -15,7 +15,7 @@ override_dh_install:
 		--commit --multiarch --devunversioned --exclude-a --exclude-la \
 		--movedev debian/tmp/usr/include/camp usr/include \
 		--movedev debian/tmp/usr/include/camp-xml usr/include \
-		--movedev debian/tmp/usr/lib/camp/cmake usr/lib/${DEB_HOST_MULTIARCH}/camp \
-		--movedev debian/tmp/usr/lib/pkgconfig/camp.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig \
+		--movedev debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/cmake/camp usr/lib/${DEB_HOST_MULTIARCH}/cmake \
+		--movedev debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/camp.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig \
 		debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/*.so
 	find debian -name camp.pc.in -delete


=====================================
debian/upstream/metadata
=====================================
@@ -1,5 +1,5 @@
 ---
-Bug-Database: https://github.com/IRCAD-IHU/camp/issues
-Bug-Submit: https://github.com/IRCAD-IHU/camp/issues/new
-Repository: https://github.com/IRCAD-IHU/camp.git
-Repository-Browse: https://github.com/IRCAD-IHU/camp
+Bug-Database: https://github.com/IRCAD/camp/issues
+Bug-Submit: https://github.com/IRCAD/camp/issues/new
+Repository: https://github.com/IRCAD/camp.git
+Repository-Browse: https://github.com/IRCAD/camp


=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
 version=4
-https://github.com/IRCAD-IHU/camp/releases .*/(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
+https://github.com/IRCAD/camp/releases .*/(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)



View it on GitLab: https://salsa.debian.org/med-team/camp/-/compare/559d1d2017cc4f78e09f95a3b668aed328737b87...fd57de23f5f57ce4941b01fb22589263b7abc4d5

-- 
View it on GitLab: https://salsa.debian.org/med-team/camp/-/compare/559d1d2017cc4f78e09f95a3b668aed328737b87...fd57de23f5f57ce4941b01fb22589263b7abc4d5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211019/8f0c84f2/attachment-0001.htm>
