[Pkg-gnutls-commits] r1095 - in /packages/libksba/trunk/debian: changelog control libksba-dev.install libksba8.install rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Jun 19 12:00:37 2011
New Revision: 1095

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1095
Log:
Build for multi-arch.

Modified:
    packages/libksba/trunk/debian/changelog
    packages/libksba/trunk/debian/control
    packages/libksba/trunk/debian/libksba-dev.install
    packages/libksba/trunk/debian/libksba8.install
    packages/libksba/trunk/debian/rules

Modified: packages/libksba/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libksba/trunk/debian/changelog?rev=1095&op=diff
==============================================================================
--- packages/libksba/trunk/debian/changelog (original)
+++ packages/libksba/trunk/debian/changelog Sun Jun 19 12:00:37 2011
@@ -1,6 +1,7 @@
 libksba (1.2.0-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Build for multi-arch.
 
  -- Andreas Metzler <ametzler at debian.org>  Sat, 05 Mar 2011 14:26:25 +0100
 

Modified: packages/libksba/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libksba/trunk/debian/control?rev=1095&op=diff
==============================================================================
--- packages/libksba/trunk/debian/control (original)
+++ packages/libksba/trunk/debian/control Sun Jun 19 12:00:37 2011
@@ -5,8 +5,8 @@
 Uploaders: Andreas Metzler <ametzler at debian.org>, 
  Eric Dorland <eric at debian.org>, James Westby <jw+debian at jameswestby.net>,
  Peter Eisentraut <petere at debian.org>
-Build-Depends: debhelper (>> 7.0.14), libgpg-error-dev (>= 1.8),
-  autotools-dev, cdbs (>= 0.4.53)
+Build-Depends: debhelper (>> 8.1.3), libgpg-error-dev (>= 1.8),
+  autotools-dev, cdbs (>= 0.4.93)
 Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnutls/packages/libksba/
 Vcs-Svn: svn://svn.debian.org/pkg-gnutls/packages/libksba/
@@ -31,6 +31,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: X.509 and CMS support library
  KSBA (pronounced Kasbah) is a library to make X.509 certificates as
  well as the CMS easily accessible by other applications.  Both

Modified: packages/libksba/trunk/debian/libksba-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libksba/trunk/debian/libksba-dev.install?rev=1095&op=diff
==============================================================================
--- packages/libksba/trunk/debian/libksba-dev.install (original)
+++ packages/libksba/trunk/debian/libksba-dev.install Sun Jun 19 12:00:37 2011
@@ -1,5 +1,5 @@
-debian/tmp/usr/include/* usr/include
-debian/tmp/usr/lib/lib*.a usr/lib
-debian/tmp/usr/lib/lib*.so usr/lib
-debian/tmp/usr/share/aclocal/ksba.m4 /usr/share/aclocal
-debian/tmp/usr/bin/ksba-config usr/bin
+usr/include/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/share/aclocal/ksba.m4
+usr/bin/ksba-config

Modified: packages/libksba/trunk/debian/libksba8.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libksba/trunk/debian/libksba8.install?rev=1095&op=diff
==============================================================================
--- packages/libksba/trunk/debian/libksba8.install (original)
+++ packages/libksba/trunk/debian/libksba8.install Sun Jun 19 12:00:37 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/lib*.so.* usr/lib
+usr/lib/*/lib*.so.*

Modified: packages/libksba/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libksba/trunk/debian/rules?rev=1095&op=diff
==============================================================================
--- packages/libksba/trunk/debian/rules (original)
+++ packages/libksba/trunk/debian/rules Sun Jun 19 12:00:37 2011
@@ -3,7 +3,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --enable-static \
+	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_MAKE_CHECK_TARGET = check
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libksba8 (>= 1.2.0)"