[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.11.4-7-g2d56843
Modestas Vainius
modax at alioth.debian.org
Sat Mar 26 21:20:24 UTC 2011
The following commit has been merged in the master branch:
commit fbdd1a34ecf8865f65610603b645ed0ad12d6c78
Author: Modestas Vainius <modax at debian.org>
Date: Sat Mar 26 22:30:23 2011 +0200
DebianABIManager: support libname[0-9]-[0-9] package names.
E.g. libkexiv2-8 in kdegraphics.
---
cmake/DebianABIManager.cmake | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/cmake/DebianABIManager.cmake b/cmake/DebianABIManager.cmake
index 5f74869..ffe5538 100644
--- a/cmake/DebianABIManager.cmake
+++ b/cmake/DebianABIManager.cmake
@@ -13,10 +13,13 @@ function(DEBABI_SPLIT_PKGNAME pkg targetvar soversionvar)
set(pkg_noabi ${pkg})
endif (debabi_${pkg}_Debian-ABI GREATER 0)
# Parse package name
- if (${pkg_noabi} MATCHES "^lib(.+)([0-9]+)[a-f]?$")
+ if (${pkg_noabi} MATCHES "^lib(.+[0-9])-([0-9]+)[a-f]?$")
set(t ${CMAKE_MATCH_1})
set(pkgsv ${CMAKE_MATCH_2})
- endif (${pkg_noabi} MATCHES "^lib(.+)([0-9]+)[a-f]?$")
+ elseif (${pkg_noabi} MATCHES "^lib(.+)([0-9]+)[a-f]?$")
+ set(t ${CMAKE_MATCH_1})
+ set(pkgsv ${CMAKE_MATCH_2})
+ endif (${pkg_noabi} MATCHES "^lib(.+[0-9])-([0-9]+)[a-f]?$")
endif (DEFINED debabi_${pkg}_CMake-Target)
if (t STREQUAL "" OR NOT(TARGET ${t}))
message(STATUS "DebianABIManager: unable to find CMake target '${t}' for package '${pkg}'. Please set X-CMake-Target")
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list