Package: libattica0
Version: 0.2.0-1
Severity: wishlist
Tags: patch
Attached is a patch to install the library in multiarch paths.
It adds a Build-Depends on cmake >= 2.8.5 and Pre-Depends: ${misc:Pre-Depends}
on the library package and marks it Multi-Arch: same.
It also patches the CMakeLists.txt to correctly set ${LIB_DESTINATION}.
When rebuilding the package some new symbols showed up in the symbols file,
but that is unrelated to this change.
Thanks,
Daniel Schaal
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (990, 'unstable'), (102, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0fglrx2 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages libattica0 depends on:
ii libc6 2.13-13 Embedded GNU C Library: Shared lib
ii libgcc1 1:4.6.1-5 GCC support library
ii libqt4-network 4:4.7.3-5 Qt 4 network module
ii libqtcore4 4:4.7.3-5 Qt 4 core module
ii libstdc++6 4.6.1-5 GNU Standard C++ Library v3
libattica0 recommends no packages.
libattica0 suggests no packages.
-- no debconf information
>From 19ea572bb638a6019db146873f0c9e6c2e6a6c77 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farb...@web.de>
Date: Sun, 31 Jul 2011 19:07:21 +0200
Subject: [PATCH] switch to multiarch
---
debian/control | 4 +++-
debian/libattica-dev.install | 4 ++--
debian/libattica0.install | 2 +-
debian/patches/install-in-multiarch-paths | 16 ++++++++++++++++
debian/patches/series | 1 +
5 files changed, 23 insertions(+), 4 deletions(-)
create mode 100644 debian/patches/install-in-multiarch-paths
diff --git a/debian/control b/debian/control
index 91de1f9..4d8aa13 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: attica
Priority: optional
Maintainer: Debian Krap Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Thibaut Gridel <tgri...@free.fr>
-Build-Depends: debhelper (>= 7.3), cmake, libqt4-dev, pkg-kde-tools (>=0.6)
+Build-Depends: debhelper (>= 7.3), cmake (>= 2.8.5), libqt4-dev, pkg-kde-tools
(>=0.6)
Standards-Version: 3.9.1
Section: libs
Homepage: http://www.kde.org
@@ -23,7 +23,9 @@ Description: development files for libattica
Package: libattica0
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: Qt library that implements the Open Collaboration Services API
Attica is a Qt library that implements the Open Collaboration Services
API version 1.4.
diff --git a/debian/libattica-dev.install b/debian/libattica-dev.install
index f597fab..9e69bdc 100644
--- a/debian/libattica-dev.install
+++ b/debian/libattica-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libattica.so
+usr/lib/*/libattica.so
usr/include/attica/*
-usr/lib/pkgconfig/libattica.pc
+usr/lib/*/pkgconfig/libattica.pc
diff --git a/debian/libattica0.install b/debian/libattica0.install
index 7466a38..f1d2839 100644
--- a/debian/libattica0.install
+++ b/debian/libattica0.install
@@ -1 +1 @@
-usr/lib/libattica.so.*
+usr/lib/*/libattica.so.*
diff --git a/debian/patches/install-in-multiarch-paths
b/debian/patches/install-in-multiarch-paths
new file mode 100644
index 0000000..24a318f
--- /dev/null
+++ b/debian/patches/install-in-multiarch-paths
@@ -0,0 +1,16 @@
+Description: set LIB_DESTINATION to multiarch library path
+Author: Daniel Schaal <farb...@web.de>
+
+--- a/lib/CMakeLists.txt 2011-08-02 09:36:24.000000000 +0200
++++ b/lib/CMakeLists.txt 2011-08-02 09:36:24.000000000 +0200
+@@ -1,8 +1,8 @@
+
+ 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_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
++set(LIB_DESTINATION
"${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE STRING
"Library directory name" FORCE)
+
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
diff --git a/debian/patches/series b/debian/patches/series
index c6a9f4a..c2b2ae1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
no-rpath
+install-in-multiarch-paths
--
1.7.5.4
