[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.11.4-32-gbafc86f
Modestas Vainius
modax at alioth.debian.org
Thu Apr 7 07:19:09 UTC 2011
The following commit has been merged in the master branch:
commit 1b676b4821a3a205eb7efdd930b28f7c1b54b937
Author: Modestas Vainius <modax at debian.org>
Date: Thu Apr 7 01:11:22 2011 +0300
DebianABIManager: fix parsing of multidigit SOVERSIONs in the package name.
---
cmake/DebianABIManager.cmake | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/DebianABIManager.cmake b/cmake/DebianABIManager.cmake
index b7b12c9..b9c8695 100644
--- a/cmake/DebianABIManager.cmake
+++ b/cmake/DebianABIManager.cmake
@@ -28,13 +28,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])-([0-9]+)[a-f]?$")
+ if (${pkg_noabi} MATCHES "^lib(.*[^0-9][0-9]+)-([0-9]+)[a-f]?$")
set(t ${CMAKE_MATCH_1})
set(pkgsv ${CMAKE_MATCH_2})
- elseif (${pkg_noabi} MATCHES "^lib(.+)([0-9]+)[a-f]?$")
+ elseif (${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])-([0-9]+)[a-f]?$")
+ endif (${pkg_noabi} MATCHES "^lib(.*[^0-9][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