[SCM] Attica packaging branch, master, updated. debian/0.4.1-2-5-ge5b40da
Pino Toscano
pino at alioth.debian.org
Mon Jun 24 07:22:47 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/attica.git;a=commitdiff;h=eceaa67
The following commit has been merged in the master branch:
commit eceaa673f44dbb6fe35853a7e6c753d20517dd5d
Author: Pino Toscano <pino at debian.org>
Date: Mon Jun 24 01:39:29 2013 +0200
update patch switch-to-multiarch.patch
---
debian/changelog | 1 +
debian/patches/switch-to-multiarch.patch | 23 ++++++++++++-----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9fe531d..32d2ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ attica (0.4.2-0r1) UNRELEASED; urgency=low
[ Pino Toscano ]
* New upstream release.
+ * Update patch switch-to-multiarch.patch to the new attica version.
-- Debian Krap Maintainers <debian-qt-kde at lists.debian.org> Mon, 24 Jun 2013 01:24:28 +0200
diff --git a/debian/patches/switch-to-multiarch.patch b/debian/patches/switch-to-multiarch.patch
index 906b852..224c8ad 100644
--- a/debian/patches/switch-to-multiarch.patch
+++ b/debian/patches/switch-to-multiarch.patch
@@ -1,16 +1,17 @@
Description: set LIB_DESTINATION to multiarch library path
Author: Daniel Schaal <farbing at web.de>
-Last-Update: 2012-07-02
+Author: Pino Toscano <pino at debian.org>
+Last-Update: 2013-06-24
Forwarded: no
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -2,7 +2,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
- set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
--set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
-+set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE STRING "Library directory name" FORCE)
-
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,7 @@ else()
+ set(QT_MIN_VERSION "4.7.0")
+ find_package(Qt4 REQUIRED)
+ set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+- set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
++ set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE STRING "Library directory name" FORCE)
+ endif()
+ if (Qt5Core_FOUND)
--
Attica packaging
More information about the pkg-kde-commits
mailing list