[SCM] Attica packaging branch, master, updated. debian/0.2.0-1-27-g7e98f0f

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/attica.git;a=commitdiff;h=32d49f5

The following commit has been merged in the master branch:
commit 32d49f56528b9f143361ebd1270827f9e614dc17
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jul 2 14:51:18 2012 +0200

    switch to multiarch (#636318)
    
    work done by Daniel Schaal, thanks!
---
 debian/changelog                         |    3 +++
 debian/control                           |    4 +++-
 debian/libattica-dev.install             |    4 ++--
 debian/libattica0.4.install              |    2 +-
 debian/patches/series                    |    2 +-
 debian/patches/switch-to-multiarch.patch |   16 ++++++++++++++++
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d29243c..f3f8618 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ attica (0.4.0-0r1) UNRELEASED; urgency=low
   * Update copyright.
   * libattica-dev: depend on libqt4-dev.
 
+  [ Daniel Schaal ]
+  * Switch to multiarch. (Closes: #636318)
+
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Thu, 10 May 2012 23:38:23 +0200
 
 attica (0.2.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ec4ace6..ace7a02 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: attica
 Priority: optional
 Maintainer: Debian Krap Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Pino Toscano <pino at debian.org>
-Build-Depends: debhelper (>= 9), cmake, libqt4-dev, pkg-kde-tools (>=0.6)
+Build-Depends: debhelper (>= 9), cmake (>= 2.8.5), libqt4-dev, pkg-kde-tools (>=0.6)
 Standards-Version: 3.9.3
 Section: libs
 Homepage: http://www.kde.org
@@ -23,6 +23,8 @@ Description: development files for libattica
 
 Package: libattica0.4
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Qt library that implements the Open Collaboration Services API
  Attica is a Qt library that implements the Open Collaboration Services
diff --git a/debian/libattica-dev.install b/debian/libattica-dev.install
index 820dc41..7682cf9 100644
--- a/debian/libattica-dev.install
+++ b/debian/libattica-dev.install
@@ -1,3 +1,3 @@
 usr/include/attica/*
-usr/lib/libattica.so
-usr/lib/pkgconfig/libattica.pc
+usr/lib/*/libattica.so
+usr/lib/*/pkgconfig/libattica.pc
diff --git a/debian/libattica0.4.install b/debian/libattica0.4.install
index 19a800a..d17ed67 100644
--- a/debian/libattica0.4.install
+++ b/debian/libattica0.4.install
@@ -1 +1 @@
-usr/lib/libattica.so.0.4*
+usr/lib/*/libattica.so.0.4*
diff --git a/debian/patches/series b/debian/patches/series
index 8b13789..b99ddfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-
+switch-to-multiarch.patch
diff --git a/debian/patches/switch-to-multiarch.patch b/debian/patches/switch-to-multiarch.patch
new file mode 100644
index 0000000..906b852
--- /dev/null
+++ b/debian/patches/switch-to-multiarch.patch
@@ -0,0 +1,16 @@
+Description: set LIB_DESTINATION to multiarch library path
+Author: Daniel Schaal <farbing at web.de>
+Last-Update: 2012-07-02
+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)
+ 

-- 
Attica packaging